From: norbert.bizet <norbert.bizet@baculasystems.com>
Date: Thu, 24 Aug 2023 10:27:53 +0000 (-0400)
Subject: cloud: Fix #10259 Oracle cloud failed behind. Several updates
X-Git-Tag: Beta-15.0.0~132
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdb39e9a696679c1d091a9e610b85ad6922f640d;p=thirdparty%2Fbacula.git

cloud: Fix #10259 Oracle cloud failed behind. Several updates
---

diff --git a/bacula/src/stored/generic_driver.c b/bacula/src/stored/generic_driver.c
index 6819c8563..abde8b341 100644
--- a/bacula/src/stored/generic_driver.c
+++ b/bacula/src/stored/generic_driver.c
@@ -1128,17 +1128,20 @@ bool generic_driver::clean_cloud_volume(const char *VolumeName, cleanup_cb_type
       if (!parts.get(i)) {
          continue;
       }
-      rtn |= call_fct("delete", VolumeName, (char*)parts.get(i), NULL, NULL, cancel_cb, err);
-      if (rtn == 0) {
+      int r = call_fct("delete", VolumeName, (char*)parts.get(i), NULL, NULL, cancel_cb, err);
+      if (r == 0) {
          Dmsg2(dbglvl, "clean_cloud_volume for %s: Unlink file %s.\n", VolumeName, (char*)parts.get(i));
+      } else {
+         Dmsg4(dbglvl, "clean_cloud_volume delete %s/%s returns %d. err=%s\n", VolumeName, (char*)parts.get(i), r, err);
       }
+      rtn |= r;
       if ((cancel_cb && cancel_cb->fct && cancel_cb->fct(cancel_cb->arg))) {
          Mmsg(err, _("clean_cloud_volume. cancelled by job.\n"));
          return false;
       }
    }
 
-   return (ret == 0);
+   return (ret|rtn == 0);
 }
 
 struct get_cloud_volume_parts_list_read_cb_arg {
diff --git a/regress/scripts/functions b/regress/scripts/functions
index 05ee29cf2..f2ff48566 100755
--- a/regress/scripts/functions
+++ b/regress/scripts/functions
@@ -63,7 +63,7 @@ update_cloud()
    fi
 
    if [ x$CLOUD_NAME = xOracleCloud -a -f $HOME/.oci/config ]; then
-       oci  os bucket create --name ${1:-regressbucket}
+       #oci  os bucket create --name ${1:-regressbucket} --compartiment-id 
        $bperl -e "add_attribute('$conf/bacula-sd.conf', 'HostName', '$HOME/.oci/config', 'Cloud', 'OracleCloud')"
    fi