From: Sage Weil <sage@redhat.com>
Date: Tue, 2 Dec 2014 18:11:57 +0000 (-0800)
Subject: crushtool/CrushTester: output utilization even with 1 batch
X-Git-Tag: v0.80.9~11^2~18
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8c48ebbf13e6bdb689b4b8ae58ac811653ad2acc;p=ceph.git

crushtool/CrushTester: output utilization even with 1 batch

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 294b06c6424f4cb69394976add826d9725073b50)
---

diff --git a/src/crush/CrushTester.cc b/src/crush/CrushTester.cc
index 23f1a7d3b08..c86e0ef1b8f 100644
--- a/src/crush/CrushTester.cc
+++ b/src/crush/CrushTester.cc
@@ -539,14 +539,14 @@ int CrushTester::test()
 
       if (output_statistics)
         for (unsigned i = 0; i < per.size(); i++) {
-          if (output_utilization && num_batches > 1){
+          if (output_utilization) {
             if (num_objects_expected[i] > 0 && per[i] > 0) {
               err << "  device " << i << ":\t"
                   << "\t" << " stored " << ": " << per[i]
                   << "\t" << " expected " << ": " << num_objects_expected[i]
                   << std::endl;
             }
-          } else if (output_utilization_all && num_batches > 1) {
+          } else if (output_utilization_all) {
             err << "  device " << i << ":\t"
                 << "\t" << " stored " << ": " << per[i]
                 << "\t" << " expected " << ": " << num_objects_expected[i]