Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mon,mgr: print pgmap reports to debug (not cluster) log #15740

Merged
merged 2 commits into from
Jun 17, 2017
Merged

mon,mgr: print pgmap reports to debug (not cluster) log #15740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f775a7
mon/MgrStatMonitor: print PGMapDigest summary on receipt
liewegas Jun 16, 2017
1afcf4e
mgr/DaemonServer: print PGMapDigest summary on send
liewegas Jun 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/mgr/DaemonServer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -850,7 +850,7 @@ void DaemonServer::send_report()
// FIXME: no easy way to get mon features here. this will do for
// now, though, as long as we don't make a backward-incompat change.
pg_map.encode_digest(osdmap, m->get_data(), CEPH_FEATURES_ALL);

dout(10) << pg_map << dendl;
pg_map.get_health(g_ceph_context, osdmap,
m->health_summary,
&m->health_detail);
Expand Down
1 change: 1 addition & 0 deletions src/mon/MgrStatMonitor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ bool MgrStatMonitor::prepare_report(MonOpRequestRef op)
bufferlist bl = m->get_data();
auto p = bl.begin();
::decode(pending_digest, p);
dout(10) << __func__ << " " << pending_digest << dendl;
pending_health_summary.swap(m->health_summary);
pending_health_detail.swap(m->health_detail);
return true;
Expand Down
2 changes: 1 addition & 1 deletion src/mon/PGMap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ class PGMap : public PGMapDigest {
WRITE_CLASS_ENCODER_FEATURES(PGMap::Incremental)
WRITE_CLASS_ENCODER_FEATURES(PGMap)

inline ostream& operator<<(ostream& out, const PGMap& m) {
inline ostream& operator<<(ostream& out, const PGMapDigest& m) {
m.print_oneline_summary(NULL, &out);
return out;
}
Expand Down