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-14 11:22:27 -0700 |
| commit | 92b830075928c2113c9b5fc2d1b5eaab8c63b5ad (patch) | |
| tree | f61d57879ad2b1cadfd6d840ca3673aae1ae80fb | |
| parent | 7e08ed1bf154f5556b3c4e49f937c1575bf992b8 (diff) | |
| download | ceph-92b830075928c2113c9b5fc2d1b5eaab8c63b5ad.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>
Reviewed-by: Sage Weil <sage@inktank.com>
| -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 d785cf626c3..7625a500448 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -147,7 +147,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; |