Feature #2568: Support for RBD Format 2 images

This commit is contained in:
Bill Campbell authored and Jaime Melis committed 2014-02-07 10:30:08 +01:00
1 parent e41e5bb88c
commit cbb1d32b73
9 files changed
+74 -66

No files matched your search

+5 -2
View File
@@ -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
+2 -9
View File
@@ -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}"
+31 -19
View File
@@ -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 <<EOF
set -e
# Determine if source file is a TAR archive and process accordingly
TARFILE=$(ssh $DST_HOST file -b --mime-type $TMP_DST)
# create rbd
$QEMU_IMG convert $TMP_DST rbd:$RBD_SOURCE
if [ $TARFILE == "application/x-tar" ]; then
log "Image is a tar archive, unarchiving..."
SRCIMAGEFILE="$STAGING_DIR/$(ssh $DST_HOST tar -tf $TMP_DST)"
ssh_exec_and_log "$DST_HOST" "tar -xf $TMP_DST -C $STAGING_DIR/" \
"Error un-archiving $SRCIMAGEFILE from $TMP_DST on $DST_HOST"
ssh_exec_and_log "$DST_HOST" "rm -f $TMP_DST" \
"Error removing tar archive $TMP_DST on $DST_HOST"
else
log "Image is not a tar archive..."
SRCIMAGEFILE="$STAGING_DIR/$IMAGE_HASH"
fi
# remove original
$RM -f $TMP_DST
EOF
)
FORMAT=$(ssh $DST_HOST qemu-img info $SRCIMAGEFILE | grep "file format:" | awk '{print $3}')
if [ "$FORMAT" != "raw" ]; then
ssh_exec_and_log "$DST_HOST" "$QEMU_IMG convert -O raw $SRCIMAGEFILE $STAGING_DIR/newimage-$ID.raw" \
"Error converting source image to RAW format"
ssh_exec_and_log "$DST_HOST" "rbd import --format 2 $STAGING_DIR/newimage-$ID.raw $RBD_SOURCE" \
"Error importing RAW image $STAGING_DIR/newimage-$ID.raw to cluster image $RBD_SOURCE"
ssh_exec_and_log "$DST_HOST" "$RM -f $STAGING_DIR/newimage-$ID.raw" \
"Error removing temporary RAW image $STAGING_DIR/newimage-$ID.raw on $DST_HOST. Manual removal is required."
else
ssh_exec_and_log "$DST_HOST" "rbd import --format 2 $SRCIMAGEFILE $RBD_SOURCE" \
"Error importing RAW image $SRCIMAGEFILE to cluster image $RBD_SOURCE"
fi
ssh_exec_and_log "$DST_HOST" "$RM -f $SRCIMAGEFILE" \
"Error removing temporary RAW image $SRCIMAGEFILE on $DST_HOST. Manual removal is required."
ssh_exec_and_log "$DST_HOST" "$REGISTER_CMD" \
"Error registering $RBD_SOURCE in $DST_HOST"
echo "$RBD_SOURCE"
+3 -11
View File
@@ -49,7 +49,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/FSTYPE \
@@ -60,19 +60,12 @@ 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}"
FSTYPE="${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
set_up_datastore "$BASE_PATH" "$RESTRICTED_DIRS" "$SAFE_DIRS"
IMAGE_HASH=`generate_image_hash`
@@ -94,14 +87,13 @@ MKFS_CMD=`mkfs_command $TMP_DST $FSTYPE $SIZE`
REGISTER_CMD=$(cat <<EOF
set -e
export PATH=/usr/sbin:/sbin:\$PATH
# create and format
$DD if=/dev/zero of=$TMP_DST bs=1 count=1 seek=${SIZE}M
$MKFS_CMD
# create rbd
$QEMU_IMG convert $TMP_DST rbd:$RBD_SOURCE
$QEMU_IMG convert -O rbd $TMP_DST rbd:$RBD_SOURCE
# remove original
$RM -f $TMP_DST
+5 -12
View File
@@ -41,27 +41,20 @@ ID=$2
XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
unset i j XPATH_ELEMENTS
unset i XPATH_ELEMENTS
while IFS= read -r -d '' element; do
XPATH_ELEMENTS[i++]="$element"
done < <($XPATH /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BRIDGE_LIST \
done < <($XPATH /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/HOST \
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/POOL_NAME)
BRIDGE_LIST="${XPATH_ELEMENTS[j++]}"
POOL_NAME="${XPATH_ELEMENTS[j++]:-$POOL_NAME}"
HOST=`get_destination_host`
if [ -z "$HOST" ]; then
error_message "Datastore template missing 'BRIDGE_LIST' attribute."
exit -1
fi
HOST="${XPATH_ELEMENTS[0]:-$HOST}"
POOL_NAME="${XPATH_ELEMENTS[1]:-$POOL_NAME}"
# ------------ Compute datastore usage -------------
MONITOR_SCRIPT=$(cat <<EOF
$RADOS df | $AWK '{
$SUDO $RADOS df | $AWK '{
if (\$1 == "total") {
space = int(\$3/1024)
+5 -10
View File
@@ -40,22 +40,17 @@ ID=$2
XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
unset i j XPATH_ELEMENTS
unset i XPATH_ELEMENTS
while IFS= read -r -d '' element; do
XPATH_ELEMENTS[i++]="$element"
done < <($XPATH /DS_DRIVER_ACTION_DATA/IMAGE/SOURCE \
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BRIDGE_LIST)
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/HOST)
SRC="${XPATH_ELEMENTS[j++]}"
BRIDGE_LIST="${XPATH_ELEMENTS[j++]}"
unset i
DST_HOST=`get_destination_host $ID`
if [ -z "$DST_HOST" ]; then
error_message "Datastore template missing 'BRIDGE_LIST' attribute."
exit -1
fi
SRC="${XPATH_ELEMENTS[i++]}"
DST_HOST="${XPATH_ELEMENTS[i++]:-$HOST}"
log "Removing $SRC from the rbd image repository in $DST_HOST"
+10 -3
View File
@@ -1,7 +1,7 @@
#!/bin/bash
# -------------------------------------------------------------------------- #
# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs #
# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs #
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
# not use this file except in compliance with the License. You may obtain #
@@ -47,11 +47,18 @@ SRC_PATH=`arg_path $SRC`
DISK_ID=$(echo $DST|awk -F. '{print $NF}')
RBD_DST="${SRC_PATH}-${VM_ID}-${DISK_ID}"
RBD_SNAP="${VM_ID}-${DISK_ID}"
#-------------------------------------------------------------------------------
# Clone the image
#-------------------------------------------------------------------------------
ssh_exec_and_log "$DST_HOST" "$RBD copy $SRC_PATH $RBD_DST" \
"Error cloning $SRC_PATH to $RBD_DST in $DST_HOST"
## Create snapshot of existing image
ssh_exec_and_log "$DST_HOST" "$RBD snap create $SRC_PATH@$RBD_SNAP" \
"Error creating snapshot of $SRC_PATH"
ssh_exec_and_log "$DST_HOST" "$RBD snap protect $SRC_PATH@$RBD_SNAP" \
"Error preparing snapshot $RBD_SNAP of $SRC_PATH"
ssh_exec_and_log "$DST_HOST" "$RBD clone $SRC_PATH@$RBD_SNAP $RBD_DST" \
"Error creating clone of $SRC_PATH to $RBD_DST from snapshot $RBD_SNAP"
exit 0
+5
View File
@@ -77,6 +77,7 @@ PERSISTENT="${XPATH_ELEMENTS[j++]}"
# non persistent, so the name will be "<pool>/one-<imageid>-<vmid>-<diskid>"
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
+8
View File
@@ -69,6 +69,7 @@ PERSISTENT="${XPATH_ELEMENTS[j++]}"
# non persistent, so the name will be "<pool>/one-<imageid>-<vmid>-<diskid>"
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