From 8d40a75a31968f3099fbd8203b803b847ad8a215 Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Thu, 13 Aug 2015 15:38:41 +0200
Subject: [PATCH] Feature #1727: Fix logic. Only resize of ORIGINAL_SIZE is
 defined and if it's smaller than the desired size.

---
 src/tm_mad/ceph/clone   |  4 ++--
 src/tm_mad/qcow2/clone  |  7 ++++---
 src/tm_mad/shared/clone | 10 ++++------
 src/tm_mad/ssh/clone    |  4 +---
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/tm_mad/ceph/clone b/src/tm_mad/ceph/clone
index 8b4e70e879..cd062a3b75 100755
--- a/src/tm_mad/ceph/clone
+++ b/src/tm_mad/ceph/clone
@@ -66,7 +66,7 @@ while IFS= read -r -d '' element; do
 
 CEPH_USER="${XPATH_ELEMENTS[j++]}"
 SIZE="${XPATH_ELEMENTS[j++]}"
-ORIGINAL_SIZE="${XPATH_ELEMENTS[j++]:-0}"
+ORIGINAL_SIZE="${XPATH_ELEMENTS[j++]}"
 
 #-------------------------------------------------------------------------------
 # Clone the image
@@ -91,7 +91,7 @@ CLONE_CMD=$(cat <<EOF
         $RBD copy $SRC_PATH $RBD_DST
     fi
 
-    if [ "$SIZE" -ge "$ORIGINAL_SIZE" ]; then
+    if [ -n "$ORIGINAL_SIZE" -a "$SIZE" -gt "$ORIGINAL_SIZE" ]; then
         $RBD resize $RBD_DST --size $SIZE
     fi
 EOF
diff --git a/src/tm_mad/qcow2/clone b/src/tm_mad/qcow2/clone
index 225b90c250..9d98c666ed 100755
--- a/src/tm_mad/qcow2/clone
+++ b/src/tm_mad/qcow2/clone
@@ -80,6 +80,10 @@ ssh_make_path $DST_HOST $DST_DIR
 # Clone (cp) SRC into DST
 #-------------------------------------------------------------------------------
 
+if [ -n "$ORIGINAL_SIZE" -a "$SIZE" -gt "$ORIGINAL_SIZE" ]; then
+   RESIZE_CMD="qemu-img resize ${DST_PATH} ${SIZE}M"
+fi
+
 CLONE_CMD=$(cat <<EOF
 cd $DST_DIR
 mkdir -p ${DST_PATH}.snap
@@ -101,9 +105,6 @@ http://*)
 *)
     log "Cloning $SRC_PATH in $DST"
 
-    if [ -n "$ORIGINAL_SIZE" -a "$SIZE" -gt "$ORIGINAL_SIZE" ]; then
-       RESIZE_CMD="qemu-img resize ${DST_PATH} ${SIZE}M"
-    fi
 
     ssh_exec_and_log "$DST_HOST" "$CLONE_CMD" "Error copying $SRC to $DST"
     ;;
diff --git a/src/tm_mad/shared/clone b/src/tm_mad/shared/clone
index 1eb1de5c92..38524921fb 100755
--- a/src/tm_mad/shared/clone
+++ b/src/tm_mad/shared/clone
@@ -84,6 +84,10 @@ ssh_make_path $DST_HOST $DST_DIR
 # Clone (cp) SRC into DST
 #-------------------------------------------------------------------------------
 
+if [ -n "$ORIGINAL_SIZE" -a "$SIZE" -gt "$ORIGINAL_SIZE" ]; then
+   RESIZE_CMD="; qemu-img resize ${DST_PATH} ${SIZE}M"
+fi
+
 case $SRC in
 http://*)
     log "Downloading $SRC into $DST_PATH"
@@ -95,12 +99,6 @@ http://*)
 *)
     log "Cloning $SRC_PATH in $DST"
 
-    ORIGINAL_SIZE=${ORIGINAL_SIZE:-0}
-
-#    if [ "$SIZE" -ge "$ORIGINAL_SIZE" ]; then
-#       RESIZE_CMD="; qemu-img resize ${DST_PATH} ${SIZE}M"
-#    fi
-
     CLONE_CMD="cd ${DST_DIR}; \
         cp ${SRC_PATH} ${DST_PATH} \
         ${RESIZE_CMD}"
diff --git a/src/tm_mad/ssh/clone b/src/tm_mad/ssh/clone
index e145fba522..b34883777c 100755
--- a/src/tm_mad/ssh/clone
+++ b/src/tm_mad/ssh/clone
@@ -93,9 +93,7 @@ http://*)
             "Error copying $SRC to $DST"
     fi
 
-    ORIGINAL_SIZE=${ORIGINAL_SIZE:-0}
-
-    if [ "$SIZE" -ge "$ORIGINAL_SIZE" ]; then
+    if [ -n "$ORIGINAL_SIZE" -a "$SIZE" -gt "$ORIGINAL_SIZE" ]; then
        RESIZE_CMD="qemu-img resize ${DST_PATH} ${SIZE}M"
        ssh_exec_and_log "$DST_HOST" "$RESIZE_CMD" \
            "Error resizing image $DST"