arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

from now on, the entries in "litetree" table are no longer restricted to use different mnt point name; for example,

Browse Source 
The "litetree" table has the following entries:

"1","ALL","192.168.11.107:/test/$node",,
"2","ALL","192.168.11.108:/test/$node",,

before the code is checked in, if you run "litetree <nodename>", you should get one message like this:

<nodename>: 192.168.11.107:/test/<nodename>
# 192.168.11.107 and 192.168.11.108 both mount /test. This not supported.

After the code is checked in, there will be no any error/warning message about the entries in litetree table.
Accordingly, the naming of mount points on the compute nodes are updated to "/.statelite/mnt/<nfs server ip>/<nfs directory>/" from "/.statelite/mnt/<nfs directory>/".



git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7105 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
mxi1 2010-08-17 02:57:52 +00:00
parent dac2795b0c
commit 021457531b
3 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
xCAT-server/lib/xcat/plugins/litetree.pm
View File

@ -205,15 +205,6 @@ sub showSync {
# we have a server and need to make sure we can mount them under unique names
if($mnts->{$first} eq '' ){ # if the first mount point doesn't have a server then leave it.
$mnts->{$first} = $server;
}else{
# they may just have the name in twice:
unless($server eq $mnts->{$first}){
my $msg = "# " . $mnts->{$first} . " and $server both mount /$first. This not supported.";
$callback->({info => $msg});
return;
}else{
$mntpnt = ""; # only mount it once, so get rid of the directory
}
}
}
$mntpnt .= $dir;

9
xCAT-server/share/xcat/netboot/add-on/statelite/rc.statelite
View File

@ -150,10 +150,10 @@ MountTrees () {
do
SERV=`echo $i | awk -F: '{print $1}'` # SERV is (SERV):/blah/blah/blah
MNT=`echo $i | awk -F: '{print $2}'` # MNT is server:(/blah/blah/blah)
mkdir -p ${TREEMOUNT}${MNT}
mkdir -p ${TREEMOUNT}/${SERV}/${MNT}
MAX=15
TRIES=1
while ! mount $SERV:$MNT ${TREEMOUNT}${MNT} -r -n -o nolock,tcp
while ! mount $SERV:$MNT ${TREEMOUNT}/${SERV}/${MNT} -r -n -o nolock,tcp
do
if [ "$TRIES" = "$MAX" ]; then
echo "Can't mount $i. I give up.. ">/dev/console
@ -382,8 +382,9 @@ FindFile () {
type=$2
isChild=$3
FOUND=0
for DIR in `cat ${SYNCTREE} | sed 's/[^\/]*//'`
for DIR in `cat ${SYNCTREE}`
do
DIR=${DIR/:/}
if [ -e ${TREEMOUNT}/${DIR}${path} ]; then
FOUND=1 # we found it!
if [ -d ${TREEMOUNT}/${DIR}${path} ] && [ "0" -eq `ls -A ${TREEMOUNT}/${DIR}${path} |wc -l` ]; then
@ -391,7 +392,7 @@ FindFile () {
else
ProcessType ${TREEMOUNT}/${DIR}${path} ${path} ${type} ${isChild}
if [ "${2}" = "con" ]; then
1
continue
else
break
fi

9
xCAT-server/share/xcat/netboot/add-on/statelite/rc.statelite.ppc.redhat
View File

@ -150,10 +150,10 @@ MountTrees () {
do
SERV=`echo $i | awk -F: '{print $1}'` # SERV is (SERV):/blah/blah/blah
MNT=`echo $i | awk -F: '{print $2}'` # MNT is server:(/blah/blah/blah)
mkdir -p ${TREEMOUNT}${MNT}
mkdir -p ${TREEMOUNT}/${SERV}/${MNT}
MAX=15
TRIES=1
while ! mount $SERV:$MNT ${TREEMOUNT}${MNT} -r -n -o nolock,tcp
while ! mount $SERV:$MNT ${TREEMOUNT}/${SERV}/${MNT} -r -n -o nolock,tcp
do
if [ "$TRIES" = "$MAX" ]; then
echo "Can't mount $i. I give up.. ">/dev/console
@ -382,8 +382,9 @@ FindFile () {
type=$2
isChild=$3
FOUND=0
for DIR in `cat ${SYNCTREE} | sed 's/[^\/]*//'`
for DIR in `cat ${SYNCTREE}`
do
DIR=${DIR/:/}
if [ -e ${TREEMOUNT}/${DIR}${path} ]; then
FOUND=1 # we found it!
if [ -d ${TREEMOUNT}/${DIR}${path} ] && [ "0" -eq `ls -A ${TREEMOUNT}/${DIR}${path} |wc -l` ]; then
@ -391,7 +392,7 @@ FindFile () {
else
ProcessType ${TREEMOUNT}/${DIR}${path} ${path} ${type} ${isChild}
if [ "${2}" = "con" ]; then
1
continue
else
break
fi