]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: Don't put functional code inside of an assert
authorDavid Zafman <david.zafman@inktank.com>
Thu, 25 Jul 2013 20:52:16 +0000 (13:52 -0700)
committerDavid Zafman <david.zafman@inktank.com>
Thu, 25 Jul 2013 21:01:54 +0000 (14:01 -0700)
Fix assert in OSDService::get_map()

Signed-off-by: David Zafman <david.zafman@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
src/osd/OSD.cc

index 3f226cec95d85b6e810c675c3061347f7797f99f..4be586f3d15569a0e0a3d469ff7fc37591f8c0e8 100644 (file)
@@ -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;