RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-20 10:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #46362 from pdvian/wip-logm-mgrstat

Browse Source 
mon/LogMonitor, MgrStat: Report logm and mgrstat committed version

Reviewed-by: Laura Flores <lflores@redhat.com>
This commit is contained in:
Yuri Weinstein 2022-06-14 13:43:42 -07:00 committed by GitHub
commit 35bf1ebb7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mon/LogMonitor.cc
View File

@ -1042,6 +1042,11 @@ bool LogMonitor::prepare_command(MonOpRequestRef op)
return false; return false;
} }
void LogMonitor::dump_info(Formatter *f)
{
f->dump_unsigned("logm_first_committed", get_first_committed());
f->dump_unsigned("logm_last_committed", get_last_committed());
}
int LogMonitor::sub_name_to_id(const string& n) int LogMonitor::sub_name_to_id(const string& n)
{ {

1
src/mon/LogMonitor.h
View File

@ -166,6 +166,7 @@ private:
void tick() override; // check state, take actions void tick() override; // check state, take actions
void dump_info(Formatter *f);
void check_subs(); void check_subs();
void check_sub(Subscription *s); void check_sub(Subscription *s);

2
src/mon/MgrStatMonitor.h
View File

@ -94,6 +94,8 @@ public:
void dump_info(ceph::Formatter *f) const { void dump_info(ceph::Formatter *f) const {
digest.dump(f); digest.dump(f);
f->dump_object("servicemap", get_service_map()); f->dump_object("servicemap", get_service_map());
f->dump_unsigned("mgrstat_first_committed", get_first_committed());
f->dump_unsigned("mgrstat_last_committed", get_last_committed());
} }
void dump_cluster_stats(std::stringstream *ss, void dump_cluster_stats(std::stringstream *ss,
ceph::Formatter *f, ceph::Formatter *f,

1
src/mon/Monitor.cc
View File

@ -3711,6 +3711,7 @@ void Monitor::handle_command(MonOpRequestRef op)
mdsmon()->dump_info(f.get()); mdsmon()->dump_info(f.get());
authmon()->dump_info(f.get()); authmon()->dump_info(f.get());
mgrstatmon()->dump_info(f.get()); mgrstatmon()->dump_info(f.get());
logmon()->dump_info(f.get());
paxos->dump_info(f.get()); paxos->dump_info(f.get());