mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-20 20:02:38 +09:00
Feature #1592: Merge SSH connections into a single one
This commit is contained in:
1 parent
d28dd0390e
commit
6ffadd9df0
3 files changed
+27
-60
No files matched your search
+6
-17
@@ -92,31 +92,20 @@ EOF
|
||||
ssh_exec_and_log "$TARGET_HOST" "$CLONE_CMD" \
|
||||
"Error cloning $DST_HOST:$TARGET_DEV"
|
||||
|
||||
DISCOVERY_CMD=$(cat <<EOF
|
||||
LINK_CMD=$(cat <<EOF
|
||||
set -e
|
||||
|
||||
# discover and login
|
||||
mkdir -p $DST_DIR
|
||||
$SUDO $(iscsiadm_discovery "$TARGET_HOST")
|
||||
$SUDO $(iscsiadm_login "$NEW_IQN" "$TARGET_HOST")
|
||||
EOF
|
||||
)
|
||||
|
||||
ssh_exec_and_log "$DST_HOST" "$DISCOVERY_CMD" \
|
||||
"Error discovering $NEW_IQN in $DST_HOST"
|
||||
|
||||
TEST_CMD=$(cat <<EOF
|
||||
set -e
|
||||
# poll
|
||||
while [ ! -L /dev/disk/by-path/*$NEW_IQN-lun-1 ]; do
|
||||
sleep 1
|
||||
sleep 1
|
||||
done
|
||||
EOF
|
||||
)
|
||||
|
||||
ssh_exec_and_log "$DST_HOST" "$TEST_CMD" \
|
||||
"Error waiting for $NEW_IQN iSCSI LUN to appear in $DST_HOST"
|
||||
|
||||
|
||||
LINK_CMD=$(cat <<EOF
|
||||
set -e
|
||||
# link
|
||||
DISK_BY_PATH=\$(ls /dev/disk/by-path/*$NEW_IQN-lun-1)
|
||||
ln -s "\$DISK_BY_PATH" "$DST_PATH"
|
||||
DISK_DEVNAME=\$(readlink -f \$DISK_BY_PATH | awk -F'/' '{ print \$NF }')
|
||||
|
||||
+7
-19
@@ -58,38 +58,26 @@ VG_NAME=`echo $TARGET|$AWK -F. '{print $(NF-1)}'`
|
||||
TARGET_DEV="/dev/$VG_NAME/$LV_NAME"
|
||||
TARGET_HOST=${TARGET%.$VG_NAME.$LV_NAME}
|
||||
|
||||
DISCOVER_CMD=$(cat <<EOF
|
||||
LINK_CMD=$(cat <<EOF
|
||||
set -e
|
||||
|
||||
# discover and login
|
||||
mkdir -p $DST_DIR
|
||||
$SUDO $(iscsiadm_discovery "$TARGET_HOST")
|
||||
$SUDO $(iscsiadm_login "$IQN" "$TARGET_HOST")
|
||||
EOF
|
||||
)
|
||||
|
||||
ssh_exec_and_log "$DST_HOST" "$DISCOVER_CMD" \
|
||||
"Error discovering $DST_HOST:$DEV"
|
||||
|
||||
TEST_CMD=$(cat <<EOF
|
||||
set -e
|
||||
# poll
|
||||
while [ ! -L /dev/disk/by-path/*$IQN-lun-1 ]; do
|
||||
sleep 1
|
||||
sleep 1
|
||||
done
|
||||
EOF
|
||||
)
|
||||
|
||||
ssh_exec_and_log "$DST_HOST" "$TEST_CMD" \
|
||||
"Error waiting for $IQN iSCSI LUN to appear in $DST_HOST"
|
||||
|
||||
LINK_CMD=$(cat <<EOF
|
||||
set -e
|
||||
# link
|
||||
DISK_BY_PATH=\$(ls /dev/disk/by-path/*$IQN-lun-1)
|
||||
ln -s "\$DISK_BY_PATH" "$DST_PATH"
|
||||
DISK_DEVNAME=\$(readlink -f \$DISK_BY_PATH | awk -F'/' '{ print \$NF }')
|
||||
EOF
|
||||
)
|
||||
|
||||
ssh_exec_and_log "$DST_HOST" "$LINK_CMD" \
|
||||
"Error linking $DST_HOST:$DEV"
|
||||
|
||||
"Error linking $DST_HOST:$TARGET_DEV"
|
||||
|
||||
exit 0
|
||||
+14
-24
@@ -114,37 +114,27 @@ if is_iscsi "$DST_HOST"; then
|
||||
|
||||
TARGET_HOST=$(iqn_get_host "$IQN")
|
||||
|
||||
LOGIN_CMD=$(cat <<EOF
|
||||
set -e
|
||||
mkdir -p $DST_DIR
|
||||
$SUDO $(iscsiadm_discovery "$TARGET_HOST")
|
||||
$SUDO $(iscsiadm_login "$IQN" "$TARGET_HOST")
|
||||
EOF
|
||||
)
|
||||
|
||||
ssh_exec_and_log "$DST_HOST" "$LOGIN_CMD" \
|
||||
"Error logging in $IQN"
|
||||
|
||||
TEST_CMD=$(cat <<EOF
|
||||
LINK_CMD=$(cat <<EOF
|
||||
set -e
|
||||
|
||||
# discover and login
|
||||
mkdir -p $DST_DIR
|
||||
$SUDO $(iscsiadm_discovery "$TARGET_HOST")
|
||||
$SUDO $(iscsiadm_login "$IQN" "$TARGET_HOST")
|
||||
|
||||
# poll
|
||||
while [ ! -L /dev/disk/by-path/*$IQN-lun-1 ]; do
|
||||
sleep 1
|
||||
done
|
||||
|
||||
# link
|
||||
DISK_BY_PATH=\$(ls /dev/disk/by-path/*$IQN-lun-1)
|
||||
ln -sf "\$DISK_BY_PATH" "$DST_PATH"
|
||||
EOF
|
||||
)
|
||||
|
||||
ssh_exec_and_log "$DST_HOST" "$TEST_CMD" \
|
||||
"Error waiting for $IQN iSCSI LUN to appear in $DST_HOST"
|
||||
|
||||
LINK_CMD=$(cat <<EOF
|
||||
set -e
|
||||
DISK_BY_PATH=\$(ls /dev/disk/by-path/*$IQN-lun-1)
|
||||
ln -sf "\$DISK_BY_PATH" "$DST_PATH"
|
||||
EOF
|
||||
)
|
||||
|
||||
ssh_exec_and_log "$DST_HOST" "$LINK_CMD" \
|
||||
"Error linking to $DISK_BY_PATH $DST_PATH"
|
||||
ssh_exec_and_log "$DST_HOST" "$LINK_CMD" \
|
||||
"Error linking to $DISK_BY_PATH $DST_PATH"
|
||||
|
||||
|
||||
fi
|
||||
|
||||
Reference in new issue
Block a user