]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mon/ConfigMonitor: show changeable for 'config get|show'
authorSage Weil <sage@redhat.com>
Thu, 11 Jan 2018 15:11:48 +0000 (09:11 -0600)
committerSage Weil <sage@redhat.com>
Tue, 6 Mar 2018 20:44:49 +0000 (14:44 -0600)
Signed-off-by: Sage Weil <sage@redhat.com>
src/mon/ConfigMonitor.cc

index 21a28054a62a70c2bd802f495773cff606374c1d..db8bff51c8cadbaa15250604200172e3d2cedcc5 100644 (file)
@@ -148,6 +148,7 @@ bool ConfigMonitor::preprocess_command(MonOpRequestRef op)
       tbl.define_column("LEVEL", TextTable::LEFT, TextTable::LEFT);
       tbl.define_column("OPTION", TextTable::LEFT, TextTable::LEFT);
       tbl.define_column("VALUE", TextTable::LEFT, TextTable::LEFT);
+      tbl.define_column("RW", TextTable::LEFT, TextTable::LEFT);
     } else {
       f->open_array_section("config");
     }
@@ -159,6 +160,7 @@ bool ConfigMonitor::preprocess_command(MonOpRequestRef op)
          tbl << Option::level_to_str(i.second.opt->level);
           tbl << i.first;
          tbl << i.second.raw_value;
+         tbl << (i.second.opt->is_safe() ? "*" : "");
          tbl << TextTable::endrow;
        } else {
          f->open_object_section("option");
@@ -236,6 +238,7 @@ bool ConfigMonitor::preprocess_command(MonOpRequestRef op)
        tbl.define_column("LEVEL", TextTable::LEFT, TextTable::LEFT);
        tbl.define_column("OPTION", TextTable::LEFT, TextTable::LEFT);
        tbl.define_column("VALUE", TextTable::LEFT, TextTable::LEFT);
+       tbl.define_column("RW", TextTable::LEFT, TextTable::LEFT);
       } else {
        f->open_object_section("config");
       }
@@ -251,12 +254,15 @@ bool ConfigMonitor::preprocess_command(MonOpRequestRef op)
          tbl << Option::level_to_str(q->second.second->opt->level);
          tbl << p->first;
          tbl << p->second;
+         tbl << (q->second.second->opt->is_safe() ? "*" : "");
          tbl << TextTable::endrow;
        } else {
          f->open_object_section(p->first.c_str());
          f->dump_string("value", p->second);
          f->dump_string("section", q->second.first);
          f->dump_object("mask", q->second.second->mask);
+         f->dump_bool("can_update_at_runtime",
+                      q->second.second->opt->is_safe());
          f->close_section();
        }
       }