From: Kefu Chai <kchai@redhat.com>
Date: Thu, 15 Jun 2017 08:10:47 +0000 (+0800)
Subject: mon/OSDMonitor: more assert()
X-Git-Tag: v12.1.0~118^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F15704%2Fhead;p=ceph.git

mon/OSDMonitor: more assert()

this helps with silencing the clang analyzer also.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 1d2483ba7fce..7ca4de82f603 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -7090,7 +7090,7 @@ int OSDMonitor::prepare_command_osd_destroy(
   // defying PaxosService and all laws of nature. Therefore, as we may
   // be used during 'osd purge', let's keep the caller responsible for
   // proposing.
-
+  assert(err == 0);
   return 0;
 }
 
@@ -7146,8 +7146,8 @@ int OSDMonitor::prepare_command_osd_purge(
     } else {
       may_be_idempotent = false;
     }
-    assert(0 == err);
   }
+  assert(0 == err);
 
   if (may_be_idempotent && !osdmap.exists(id)) {
     dout(10) << __func__ << " osd." << id << " does not exist and "