diff options
| author | David Zafman <david.zafman@inktank.com> | 2013-07-25 13:52:16 -0700 |
|---|---|---|
| committer | David Zafman <david.zafman@inktank.com> | 2013-07-25 14:01:54 -0700 |
| commit | b46fb62df3a411cc08b26ee626d60ec534c677c6 (patch) | |
| tree | 0fb8dac54c6f4ae1bd0761b622400938b27d9d97 | |
| parent | 27a0b86615918dc7ac88e55d2ec3bf1c8f6f6a3a (diff) | |
| download | ceph-b46fb62df3a411cc08b26ee626d60ec534c677c6.tar.gz | |
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>
| -rw-r--r-- | src/osd/OSD.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 3f226cec95d..4be586f3d15 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; |