diff options
| author | Sage Weil <sage@inktank.com> | 2013-03-21 18:25:01 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-03-21 18:25:01 -0700 |
| commit | 7118df89cd4377137f6c37d17efc8b3bd8fef1bc (patch) | |
| tree | 0da8b473564a7a8ae9e8ace64937535d028b07f6 | |
| parent | 42a71c1dd866dd73f3410bc536ae15044da2fae2 (diff) | |
| parent | 71ec9c6bd54d560cc2bca4b6d0dbb3e6961df135 (diff) | |
| download | ceph-7118df89cd4377137f6c37d17efc8b3bd8fef1bc.tar.gz | |
Merge pull request #135 from ceph/wip-4519
mon: AuthMonitor: delete auth_handler while increasing max_global_id
Reviewed-by: Sage Weil <sage@inktank.com>
| -rw-r--r-- | src/mon/AuthMonitor.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mon/AuthMonitor.cc b/src/mon/AuthMonitor.cc index 0761137784e..f521ede6e79 100644 --- a/src/mon/AuthMonitor.cc +++ b/src/mon/AuthMonitor.cc @@ -440,14 +440,16 @@ bool AuthMonitor::prep_auth(MAuth *m, bool paxos_writable) if (!s->global_id) { s->global_id = assign_global_id(m, paxos_writable); if (!s->global_id) { + + delete s->auth_handler; + s->auth_handler = NULL; + if (mon->is_leader() && paxos_writable) { dout(10) << "increasing global id, waitlisting message" << dendl; wait_for_active(new C_RetryMessage(this, m)); goto done; } - delete s->auth_handler; - s->auth_handler = NULL; s->put(); if (!mon->is_leader()) { |