This commit is contained in:
committed by
Git OBS Bridge
parent
49bc396272
commit
1b5538862e
19
block-iscsi
19
block-iscsi
@@ -43,7 +43,7 @@ find_sdev()
|
||||
if ! test -e $session; then return; fi
|
||||
if test $1 = `cat $session/targetname`; then
|
||||
sess_lun_to_bdev $session $lun
|
||||
echo "fs: $1[$lun] ($cnt) -> $dev" 1>&2
|
||||
#echo "fs: $1[$lun] ($cnt) -> $dev" 1>&2
|
||||
return
|
||||
fi
|
||||
done
|
||||
@@ -58,7 +58,7 @@ find_sdev_rev()
|
||||
for d in $dev; do
|
||||
if test "$d" = "$1"; then
|
||||
tgt=`cat $session/targetname`
|
||||
echo "fsr: $2 -> $tgt ($cnt)" 1>&2
|
||||
#echo "fsr: $2 -> $tgt ($cnt)" 1>&2
|
||||
return
|
||||
fi
|
||||
done
|
||||
@@ -72,16 +72,16 @@ case "$command" in
|
||||
{ /etc/init.d/open-iscsi start >/dev/null 2>&1; sleep 1; }
|
||||
# list of targets on node
|
||||
par=`xenstore-read $XENBUS_PATH/params` || true
|
||||
TGTID=$par; TGTID=${TGTID//@/:}
|
||||
TGTID=$par; TGTID=${TGTID//@/:}; TGTID=${TGTID//\#/,}
|
||||
LUN=${TGTID##*,}; TGTID=${TGTID%,*}
|
||||
if test $LUN = $TGTID; then unset LUN; fi
|
||||
#echo "add $TGTID lun $LUN" 1>&2
|
||||
while read rec port uuid; do
|
||||
while read port uuid; do
|
||||
if test $uuid = $TGTID; then
|
||||
rec=${rec%]}; rec=${rec#[}
|
||||
find_sdev $TGTID $LUN
|
||||
if test -z "$dev"; then
|
||||
iscsiadm -m node -r $rec -l || exit 2
|
||||
#echo iscsiadm -m node -T $uuid -p $port -l 1>&2
|
||||
iscsiadm -m node -T $uuid -p $port -l || exit 2
|
||||
usleep 100000
|
||||
find_sdev $TGTID $LUN
|
||||
fi
|
||||
@@ -96,13 +96,12 @@ case "$command" in
|
||||
node=`xenstore-read $XENBUS_PATH/node` || true
|
||||
dev=$node; dev=${dev#/dev/}
|
||||
find_sdev_rev $dev
|
||||
#echo $tgt
|
||||
#echo "remove $dev:$tgt" 1>&2
|
||||
if test -x /sbin/blockdev -a -n "$node"; then blockdev --flushbufs $node; fi
|
||||
test -z "$tgt" && exit 2
|
||||
while read rec port uuid; do
|
||||
while read port uuid; do
|
||||
if test $uuid = $tgt; then
|
||||
rec=${rec%]}; rec=${rec#[}
|
||||
iscsiadm -m node -r $rec -u
|
||||
iscsiadm -m node -T $uuid -p $port -u
|
||||
exit 0
|
||||
fi
|
||||
done < <(iscsiadm -m node)
|
||||
|
Reference in New Issue
Block a user