osd, crush: caps for headers

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/crush/CrushWrapper.cc b/src/crush/CrushWrapper.cc
index bef044043471a40e4d06d26636aadace5746b839..954d8b210ea66a94b96726bdf5e9c0e0cfa350ed 100644 (file)
--- a/src/crush/CrushWrapper.cc
+++ b/src/crush/CrushWrapper.cc
@@ -1495,7 +1495,7 @@ public:
     : Parent(crush), weights(w) {}
 
   void dump(ostream *out) {
-    *out << "# id\tweight\ttype name\treweight\n";
+    *out << "ID\tWEIGHT\tTYPE NAME\tREWEIGHT\n";
     Parent::dump(out);
   }
 

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 9cb73753f852bd55b39535f9c565d0f44d3271a8..921b248c8a13971c5b29577d1321c1d750187920 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -716,16 +716,16 @@ public:
     Parent(crush, osdmap, pgm, tree) {}
 
   void dump(TextTable *tbl) {
-    tbl->define_column("# id", TextTable::LEFT, TextTable::RIGHT);
-    tbl->define_column("weight", TextTable::LEFT, TextTable::RIGHT);
-    tbl->define_column("reweight", TextTable::LEFT, TextTable::RIGHT);
-    tbl->define_column("size", TextTable::LEFT, TextTable::RIGHT);
-    tbl->define_column("used", TextTable::LEFT, TextTable::RIGHT);
-    tbl->define_column("avail", TextTable::LEFT, TextTable::RIGHT);
-    tbl->define_column("%use", TextTable::LEFT, TextTable::RIGHT);
-    tbl->define_column("var", TextTable::LEFT, TextTable::RIGHT);
+    tbl->define_column("ID", TextTable::LEFT, TextTable::RIGHT);
+    tbl->define_column("WEIGHT", TextTable::LEFT, TextTable::RIGHT);
+    tbl->define_column("REWEIGHT", TextTable::LEFT, TextTable::RIGHT);
+    tbl->define_column("SIZE", TextTable::LEFT, TextTable::RIGHT);
+    tbl->define_column("USE", TextTable::LEFT, TextTable::RIGHT);
+    tbl->define_column("AVAIL", TextTable::LEFT, TextTable::RIGHT);
+    tbl->define_column("%USE", TextTable::LEFT, TextTable::RIGHT);
+    tbl->define_column("VAR", TextTable::LEFT, TextTable::RIGHT);
     if (tree)
-      tbl->define_column("type name", TextTable::LEFT, TextTable::LEFT);
+      tbl->define_column("TYPE NAME", TextTable::LEFT, TextTable::LEFT);
 
     Parent::dump(tbl);
 
@@ -771,13 +771,13 @@ protected:
 public:
   string summary() {
     ostringstream out;
-    out << "# total size/used/avail: " << si_t(pgm->osd_sum.kb)
+    out << "TOTAL SIZE/USED/AVAIL: " << si_t(pgm->osd_sum.kb)
        << "/" << si_t(pgm->osd_sum.kb_used << 10)
        << "/" << si_t(pgm->osd_sum.kb_avail << 10) << "\n"
-       << "# avg %use: " << lowprecision_t(average_util) << "  "
-       << "min/max var: " << lowprecision_t(min_var)
+       << "AVG %USE: " << lowprecision_t(average_util) << "  "
+       << "MIN/MAX VAR: " << lowprecision_t(min_var)
        << "/" << lowprecision_t(max_var) << "  "
-       << "dev: " << lowprecision_t(dev());
+       << "STDDEV: " << lowprecision_t(dev());
     return out.str();
   }
 };

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index c956b731f729cfc12f1aeb37fb3526fdcd504c4b..57205d685eb51db47fb1d7e0c9cdae5fb7d46a64 100644 (file)
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -2456,12 +2456,12 @@ public:
     : Parent(crush), osdmap(osdmap_) {}
 
   void dump(TextTable *tbl) {
-    tbl->define_column("# id", TextTable::LEFT, TextTable::RIGHT);
-    tbl->define_column("weight", TextTable::LEFT, TextTable::RIGHT);
-    tbl->define_column("type name", TextTable::LEFT, TextTable::LEFT);
-    tbl->define_column("up/down", TextTable::LEFT, TextTable::RIGHT);
-    tbl->define_column("reweight", TextTable::LEFT, TextTable::RIGHT);
-    tbl->define_column("primary-affinity", TextTable::LEFT, TextTable::RIGHT);
+    tbl->define_column("ID", TextTable::LEFT, TextTable::RIGHT);
+    tbl->define_column("WEIGHT", TextTable::LEFT, TextTable::RIGHT);
+    tbl->define_column("TYPE NAME", TextTable::LEFT, TextTable::LEFT);
+    tbl->define_column("UP/DOWN", TextTable::LEFT, TextTable::RIGHT);
+    tbl->define_column("REWEIGHT", TextTable::LEFT, TextTable::RIGHT);
+    tbl->define_column("PRIMARY-AFFINITY", TextTable::LEFT, TextTable::RIGHT);
 
     Parent::dump(tbl);