]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon: Fix % escaping (\% should be %%)
authorJohn Spray <john.spray@inktank.com>
Thu, 8 May 2014 10:04:46 +0000 (11:04 +0100)
committerJohn Spray <john.spray@inktank.com>
Thu, 8 May 2014 12:28:56 +0000 (13:28 +0100)
Clang's -Wpedantic points this out.

Signed-off-by: John Spray <john.spray@inktank.com>
src/mon/DataHealthService.cc
src/mon/PGMonitor.cc

index 8dda929f02344d6a4c6e3c4a57ff06768c9f2135..bbe98e1485a6bba051f5cd30b9592978633bfd99 100644 (file)
@@ -114,7 +114,7 @@ health_status_t DataHealthService::get_health(
       stringstream ss;
       ss << "mon." << mon_name << " addr " << it->first.addr
           << " has " << stats.latest_avail_percent
-          << "\% avail disk space -- " << health_detail;
+          << "%% avail disk space -- " << health_detail;
       detail->push_back(make_pair(health_status, ss.str()));
     }
 
@@ -233,7 +233,7 @@ void DataHealthService::service_tick()
     if (ours.latest_avail_percent != last_warned_percent)
       mon->clog.warn()
        << "reached concerning levels of available space on local monitor storage"
-       << " (" << ours.latest_avail_percent << "\% free)\n";
+       << " (" << ours.latest_avail_percent << "%% free)\n";
     last_warned_percent = ours.latest_avail_percent;
   } else {
     last_warned_percent = 0;
index ae8f6e70d62268f8ec8d6cd9dd15a4e4382441b5..6b20b8275ed708005554b5262478b432e39454d2 100644 (file)
@@ -1253,7 +1253,7 @@ void PGMonitor::dump_pool_stats(stringstream &ss, Formatter *f, bool verbose)
     if (verbose)
       tbl.define_column("CATEGORY", TextTable::LEFT, TextTable::LEFT);
     tbl.define_column("USED", TextTable::LEFT, TextTable::LEFT);
-    tbl.define_column("\%USED", TextTable::LEFT, TextTable::LEFT);
+    tbl.define_column("%%USED", TextTable::LEFT, TextTable::LEFT);
     tbl.define_column("OBJECTS", TextTable::LEFT, TextTable::LEFT);
     if (verbose) {
       tbl.define_column("DIRTY", TextTable::LEFT, TextTable::LEFT);
@@ -1338,7 +1338,7 @@ void PGMonitor::dump_fs_stats(stringstream &ss, Formatter *f, bool verbose)
     tbl.define_column("SIZE", TextTable::LEFT, TextTable::LEFT);
     tbl.define_column("AVAIL", TextTable::LEFT, TextTable::LEFT);
     tbl.define_column("RAW USED", TextTable::LEFT, TextTable::LEFT);
-    tbl.define_column("\%RAW USED", TextTable::LEFT, TextTable::LEFT);
+    tbl.define_column("%%RAW USED", TextTable::LEFT, TextTable::LEFT);
     if (verbose) {
       tbl.define_column("OBJECTS", TextTable::LEFT, TextTable::LEFT);
     }