From cc306c506ca6607223cb89cd388f8e18673c4fe2 Mon Sep 17 00:00:00 2001 From: Abhishek Lekshmanan Date: Fri, 13 Jan 2017 16:32:55 +0100 Subject: [PATCH] rgw_admin: read master log shards from master's current period Also make the sync output look similar to the output of data sync Signed-off-by: Abhishek Lekshmanan --- src/rgw/rgw_admin.cc | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index 1ce05f15f55..8e540ace76c 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -1794,21 +1794,19 @@ static void get_md_sync_status(list& status) return; } - map master_shards_info; - string master_start_period; + string master_period = store->get_current_period_id(); - ret = sync.read_master_log_shards_info(&master_start_period, &master_shards_info); + ret = sync.read_master_log_shards_info(master_period, &master_shards_info); if (ret < 0) { status.push_back(string("failed to fetch master sync status: ") + cpp_strerror(-ret)); return; } map shards_behind; - if (store->get_current_period_id() != sync_status.sync_info.period) { + if (sync_status.sync_info.period != master_period) { status.push_back(string("master is on a different period: master_period=" + - store->get_current_period_id() + " local_period=" + - sync_status.sync_info.period)); + master_period + " local_period=" + sync_status.sync_info.period)); } else { for (auto local_iter : sync_status.sync_markers) { int shard_id = local_iter.first; @@ -1828,7 +1826,7 @@ static void get_md_sync_status(list& status) int total_behind = shards_behind.size() + (sync_status.sync_info.num_shards - num_inc); if (total_behind == 0) { - status.push_back("metadata is caught up with master"); + push_ss(ss, status) << "metadata is caught up with master"; } else { push_ss(ss, status) << "metadata is behind on " << total_behind << " shards";