From 16f8b14e3150ee6efec728b86c9a07cdd2dc3773 Mon Sep 17 00:00:00 2001 From: "Alan J. Pippin" Date: Sun, 16 Feb 2020 21:35:48 -0700 Subject: [PATCH] Made detecting if zpool is already mounted or unmounted better Change-Id: I39bf8bb70f57ff6d1c7c260207beaadbd855b10d --- zfs-replicate-all | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/zfs-replicate-all b/zfs-replicate-all index f5e23e7..5d606bf 100755 --- a/zfs-replicate-all +++ b/zfs-replicate-all @@ -97,12 +97,12 @@ backup_pools=$backup_pool for backup_pool in $backup_pools; do # Import the local backup pool if needed and the option is given to do so, else error out -zpool list -H "$backup_pool" >/dev/null 2>&1 +zpool list -H $backup_pool >/dev/null 2>&1 if [ $? != 0 ]; then if [[ $import_export_backup_pool == 1 ]]; then zpool import $backup_pool if [ $? != 0 ]; then - fatal_and_exit "-E- unable to import the backup pool $backup_pool on $hostname" "$mailto" + fatal_and_exit "-E- unable to import the backup pool '$backup_pool' on $hostname" "$mailto" fi else fatal_and_exit "-E- The local backup pool on $hostname, '$backup_pool' doesn't seem to exist." "$mailto" @@ -151,8 +151,12 @@ if [[ $import_export_backup_pool == 1 ]]; then if [ $? != 0 ]; then zpool export $backup_pool if [ $? != 0 ]; then - lsof /$backup_pool/* - fatal_and_exit "-E- unable to export the local backup pool $backup_pool on $hostname" "$mailto" 0 + sleep 300 + zpool export $backup_pool + if [ $? != 0 ]; then + lsof /$backup_pool/* + fatal_and_exit "-E- unable to export the local backup pool $backup_pool on $hostname" "$mailto" 0 + fi fi fi fi -- 2.34.1