Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Leap:42.1:Rings:2-TestDVD
ceph
0018-Always-provide-summary-for-non-heal.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0018-Always-provide-summary-for-non-heal.patch of Package ceph
From: Thorsten Behrens <tbehrens@suse.com> Date: Mon, 1 Dec 2014 14:27:36 +0100 Subject: [PATCH] Always provide summary for non-healthy cluster. This fixes bnc#902744, wherein calamari does not provide popup drill-down for warnings or errors, should the summary be missing. Signed-off-by: Thorsten Behrens <tbehrens@suse.com> (cherry picked from commit 092ef99e7da0942d99e60765af69559ace69fe7b) --- src/mon/Monitor.cc | 49 +++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index ad35e5e..9062022 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -1925,30 +1925,6 @@ void Monitor::get_health(string& status, bufferlist *detailbl, Formatter *f) health_monitor->get_health(f, summary, (detailbl ? &detail : NULL)); - if (f) - f->open_array_section("summary"); - stringstream ss; - health_status_t overall = HEALTH_OK; - if (!summary.empty()) { - ss << ' '; - while (!summary.empty()) { - if (overall > summary.front().first) - overall = summary.front().first; - ss << summary.front().second; - if (f) { - f->open_object_section("item"); - f->dump_stream("severity") << summary.front().first; - f->dump_string("summary", summary.front().second); - f->close_section(); - } - summary.pop_front(); - if (!summary.empty()) - ss << "; "; - } - } - if (f) - f->close_section(); - if (f) { f->open_object_section("timechecks"); f->dump_int("epoch", get_epoch()); @@ -1957,6 +1933,8 @@ void Monitor::get_health(string& status, bufferlist *detailbl, Formatter *f) << ((timecheck_round%2) ? "on-going" : "finished"); } + stringstream ss; + health_status_t overall = HEALTH_OK; if (!timecheck_skews.empty()) { list<string> warns; if (f) @@ -2003,6 +1981,7 @@ void Monitor::get_health(string& status, bufferlist *detailbl, Formatter *f) if (!warns.empty()) ss << ","; } + summary.push_back(make_pair(HEALTH_WARN, "Monitor clock skew detected ")); } if (f) f->close_section(); @@ -2010,6 +1989,28 @@ void Monitor::get_health(string& status, bufferlist *detailbl, Formatter *f) if (f) f->close_section(); + if (f) + f->open_array_section("summary"); + if (!summary.empty()) { + ss << ' '; + while (!summary.empty()) { + if (overall > summary.front().first) + overall = summary.front().first; + ss << summary.front().second; + if (f) { + f->open_object_section("item"); + f->dump_stream("severity") << summary.front().first; + f->dump_string("summary", summary.front().second); + f->close_section(); + } + summary.pop_front(); + if (!summary.empty()) + ss << "; "; + } + } + if (f) + f->close_section(); + stringstream fss; fss << overall; status = fss.str() + ss.str();
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor