From: David Zafman <david.zafman@inktank.com>
Date: Thu, 25 Jul 2013 20:52:16 +0000 (-0700)
Subject: osd: Don't put functional code inside of an assert
X-Git-Tag: v0.67-rc3~58
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b46fb62df3a411cc08b26ee626d60ec534c677c6;p=ceph.git

osd: Don't put functional code inside of an assert

Fix assert in OSDService::get_map()

Signed-off-by: David Zafman <david.zafman@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 3f226cec95d8..4be586f3d155 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -5524,7 +5524,8 @@ OSDMapRef OSDService::get_map(epoch_t epoch)
   if (epoch > 0) {
     dout(20) << "get_map " << epoch << " - loading and decoding " << map << dendl;
     bufferlist bl;
-    assert(_get_map_bl(epoch, bl));
+    bool ok = _get_map_bl(epoch, bl);
+    assert(ok);
     map->decode(bl);
   } else {
     dout(20) << "get_map " << epoch << " - return initial " << map << dendl;