diff options
| author | Joao Eduardo Luis <joao.luis@inktank.com> | 2013-06-14 17:11:43 +0100 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-06-18 10:26:54 -0700 |
| commit | fda618e96690b2693c7a8dd523ece7c1c5a90b67 (patch) | |
| tree | fc20d549d1d4638813e4b7b64daa2a885a3c25ff | |
| parent | c14dd154584eef97075e4a260719b6cbe686d4c7 (diff) | |
| download | ceph-fda618e96690b2693c7a8dd523ece7c1c5a90b67.tar.gz | |
mon: OSDMonitor: don't ignore apply_incremental()'s return on UfP [1]
apply_incremental() may return -EINVAL. Don't ignore it.
[1] UfP = Update from Paxos
Fixes: #5343
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
(cherry picked from commit e3c33f4315cbf8718f61eb79e15dd6d44fc908b7)
| -rw-r--r-- | src/mon/OSDMonitor.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 2370ba3c8d4..b318ee6b526 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -148,7 +148,8 @@ void OSDMonitor::update_from_paxos() dout(7) << "update_from_paxos applying incremental " << osdmap.epoch+1 << dendl; OSDMap::Incremental inc(inc_bl); - osdmap.apply_incremental(inc); + err = osdmap.apply_incremental(inc); + assert(err == 0); // write out the full map for all past epochs bufferlist full_bl; |