From 5d818acf18cc412ebf601e900f36cc95b4689914 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 10 Jan 2018 17:34:44 -0600 Subject: [PATCH] mgr/DaemonServer: add IGNORES column to 'config show' If the daemon is ignoring a mon config, show that. Note that this column only ever says 'mon', which might be confusing to users. Signed-off-by: Sage Weil --- src/mgr/DaemonServer.cc | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc index 71aed90f22b9a..7715a48098f53 100644 --- a/src/mgr/DaemonServer.cc +++ b/src/mgr/DaemonServer.cc @@ -1387,6 +1387,7 @@ bool DaemonServer::handle_command(MCommand *m) tbl.define_column("VALUE", TextTable::LEFT, TextTable::LEFT); tbl.define_column("SOURCE", TextTable::LEFT, TextTable::LEFT); tbl.define_column("OVERRIDES", TextTable::LEFT, TextTable::LEFT); + tbl.define_column("IGNORES", TextTable::LEFT, TextTable::LEFT); } if (prefix == "config show") { // show @@ -1412,6 +1413,9 @@ bool DaemonServer::handle_command(MCommand *m) } f->close_section(); } + if (daemon->ignored_mon_config.count(i.first)) { + f->dump_string("ignores", "mon"); + } f->close_section(); } else { tbl << i.first; @@ -1429,7 +1433,10 @@ bool DaemonServer::handle_command(MCommand *m) } } tbl << ov; + } else { + tbl << ""; } + tbl << (daemon->ignored_mon_config.count(i.first) ? "mon" : ""); tbl << TextTable::endrow; } } @@ -1461,6 +1468,9 @@ bool DaemonServer::handle_command(MCommand *m) } f->close_section(); } + if (daemon->ignored_mon_config.count(i.first)) { + f->dump_string("ignores", "mon"); + } f->close_section(); } else { tbl << j->second.rbegin()->second; @@ -1477,7 +1487,10 @@ bool DaemonServer::handle_command(MCommand *m) } } tbl << ov; + } else { + tbl << ""; } + tbl << (daemon->ignored_mon_config.count(i.first) ? "mon" : ""); tbl << TextTable::endrow; } } else { @@ -1490,6 +1503,7 @@ bool DaemonServer::handle_command(MCommand *m) tbl << i.second; tbl << ceph_conf_level_name(CONF_DEFAULT); tbl << ""; + tbl << ""; tbl << TextTable::endrow; } } -- 2.39.5