From 72580769f880e8dff13f4233c2b326ad415dfde0 Mon Sep 17 00:00:00 2001
From: caleb miles <caleb.miles@inktank.com>
Date: Fri, 8 Jun 2012 20:19:18 -0700
Subject: [PATCH] CrushTester: some cleanup

Signed-off-by: caleb miles <caleb.miles@inktank.com>
---
 src/crush/CrushTester.cc | 8 ++++----
 src/crush/CrushTester.h  | 3 ---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/crush/CrushTester.cc b/src/crush/CrushTester.cc
index da55ace3ff096..ba4f7a35c7b66 100644
--- a/src/crush/CrushTester.cc
+++ b/src/crush/CrushTester.cc
@@ -186,7 +186,7 @@ int CrushTester::test()
 #ifdef HAVE_BOOST_RANDOM_DISCRETE_DISTRIBUTION
       float test_chi_statistic = 0.0; // our observed chi squared statistic
       
-      // look up the chi squared statistic for the 5% and 1% confidence levels
+      // look up the maximum expected chi squared statistic for the 5% and 1% confidence levels
       float chi_statistic_five_percent = quantile(complement(chi_squared(num_devices_active-1), 0.05));
       float chi_statistic_one_percent = quantile(complement(chi_squared(num_devices_active-1), 0.01));
 #endif
@@ -362,8 +362,8 @@ int CrushTester::test()
           << " (vs " << chi_statistic_five_percent << " / "
           << chi_statistic_one_percent
           << " for 5% / 1% confidence level) " << std::endl;
-      //err << " total system weight (dec) = " << (total_weight / (float) 0x10000) << std::endl;
-      //err << " number of buckets = " << num_buckets << std::endl;
+      if (output_utilization || output_utilization_all)
+        err << " total system weight (dec) = " << (total_weight / (float) 0x10000) << std::endl;
 
       if (num_batches > 1 && output_statistics) {
         err << " " << num_devices_failing_at_five_percent << "/" << num_devices_active << " ("
@@ -383,7 +383,7 @@ int CrushTester::test()
     for (int i=0; i<n; i++) {
       cout.setf(std::ios::right);
       cout << std::setw(2)
-	   << i << ": " << std::setw(9) << v[i];
+           << i << ": " << std::setw(9) << v[i];
       cout.unsetf(std::ios::right);
       cout << std::endl;
     }
diff --git a/src/crush/CrushTester.h b/src/crush/CrushTester.h
index 56f5f5cd46c64..02470462cd635 100644
--- a/src/crush/CrushTester.h
+++ b/src/crush/CrushTester.h
@@ -24,7 +24,6 @@ class CrushTester {
   bool down_range_marked;
   int mark_down_start;
   int down_range;
-  bool down_ratio_marked;
   float mark_down_device_ratio;
   float mark_down_bucket_ratio;
 
@@ -47,7 +46,6 @@ public:
       down_range_marked(false),
       mark_down_start(0),
       down_range(1),
-      down_ratio_marked(false),
       mark_down_device_ratio(0.0),
       mark_down_bucket_ratio(1.0),
       output_utilization(false),
@@ -88,7 +86,6 @@ public:
     mark_down_bucket_ratio = bucket_ratio;
   }
   void set_device_down_ratio(float device_ratio) {
-    down_ratio_marked = true;
     mark_down_device_ratio = device_ratio;
   }
   void set_device_weight(int dev, float f);
-- 
2.39.5