From: Joao Eduardo Luis <joao.luis@inktank.com>
Date: Fri, 14 Jun 2013 16:11:43 +0000 (+0100)
Subject: mon: OSDMonitor: don't ignore apply_incremental()'s return on UfP [1]
X-Git-Tag: v0.65~71
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=92b830075928c2113c9b5fc2d1b5eaab8c63b5ad;p=ceph.git

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>
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index d785cf626c39..7625a500448a 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;