feature #3362: Restore non-live snapshot support

src/tm_mad/ceph/snap_create

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project (OpenNebula.org), C12G Labs        #
+# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # 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    #
@@ -69,7 +69,7 @@ else
 fi
 
 #-------------------------------------------------------------------------------
-# Create snapshots (stored in the current volume)
+# Create snapshots
 #-------------------------------------------------------------------------------
 
 if [ -n "$CEPH_USER" ]; then
@@ -88,6 +88,8 @@ SNAP_CREATE_CMD=$(cat <<EOF
 
     $RBD snap create $RBD_DST@$SNAP_ID
     $RBD snap protect $RBD_DST@$SNAP_ID
+    $RBD rename $RBD_DST $RBD_DST-$SNAP_ID
+    $RBD clone $RBD_DST-$SNAP_ID@$SNAP_ID $RBD_DST
 EOF
 )
 

src/tm_mad/ceph/snap_create_live

@@ -1 +0,0 @@
-../common/not_supported.sh

src/tm_mad/ceph/snap_create_live

@@ -0,0 +1,97 @@
+#!/bin/bash
+
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2015, 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    #
+# a copy of the License at                                                   #
+#                                                                            #
+# http://www.apache.org/licenses/LICENSE-2.0                                 #
+#                                                                            #
+# Unless required by applicable law or agreed to in writing, software        #
+# distributed under the License is distributed on an "AS IS" BASIS,          #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+# See the License for the specific language governing permissions and        #
+# limitations under the License.                                             #
+#--------------------------------------------------------------------------- #
+
+# snap_create host:parent_image snap_id vmid ds_id
+
+SRC=$1
+SNAP_ID=$2
+VM_ID=$3
+DS_ID=$4
+
+if [ -z "${ONE_LOCATION}" ]; then
+    TMCOMMON=/var/lib/one/remotes/tm/tm_common.sh
+else
+    TMCOMMON=$ONE_LOCATION/var/remotes/tm/tm_common.sh
+fi
+
+DRIVER_PATH=$(dirname $0)
+
+source $TMCOMMON
+source ${DRIVER_PATH}/../../datastore/ceph/ceph.conf
+
+#-------------------------------------------------------------------------------
+# Set dst path and dir
+#-------------------------------------------------------------------------------
+
+SRC_HOST=`arg_host $SRC`
+SRC_PATH=`arg_path $SRC`
+
+#-------------------------------------------------------------------------------
+# Get Image information
+#-------------------------------------------------------------------------------
+
+DISK_ID=$(echo "$SRC_PATH" | $AWK -F. '{print $NF}')
+
+XPATH="${DRIVER_PATH}/../../datastore/xpath.rb --stdin"
+
+unset i j XPATH_ELEMENTS
+
+while IFS= read -r -d '' element; do
+    XPATH_ELEMENTS[i++]="$element"
+done < <(onevm show -x $VM_ID| $XPATH \
+                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/SOURCE \
+                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CLONE \
+                    /VM/TEMPLATE/DISK[DISK_ID=$DISK_ID]/CEPH_USER)
+
+RBD_SRC="${XPATH_ELEMENTS[j++]}"
+CLONE="${XPATH_ELEMENTS[j++]}"
+CEPH_USER="${XPATH_ELEMENTS[j++]}"
+
+if [ "$CLONE" = "NO" ]; then
+    RBD_DST="${RBD_SRC}"
+else
+    RBD_DST="${RBD_SRC}-${VM_ID}-${DISK_ID}"
+fi
+
+#-------------------------------------------------------------------------------
+# Create snapshots (stored in the current volume)
+#-------------------------------------------------------------------------------
+
+if [ -n "$CEPH_USER" ]; then
+    RBD="$RBD --id ${CEPH_USER}"
+fi
+
+SNAP_CREATE_CMD=$(cat <<EOF
+    set -e
+
+    RBD_FORMAT=\$($RBD info $RBD_SRC | sed -n 's/.*format: // p')
+
+    if [ "\${RBD_FORMAT}" != "2" ]; then
+        echo "Only RBD Format 2 is supported for this operation" >&2
+        exit 1
+    fi
+
+    $RBD snap create $RBD_DST@$SNAP_ID
+    $RBD snap protect $RBD_DST@$SNAP_ID
+EOF
+)
+
+ssh_exec_and_log "$SRC_HOST" "$SNAP_CREATE_CMD" \
+                 "Error creating snapshot $RBD_DST@$SNAP_ID"
+
+exit 0