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

ceph-mon: dump monmap to debug logs

Browse Source 
Verbosely during mkfs, at level 10 on normal startup.

Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2019-01-09 10:11:39 -06:00
parent 9bfd5bd322
commit 65fb65c1ce
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/ceph_mon.cc
View File

@ -347,6 +347,9 @@ int main(int argc, const char **argv)
// resolve public_network -> public_addr // resolve public_network -> public_addr
pick_addresses(g_ceph_context, CEPH_PICK_ADDRESS_PUBLIC); pick_addresses(g_ceph_context, CEPH_PICK_ADDRESS_PUBLIC);
dout(10) << "public_network " << g_conf()->public_network << dendl;
dout(10) << "public_addr " << g_conf()->public_network << dendl;
common_init_finish(g_ceph_context); common_init_finish(g_ceph_context);
bufferlist monmapbl, osdmapbl; bufferlist monmapbl, osdmapbl;
@ -369,7 +372,12 @@ int main(int argc, const char **argv)
} catch (const buffer::error& e) { } catch (const buffer::error& e) {
derr << argv[0] << ": error decoding monmap " << monmap_fn << ": " << e.what() << dendl; derr << argv[0] << ": error decoding monmap " << monmap_fn << ": " << e.what() << dendl;
exit(1); exit(1);
} }
dout(1) << "imported monmap:\n";
monmap.print(*_dout);
*_dout << dendl;
} else { } else {
ostringstream oss; ostringstream oss;
int err = monmap.build_initial(g_ceph_context, true, oss); int err = monmap.build_initial(g_ceph_context, true, oss);
@ -379,6 +387,10 @@ int main(int argc, const char **argv)
derr << argv[0] << ": warning: no initial monitors; must use admin socket to feed hints" << dendl; derr << argv[0] << ": warning: no initial monitors; must use admin socket to feed hints" << dendl;
} }
dout(1) << "initial generated monmap:\n";
monmap.print(*_dout);
*_dout << dendl;
// am i part of the initial quorum? // am i part of the initial quorum?
if (monmap.contains(g_conf()->name.get_id())) { if (monmap.contains(g_conf()->name.get_id())) {
// hmm, make sure the ip listed exists on the current host? // hmm, make sure the ip listed exists on the current host?
@ -633,6 +645,13 @@ int main(int argc, const char **argv)
} else { } else {
derr << "unable to obtain a monmap: " << cpp_strerror(err) << dendl; derr << "unable to obtain a monmap: " << cpp_strerror(err) << dendl;
} }
dout(10) << __func__ << " monmap:\n";
JSONFormatter jf(true);
jf.dump_object("monmap", monmap);
jf.flush(*_dout);
*_dout << dendl;
if (!extract_monmap.empty()) { if (!extract_monmap.empty()) {
int r = mapbl.write_file(extract_monmap.c_str()); int r = mapbl.write_file(extract_monmap.c_str());
if (r < 0) { if (r < 0) {