osd/SnapMapper: Crimson - fix OSDriver::get_next

There are other omap_keys that we may return which are not
SnapMapper entries (_biginfo, _epoch, _fastinfo etc.).

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit 8fd9b037f5802ec8dab4d69f11435e4217dff76a)

diff --git a/src/osd/SnapMapper.cc b/src/osd/SnapMapper.cc
index 7db442cf1377de0d34eb9101fdcb0fbddda928df..0f8b007f0edc5d053b2b818ea1b68e4f1c75af07 100644 (file)
--- a/src/osd/SnapMapper.cc
+++ b/src/osd/SnapMapper.cc
@@ -119,7 +119,8 @@ int OSDriver::get_next(
     ch, hoid, key
   ).safe_then_unpack([&key, next] (bool, FuturizedStore::Shard::omap_values_t&& vals) {
     CRIMSON_DEBUG("OSDriver::get_next key {} got omap values", key);
-    if (auto nit = std::begin(vals); nit == std::end(vals)) {
+    if (auto nit = std::begin(vals);
+        nit == std::end(vals) || !SnapMapper::is_mapping(nit->first)) {
       CRIMSON_DEBUG("OSDriver::get_next key {} no more values", key);
       return -ENOENT;
     } else {