B #6078: intoduce retry_if/retry_if_no_error (#2478) (#2497)

(cherry picked from commit bb75e5f)
OpenNebula · Feb 13, 2023 · 1c938fe · 1c938fe
1 parent b94a12d
commit 1c938fe
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/tm_mad/ssh/cpds b/src/tm_mad/ssh/cpds
@@ -106,7 +106,7 @@ if [ "${LCM_STATE}" = '26' -a "${SNAP_ID}" = '-1' ]; then
     log "VM is running, trying blockcopy, fsfreeze, suspend"
 
     CPDS_CMD_EXPORT=$(cat <<EOF
-$(type retry_if| grep -v 'is a function')
+$(type retry_if_no_error| grep -v 'is a function')
 
 touch ${SRC_TEMP_PATH}
 if ! retry_if_no_error "active block job" 3 5 virsh -c ${LIBVIRT_URI} blockcopy ${DEPLOY_ID} ${DISK_TARGET} ${SRC_TEMP_PATH} --wait --finish; then

diff --git a/src/tm_mad/ssh/snap_create_live b/src/tm_mad/ssh/snap_create_live
@@ -67,7 +67,7 @@ REPLICA_HOST=$(get_replica_host $DS_ID)
 
 CMD=$(cat <<EOT
 set -ex -o pipefail
-$(type retry_if| grep -v 'is a function')
+$(type retry_if_no_error| grep -v 'is a function')
 
 mkdir -p "${SNAP_DIR}"
 touch $SNAP_PATH

diff --git a/src/vmm_mad/remotes/kvm/migrate b/src/vmm_mad/remotes/kvm/migrate
@@ -214,7 +214,7 @@ else
         DISK_OPTS="--copy-storage-all --migrate-disks ${MIGRATE_DISKS}"
     fi
 
-    retry_if "active block job" 3 5 \
+    retry_if_no_error "active block job" 3 5 \
         virsh --connect $LIBVIRT_URI migrate \
         --live $MIGRATE_OPTIONS $DEPLOY_ID $QEMU_PROTOCOL://$DEST_HOST/system \
         $DISK_OPTS