From b91bb29284b2d547c952fff17090065a3c577027 Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Tue, 26 Jun 2012 18:49:31 +0200 Subject: [PATCH 1/9] Feature #1254: datastore_mad part of the full iscsi support. This commit has adapted from the contribution provided by SZTAKI LPDS. --- src/datastore_mad/remotes/iscsi/cp | 24 +++++++++------ src/datastore_mad/remotes/iscsi/iscsi.conf | 4 +++ src/datastore_mad/remotes/iscsi/mkfs | 34 ++++++++++------------ src/datastore_mad/remotes/iscsi/rm | 6 ++-- src/mad/sh/scripts_common.sh | 18 ++++++++++++ 5 files changed, 57 insertions(+), 29 deletions(-) diff --git a/src/datastore_mad/remotes/iscsi/cp b/src/datastore_mad/remotes/iscsi/cp index 44119c73b7..22dec153e9 100755 --- a/src/datastore_mad/remotes/iscsi/cp +++ b/src/datastore_mad/remotes/iscsi/cp @@ -56,6 +56,7 @@ done < <($XPATH /DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH \ /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VG_NAME \ /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BASE_IQN \ /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BASE_TID \ + /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/TARGET_CONF \ /DS_DRIVER_ACTION_DATA/IMAGE/PATH \ /DS_DRIVER_ACTION_DATA/IMAGE/SIZE \ /DS_DRIVER_ACTION_DATA/IMAGE/TEMPLATE/MD5 \ @@ -69,10 +70,11 @@ DST_HOST="${XPATH_ELEMENTS[4]:-$HOST}" VG_NAME="${XPATH_ELEMENTS[5]:-$VG_NAME}" BASE_IQN="${XPATH_ELEMENTS[6]:-$BASE_IQN}" BASE_TID="${XPATH_ELEMENTS[7]:-$BASE_TID}" -SRC="${XPATH_ELEMENTS[8]}" -SIZE="${XPATH_ELEMENTS[9]}" -MD5="${XPATH_ELEMENTS[10]}" -SHA1="${XPATH_ELEMENTS[11]}" +TARGET_CONF="${XPATH_ELEMENTS[8]:-$TARGET_CONF}" +SRC="${XPATH_ELEMENTS[9]}" +SIZE="${XPATH_ELEMENTS[10]}" +MD5="${XPATH_ELEMENTS[11]}" +SHA1="${XPATH_ELEMENTS[12]}" set_up_datastore "$BASE_PATH" "$RESTRICTED_DIRS" "$SAFE_DIRS" "$UMASK" @@ -80,14 +82,18 @@ LV_NAME="lv-one-${ID}" IQN="$BASE_IQN:$DST_HOST.$VG_NAME.$LV_NAME" DEV="/dev/$VG_NAME/$LV_NAME" -let TID=ID+BASE_TID - REGISTER_CMD=$(cat <& /dev/null" +} + ### function iscsiadm_discovery { From d3d122592b1bde3664ce9fe5782832ac12262f8a Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Thu, 28 Jun 2012 14:46:54 +0200 Subject: [PATCH 2/9] Feature #1254: BASE_TID is hardcoded to 1. TARGET_CONF is globally defined in the configuration file. --- src/datastore_mad/remotes/iscsi/cp | 13 +++++-------- src/datastore_mad/remotes/iscsi/iscsi.conf | 3 --- src/datastore_mad/remotes/iscsi/mkfs | 10 ++-------- src/datastore_mad/remotes/iscsi/rm | 4 +--- 4 files changed, 8 insertions(+), 22 deletions(-) diff --git a/src/datastore_mad/remotes/iscsi/cp b/src/datastore_mad/remotes/iscsi/cp index 22dec153e9..1e693e5033 100755 --- a/src/datastore_mad/remotes/iscsi/cp +++ b/src/datastore_mad/remotes/iscsi/cp @@ -56,7 +56,6 @@ done < <($XPATH /DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH \ /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VG_NAME \ /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BASE_IQN \ /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BASE_TID \ - /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/TARGET_CONF \ /DS_DRIVER_ACTION_DATA/IMAGE/PATH \ /DS_DRIVER_ACTION_DATA/IMAGE/SIZE \ /DS_DRIVER_ACTION_DATA/IMAGE/TEMPLATE/MD5 \ @@ -69,12 +68,10 @@ UMASK="${XPATH_ELEMENTS[3]}" DST_HOST="${XPATH_ELEMENTS[4]:-$HOST}" VG_NAME="${XPATH_ELEMENTS[5]:-$VG_NAME}" BASE_IQN="${XPATH_ELEMENTS[6]:-$BASE_IQN}" -BASE_TID="${XPATH_ELEMENTS[7]:-$BASE_TID}" -TARGET_CONF="${XPATH_ELEMENTS[8]:-$TARGET_CONF}" -SRC="${XPATH_ELEMENTS[9]}" -SIZE="${XPATH_ELEMENTS[10]}" -MD5="${XPATH_ELEMENTS[11]}" -SHA1="${XPATH_ELEMENTS[12]}" +SRC="${XPATH_ELEMENTS[7]}" +SIZE="${XPATH_ELEMENTS[8]}" +MD5="${XPATH_ELEMENTS[9]}" +SHA1="${XPATH_ELEMENTS[10]}" set_up_datastore "$BASE_PATH" "$RESTRICTED_DIRS" "$SAFE_DIRS" "$UMASK" @@ -88,7 +85,7 @@ REGISTER_CMD=$(cat < Date: Thu, 28 Jun 2012 14:54:03 +0200 Subject: [PATCH 3/9] Feature #1254: tm_mad part of the full iSCSI support. This commit has adapted from the contribution provided by SZTAKI LPDS. --- src/tm_mad/iscsi/clone | 74 +++++++++++++++++++++++++++++++++-- src/tm_mad/iscsi/delete | 87 +++++++++++++++++++++++++++++++++++------ src/tm_mad/iscsi/ln | 3 +- src/tm_mad/iscsi/mv | 1 - src/tm_mad/iscsi/mvds | 60 +++++++++++++++++++++++++++- 5 files changed, 206 insertions(+), 19 deletions(-) diff --git a/src/tm_mad/iscsi/clone b/src/tm_mad/iscsi/clone index 5d51fdabd4..b0f827830c 100755 --- a/src/tm_mad/iscsi/clone +++ b/src/tm_mad/iscsi/clone @@ -36,8 +36,76 @@ else TMCOMMON=$ONE_LOCATION/var/remotes/tm/tm_common.sh fi -. $TMCOMMON +DRIVER_PATH=$(dirname $0) -log_error "CLONE not supported for TM_ISCSI. Use persistent images" + . $TMCOMMON -exit 1 +#------------------------------------------------------------------------------- +# Set src, dst path and dir +#------------------------------------------------------------------------------- + +TARGET=`arg_path $SRC` + +DST_PATH=`arg_path $DST` +DST_HOST=`arg_host $DST` +DST_DIR=`dirname $DST_PATH` + +#------------------------------------------------------------------------------- +# IQN and TARGETs +#------------------------------------------------------------------------------- + +IQN=$SRC +NEW_IQN=$IQN-$VM_ID + +VG_NAME=`echo $TARGET|$AWK -F. '{print $(NF-1)}'` +LV_NAME=`echo $TARGET|$AWK -F. '{print $(NF)}'` +SOURCE_DEV="/dev/$VG_NAME/$LV_NAME" + +TARGET_LV_NAME=`echo $LV_NAME-$VMID` +TARGET_DEV="/dev/${VG_NAME}/${TARGET_LV_NAME}" +TARGET_HOST="${TARGET%.$VG_NAME.$LV_NAME}" + +#------------------------------------------------------------------------------- +# Clone script +#------------------------------------------------------------------------------- + +CLONE_CMD=$(cat < Date: Thu, 28 Jun 2012 14:58:01 +0200 Subject: [PATCH 4/9] Feature #1254: Dump tgtadmin configuration in the clone and rm events. --- src/datastore_mad/remotes/iscsi/clone | 1 + src/datastore_mad/remotes/iscsi/rm | 1 + 2 files changed, 2 insertions(+) diff --git a/src/datastore_mad/remotes/iscsi/clone b/src/datastore_mad/remotes/iscsi/clone index 8b0fe39205..4dbdd8a821 100755 --- a/src/datastore_mad/remotes/iscsi/clone +++ b/src/datastore_mad/remotes/iscsi/clone @@ -85,6 +85,7 @@ CLONE_CMD=$(cat < Date: Thu, 28 Jun 2012 16:11:54 +0200 Subject: [PATCH 5/9] Feature #1254: Completely drop BASE_TID --- src/datastore_mad/remotes/iscsi/clone | 16 +++++++--------- src/datastore_mad/remotes/iscsi/cp | 1 - src/datastore_mad/remotes/iscsi/mkfs | 2 +- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/datastore_mad/remotes/iscsi/clone b/src/datastore_mad/remotes/iscsi/clone index 4dbdd8a821..f60dd02fa8 100755 --- a/src/datastore_mad/remotes/iscsi/clone +++ b/src/datastore_mad/remotes/iscsi/clone @@ -51,7 +51,6 @@ done < <($XPATH /DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH \ /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/HOST \ /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VG_NAME \ /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BASE_IQN \ - /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BASE_TID \ /DS_DRIVER_ACTION_DATA/IMAGE/PATH \ /DS_DRIVER_ACTION_DATA/IMAGE/SIZE) @@ -62,9 +61,8 @@ UMASK="${XPATH_ELEMENTS[3]}" DST_HOST="${XPATH_ELEMENTS[4]:-$HOST}" VG_NAME="${XPATH_ELEMENTS[5]:-$VG_NAME}" BASE_IQN="${XPATH_ELEMENTS[6]:-$BASE_IQN}" -BASE_TID="${XPATH_ELEMENTS[7]:-$BASE_TID}" -SRC="${XPATH_ELEMENTS[8]}" -SIZE="${XPATH_ELEMENTS[9]}" +SRC="${XPATH_ELEMENTS[7]}" +SIZE="${XPATH_ELEMENTS[8]}" set_up_datastore "$BASE_PATH" "$RESTRICTED_DIRS" "$SAFE_DIRS" "$UMASK" @@ -72,8 +70,6 @@ LV_NAME="lv-one-${ID}" IQN="$BASE_IQN:$DST_HOST.$VG_NAME.$LV_NAME" DEV="/dev/$VG_NAME/$LV_NAME" -let TID=ID+BASE_TID - LV_SRC=$(echo $SRC|awk -F. '{print $NF}') DEV_SRC="/dev/$VG_NAME/$LV_SRC" @@ -82,9 +78,11 @@ CLONE_CMD=$(cat < Date: Thu, 28 Jun 2012 16:45:21 +0200 Subject: [PATCH 6/9] Feature #1254: fix small clone typos --- src/tm_mad/iscsi/clone | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tm_mad/iscsi/clone b/src/tm_mad/iscsi/clone index b0f827830c..384eb7379c 100755 --- a/src/tm_mad/iscsi/clone +++ b/src/tm_mad/iscsi/clone @@ -55,7 +55,7 @@ DST_DIR=`dirname $DST_PATH` #------------------------------------------------------------------------------- IQN=$SRC -NEW_IQN=$IQN-$VM_ID +NEW_IQN=$IQN-$VMID VG_NAME=`echo $TARGET|$AWK -F. '{print $(NF-1)}'` LV_NAME=`echo $TARGET|$AWK -F. '{print $(NF)}'` @@ -76,7 +76,7 @@ CLONE_CMD=$(cat < Date: Thu, 28 Jun 2012 17:23:46 +0200 Subject: [PATCH 7/9] Feature #1254: load iscsi.conf from all the tm iscsi scripts --- src/tm_mad/iscsi/clone | 2 ++ src/tm_mad/iscsi/ln | 3 +++ src/tm_mad/iscsi/mvds | 2 ++ 3 files changed, 7 insertions(+) diff --git a/src/tm_mad/iscsi/clone b/src/tm_mad/iscsi/clone index 384eb7379c..ccce7f0df8 100755 --- a/src/tm_mad/iscsi/clone +++ b/src/tm_mad/iscsi/clone @@ -40,6 +40,8 @@ DRIVER_PATH=$(dirname $0) . $TMCOMMON +source ${DRIVER_PATH}/../../datastore/iscsi/iscsi.conf + #------------------------------------------------------------------------------- # Set src, dst path and dir #------------------------------------------------------------------------------- diff --git a/src/tm_mad/iscsi/ln b/src/tm_mad/iscsi/ln index 3a19daacab..c2529ee253 100755 --- a/src/tm_mad/iscsi/ln +++ b/src/tm_mad/iscsi/ln @@ -38,6 +38,9 @@ fi . $TMCOMMON +DRIVER_PATH=$(dirname $0) + +source ${DRIVER_PATH}/../../datastore/iscsi/iscsi.conf #------------------------------------------------------------------------------- # Set dst path and dir #------------------------------------------------------------------------------- diff --git a/src/tm_mad/iscsi/mvds b/src/tm_mad/iscsi/mvds index 6a89f9ae0c..53d7f87cfc 100755 --- a/src/tm_mad/iscsi/mvds +++ b/src/tm_mad/iscsi/mvds @@ -40,6 +40,8 @@ DRIVER_PATH=$(dirname $0) . $TMCOMMON +source ${DRIVER_PATH}/../../datastore/iscsi/iscsi.conf + SRC_HOST=`arg_host $SRC` NEW_IQN="$DST" From 7bdc2ab16c143a59af3c6ced8f70360e550d65c4 Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Fri, 29 Jun 2012 10:52:23 +0200 Subject: [PATCH 8/9] Feature #1254: Enhance TM MV action --- src/tm_mad/iscsi/mv | 41 ++++++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/src/tm_mad/iscsi/mv b/src/tm_mad/iscsi/mv index 2936cac94f..066c4eeb7a 100755 --- a/src/tm_mad/iscsi/mv +++ b/src/tm_mad/iscsi/mv @@ -71,32 +71,43 @@ if [ "$SRC" == "$DST" ]; then exit 0 fi +#------------------------------------------------------------------------------- +# Get image information +#------------------------------------------------------------------------------- + +XPATH="${DRIVER_PATH}/../../datastore/xpath.rb --stdin" + +unset i XPATH_ELEMENTS + +while IFS= read -r -d '' element; do + XPATH_ELEMENTS[i++]="$element" +done < <(onevm show -x $VMID| $XPATH \ + /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/PERSISTENT) + +PERSISTENT="${XPATH_ELEMENTS[0]}" + +if [ -z "$PERSISTENT" ]; then + IQN=$IQN-$VMID +fi + +#------------------------------------------------------------------------------- +# Start actions +#------------------------------------------------------------------------------- + if is_iscsi "$SRC_HOST"; then log "Logging out of $IQN in $SRC_HOST" LOGOUT_CMD=$(cat < Date: Fri, 29 Jun 2012 09:36:09 +0200 Subject: [PATCH 9/9] Feature #1254: Fix bugs in full iSCSI support --- src/datastore_mad/remotes/iscsi/mkfs | 4 +++- src/tm_mad/iscsi/delete | 18 +++++++++++++----- src/tm_mad/iscsi/mv | 11 +++++++---- src/tm_mad/iscsi/mvds | 8 +++++++- 4 files changed, 30 insertions(+), 11 deletions(-) diff --git a/src/datastore_mad/remotes/iscsi/mkfs b/src/datastore_mad/remotes/iscsi/mkfs index 5554e9bcca..2665bb036d 100755 --- a/src/datastore_mad/remotes/iscsi/mkfs +++ b/src/datastore_mad/remotes/iscsi/mkfs @@ -84,7 +84,9 @@ REGISTER_CMD=$(cat <