]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
crushtool/CrushTester: output utilization even with 1 batch
authorSage Weil <sage@redhat.com>
Tue, 2 Dec 2014 18:11:57 +0000 (10:11 -0800)
committerSage Weil <sage@redhat.com>
Sat, 7 Feb 2015 20:33:24 +0000 (12:33 -0800)
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 294b06c6424f4cb69394976add826d9725073b50)

src/crush/CrushTester.cc

index 23f1a7d3b085e6725656d93fb0b6da5d10ce4bcf..c86e0ef1b8f4f73a392c92868b3f37d8f9568629 100644 (file)
@@ -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]