From cbb1d32b7348ff7d9e40aff7540136f2a3b980cd Mon Sep 17 00:00:00 2001 From: Bill Campbell Date: Fri, 7 Feb 2014 10:30:08 +0100 Subject: [PATCH] Feature #2568: Support for RBD Format 2 images --- src/datastore_mad/remotes/ceph/ceph.conf | 7 +++- src/datastore_mad/remotes/ceph/clone | 11 +----- src/datastore_mad/remotes/ceph/cp | 50 +++++++++++++++--------- src/datastore_mad/remotes/ceph/mkfs | 14 ++----- src/datastore_mad/remotes/ceph/monitor | 17 +++----- src/datastore_mad/remotes/ceph/rm | 15 +++---- src/tm_mad/ceph/clone | 13 ++++-- src/tm_mad/ceph/delete | 5 +++ src/tm_mad/ceph/mvds | 8 ++++ 9 files changed, 74 insertions(+), 66 deletions(-) diff --git a/src/datastore_mad/remotes/ceph/ceph.conf b/src/datastore_mad/remotes/ceph/ceph.conf index ebd0123739..7af0151c81 100644 --- a/src/datastore_mad/remotes/ceph/ceph.conf +++ b/src/datastore_mad/remotes/ceph/ceph.conf @@ -15,10 +15,13 @@ #--------------------------------------------------------------------------- # # Default POOL_NAME -POOL_NAME=one +POOL_NAME=rbd + +# Default Ceph server host. Storage operations will be performed in this host. +HOST=localhost # Staging directory # A directory in the Ceph server host where image will be transferred to # temporarily during the create/mkfs processes. This directoy MUST exist, # have enough space and be writeable by 'oneadmin' -STAGING_DIR=/var/tmp +STAGING_DIR=/var/tmp/one diff --git a/src/datastore_mad/remotes/ceph/clone b/src/datastore_mad/remotes/ceph/clone index 315711fb1e..b32ac9f42b 100755 --- a/src/datastore_mad/remotes/ceph/clone +++ b/src/datastore_mad/remotes/ceph/clone @@ -45,7 +45,7 @@ unset i XPATH_ELEMENTS while IFS= read -r -d '' element; do XPATH_ELEMENTS[i++]="$element" done < <($XPATH /DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH \ - /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BRIDGE_LIST \ + /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/HOST \ /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/POOL_NAME \ /DS_DRIVER_ACTION_DATA/IMAGE/PATH \ /DS_DRIVER_ACTION_DATA/IMAGE/SIZE) @@ -53,18 +53,11 @@ done < <($XPATH /DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH \ unset i BASE_PATH="${XPATH_ELEMENTS[i++]}" -BRIDGE_LIST="${XPATH_ELEMENTS[i++]}" +DST_HOST="${XPATH_ELEMENTS[i++]:-$HOST}" POOL_NAME="${XPATH_ELEMENTS[i++]:-$POOL_NAME}" SRC="${XPATH_ELEMENTS[i++]}" SIZE="${XPATH_ELEMENTS[i++]}" -DST_HOST=`get_destination_host $ID` - -if [ -z "$DST_HOST" ]; then - error_message "Datastore template missing 'BRIDGE_LIST' attribute." - exit -1 -fi - SAFE_DIRS="" IMAGE_NAME="one-${ID}" diff --git a/src/datastore_mad/remotes/ceph/cp b/src/datastore_mad/remotes/ceph/cp index 8a55e8f159..04b29fda9c 100755 --- a/src/datastore_mad/remotes/ceph/cp +++ b/src/datastore_mad/remotes/ceph/cp @@ -51,7 +51,7 @@ while IFS= read -r -d '' element; do done < <($XPATH /DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH \ /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/RESTRICTED_DIRS \ /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/SAFE_DIRS \ - /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BRIDGE_LIST \ + /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/HOST \ /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/POOL_NAME \ /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/STAGING_DIR \ /DS_DRIVER_ACTION_DATA/IMAGE/PATH \ @@ -66,7 +66,7 @@ unset i BASE_PATH="${XPATH_ELEMENTS[i++]}" RESTRICTED_DIRS="${XPATH_ELEMENTS[i++]}" SAFE_DIRS="${XPATH_ELEMENTS[i++]}" -BRIDGE_LIST="${XPATH_ELEMENTS[i++]}" +DST_HOST="${XPATH_ELEMENTS[i++]:-$HOST}" POOL_NAME="${XPATH_ELEMENTS[i++]:-$POOL_NAME}" STAGING_DIR="${XPATH_ELEMENTS[i++]:-$STAGING_DIR}" SRC="${XPATH_ELEMENTS[i++]}" @@ -76,13 +76,6 @@ SHA1="${XPATH_ELEMENTS[i++]}" NO_DECOMPRESS="${XPATH_ELEMENTS[i++]}" LIMIT_TRANSFER_BW="${XPATH_ELEMENTS[i++]}" -DST_HOST=`get_destination_host $ID` - -if [ -z "$DST_HOST" ]; then - error_message "Datastore template missing 'BRIDGE_LIST' attribute." - exit -1 -fi - set_up_datastore "$BASE_PATH" "$RESTRICTED_DIRS" "$SAFE_DIRS" IMAGE_HASH=`generate_image_hash` @@ -118,18 +111,37 @@ esac exec_and_log "eval $DUMP | $SSH $DST_HOST $DD of=$TMP_DST bs=64k" \ "Error dumping $SRC to $DST_HOST:$TMP_DST" -REGISTER_CMD=$(cat </one---" RBD_SRC="${SRC}-${VM_ID}-${DISK_ID}" +RBD_SNAP="${VM_ID}-${DISK_ID}" #------------------------------------------------------------------------------- # Delete the device @@ -89,5 +90,9 @@ log "Deleting $DST_PATH" ssh_exec_and_log "$DST_HOST" "$RBD rm $RBD_SRC" \ "Error deleting $RBD_SRC in $DST_HOST" +ssh_exec_and_log "$DST_HOST" "$RBD snap unprotect $SRC@$RBD_SNAP" \ + "Error unprotecting snapshot $RBD_SNAP of image $SRC" +ssh_exec_and_log "$DST_HOST" "$RBD snap rm $SRC@$RBD_SNAP" \ + "Error removing snapshot $RBD_SNAP of image $SRC" exit 0 diff --git a/src/tm_mad/ceph/mvds b/src/tm_mad/ceph/mvds index df6b5f0b40..6d97e29322 100755 --- a/src/tm_mad/ceph/mvds +++ b/src/tm_mad/ceph/mvds @@ -69,6 +69,7 @@ PERSISTENT="${XPATH_ELEMENTS[j++]}" # non persistent, so the name will be "/one---" RBD_DST="${RBD_SRC}-${VM_ID}-${DISK_ID}" +RBD_SNAP="${VM_ID}-${DISK_ID}" #------------------------------------------------------------------------------- # Move the image back to the datastore @@ -76,7 +77,14 @@ RBD_DST="${RBD_SRC}-${VM_ID}-${DISK_ID}" log "Dumping $RBD_DST to $DST" +ssh_exec_and_log "$SRC_HOST" "$RBD flatten $RBD_DST" \ + "Error copying data from master image $RBD_SRC to $RBD_DST" +ssh_exec_and_log "$SRC_HOST" "$RBD snap unprotect $RBD_SRC@$RBD_SNAP" \ + "Error unprotecting snapshot $RBD_SNAP of image $RBD_SRC" +ssh_exec_and_log "$SRC_HOST" "$RBD snap rm $RBD_SRC@$RBD_SNAP" \ + "Error removing snapshot $RBD_SNAP of image $RBD_SRC" ssh_exec_and_log "$SRC_HOST" "$RBD rename $RBD_DST $DST" \ "Error saving $RBD_DST as $DST in $SRC_HOST" + exit 0