From 5559e6aea9e9374ecdac0351777dfd6f5f5d1e67 Mon Sep 17 00:00:00 2001 From: John Spray Date: Thu, 11 Dec 2014 14:00:57 +0000 Subject: [PATCH] mon: fix `fs ls` on peons This was incorrectly using pending_mdsmap instead of mdsmap. We didn't notice in test because of single-mon configurations. Fixes: #10288 Backport: giant Signed-off-by: John Spray --- src/mon/MDSMonitor.cc | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc index 219f375602531..a8666f0270e85 100644 --- a/src/mon/MDSMonitor.cc +++ b/src/mon/MDSMonitor.cc @@ -776,19 +776,19 @@ bool MDSMonitor::preprocess_command(MMonCommand *m) if (f) { f->open_array_section("filesystems"); { - if (pending_mdsmap.get_enabled()) { + if (mdsmap.get_enabled()) { f->open_object_section("filesystem"); { - f->dump_string("name", pending_mdsmap.fs_name); - const string &md_pool_name = mon->osdmon()->osdmap.get_pool_name(pending_mdsmap.metadata_pool); + f->dump_string("name", mdsmap.fs_name); + const string &md_pool_name = mon->osdmon()->osdmap.get_pool_name(mdsmap.metadata_pool); /* Output both the names and IDs of pools, for use by * humans and machines respectively */ f->dump_string("metadata_pool", md_pool_name); - f->dump_int("metadata_pool_id", pending_mdsmap.metadata_pool); + f->dump_int("metadata_pool_id", mdsmap.metadata_pool); f->open_array_section("data_pool_ids"); { - for (std::set::iterator dpi = pending_mdsmap.data_pools.begin(); - dpi != pending_mdsmap.data_pools.end(); ++dpi) { + for (std::set::iterator dpi = mdsmap.data_pools.begin(); + dpi != mdsmap.data_pools.end(); ++dpi) { f->dump_int("data_pool_id", *dpi); } } @@ -796,8 +796,8 @@ bool MDSMonitor::preprocess_command(MMonCommand *m) f->open_array_section("data_pools"); { - for (std::set::iterator dpi = pending_mdsmap.data_pools.begin(); - dpi != pending_mdsmap.data_pools.end(); ++dpi) { + for (std::set::iterator dpi = mdsmap.data_pools.begin(); + dpi != mdsmap.data_pools.end(); ++dpi) { const string &pool_name = mon->osdmon()->osdmap.get_pool_name(*dpi); f->dump_string("data_pool", pool_name); } @@ -811,12 +811,12 @@ bool MDSMonitor::preprocess_command(MMonCommand *m) f->close_section(); f->flush(ds); } else { - if (pending_mdsmap.get_enabled()) { - const string &md_pool_name = mon->osdmon()->osdmap.get_pool_name(pending_mdsmap.metadata_pool); + if (mdsmap.get_enabled()) { + const string &md_pool_name = mon->osdmon()->osdmap.get_pool_name(mdsmap.metadata_pool); - ds << "name: " << pending_mdsmap.fs_name << ", metadata pool: " << md_pool_name << ", data pools: ["; - for (std::set::iterator dpi = pending_mdsmap.data_pools.begin(); - dpi != pending_mdsmap.data_pools.end(); ++dpi) { + ds << "name: " << mdsmap.fs_name << ", metadata pool: " << md_pool_name << ", data pools: ["; + for (std::set::iterator dpi = mdsmap.data_pools.begin(); + dpi != mdsmap.data_pools.end(); ++dpi) { const string &pool_name = mon->osdmon()->osdmap.get_pool_name(*dpi); ds << pool_name << " "; } -- 2.39.5