Merge branch 'bareos-16.2'

bareos · Aug 12, 2016 · f4784a7 · f4784a7
2 parents ba0e963 + 5a4c362
commit f4784a7
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 24 deletions.
diff --git a/src/dird/stats.c b/src/dird/stats.c
@@ -370,7 +370,7 @@ void stats_job_started()
    /*
     * A new Job was started so we need to flush any pending statistics the next run.
     */
-   if (!statistics_initialized) {
+   if (statistics_initialized) {
       need_flush = true;
    }
 }
diff --git a/src/stored/Makefile.in b/src/stored/Makefile.in
@@ -41,7 +41,7 @@ CEPHFS_LIBS = @CEPHFS_LIBS@
 ELASTO_LIBS = @ELASTO_LIBS@
 DROPLET_LIBS = @DROPLET_LIBS@
 GLUSTER_LIBS = @GLUSTER_LIBS@
-RADOS_LIBS = @RADOS_LIBS@
+RADOS_LIBS = @RADOS_STRIPER_LIBS@ @RADOS_LIBS@
 AVAILABLE_BACKEND_LIBS = $(CEPHFS_LIBS) $(ELASTO_LIBS) $(DROPLET_LIBS) $(GLUSTER_LIBS) $(RADOS_LIBS)
 LIBS += @NEEDED_BACKEND_LIBS@
 

diff --git a/src/stored/status.c b/src/stored/status.c
@@ -188,6 +188,32 @@ static bool need_to_list_device(const char *devicenames, const char *devicename)
    return false;
 }
 
+static bool need_to_list_device(const char *devicenames, DEVRES *device)
+{
+   /*
+    * See if we are requested to list an explicit device name.
+    * e.g. this happens when people address one particular device in
+    * a autochanger via its own storage definition or an non autochanger device.
+    */
+   if (!need_to_list_device(devicenames, device->name())) {
+      /*
+       * See if this device is part of an autochanger.
+       */
+      if (device->changer_res) {
+         /*
+          * See if we need to list this particular device part of the given autochanger.
+          */
+         if (!need_to_list_device(devicenames, device->changer_res->name())) {
+            return false;
+         }
+      } else {
+         return false;
+      }
+   }
+
+   return true;
+}
+
 static void list_devices(JCR *jcr, STATUS_PKT *sp, const char *devicenames)
 {
    int len;
@@ -226,28 +252,8 @@ static void list_devices(JCR *jcr, STATUS_PKT *sp, const char *devicenames)
    }
 
    foreach_res(device, R_DEVICE) {
-      /*
-       * See if we need to check for devicenames at all.
-       */
-      if (devicenames) {
-         /*
-          * See if this device is part of an autochanger.
-          */
-         if (device->changer_res) {
-            /*
-             * See if we need to list this particular device part of the given autochanger.
-             */
-            if (!need_to_list_device(devicenames, device->changer_res->name())) {
-               continue;
-            }
-         } else {
-            /*
-             * Try matching a non autochanger device.
-             */
-            if (!need_to_list_device(devicenames, device->name())) {
-               continue;
-            }
-         }
+      if (devicenames && !need_to_list_device(devicenames, device)) {
+         continue;
       }
 
       dev = device->dev;