diff options
| author | Sage Weil <sage@redhat.com> | 2019-01-17 18:04:30 +0100 |
|---|---|---|
| committer | Sage Weil <sage@redhat.com> | 2019-01-17 18:04:30 +0100 |
| commit | b5e5ee6f40b46f8876f124d12c0f8216852cb299 (patch) | |
| tree | a8fb65325b48ef688b1bddf1377f5c65eff06525 /src/ceph_mon.cc | |
| parent | Merge pull request #25654 from tspmelo/wip-missing-i18n (diff) | |
| parent | qa/suites/rados/upgrade: one mon per node, and enable-msgr2 at end (diff) | |
| download | ceph-b5e5ee6f40b46f8876f124d12c0f8216852cb299.tar.xz ceph-b5e5ee6f40b46f8876f124d12c0f8216852cb299.zip | |
Merge PR #25849 into master
* refs/pull/25849/head:
qa/suites/rados/upgrade: one mon per node, and enable-msgr2 at end
qa/rados/thrash-old-clients: avoid msgr2
mon: make bootstrap rank check more robust
mon: clean up probe debug output a bit
msg/async: use v1 for v1 <-> [v2,v1] peers
msg/async/AsyncMessenger: drop single-use _send_to
mon/HealthMonitor: raise MON_MSGR2_NOT_ENABLED if mons not bound to msgr2
doc/rados/operations/health-checks: document MON_* health warnings
mon/MonMapMonitor: add 'mon enable-msgr2' command
mon: respawn if rank addr changes
mon/MonMap: calc_addr_mons() after setting rank addrvec
Reviewed-by: Ricardo Dias <rdias@suse.com>
Diffstat (limited to 'src/ceph_mon.cc')
| -rw-r--r-- | src/ceph_mon.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc index 450544ae3da..79f28cf2269 100644 --- a/src/ceph_mon.cc +++ b/src/ceph_mon.cc @@ -801,6 +801,9 @@ int main(int argc, const char **argv) mon = new Monitor(g_ceph_context, g_conf()->name.get_id(), store, msgr, mgr_msgr, &monmap); + mon->orig_argc = argc; + mon->orig_argv = argv; + if (force_sync) { derr << "flagging a forced sync ..." << dendl; ostringstream oss; |