osd/SnapMapper: more debug around errors

Hunting http://tracker.ceph.com/issues/21557

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 249d00548eabfb40933128934b698d9654734dee..f08d5f260f72638ab8888152beeb5aa6179cdc76 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -4062,6 +4062,7 @@ void PG::_scan_snaps(ScrubMap &smap)
                            << " oid " << hoid << " snaps missing in mapper"
                            << ", should be: "
                            << obj_snaps
+                            << " was " << cur_snaps << " r " << r
                            << "...repaired";
        }
        snap_mapper.add_oid(hoid, obj_snaps, &_t);

diff --git a/src/osd/SnapMapper.cc b/src/osd/SnapMapper.cc
index 81c548510045272a19784f389e49884a75d015d8..ab1affb8f25e5b246b9da574647c709abdc3cd10 100644 (file)
--- a/src/osd/SnapMapper.cc
+++ b/src/osd/SnapMapper.cc
@@ -143,10 +143,14 @@ int SnapMapper::get_snaps(
   map<string, bufferlist> got;
   keys.insert(to_object_key(oid));
   int r = backend.get_keys(keys, &got);
-  if (r < 0)
+  if (r < 0) {
+    dout(20) << __func__ << " " << oid << " got err " << r << dendl;
     return r;
-  if (got.empty())
+  }
+  if (got.empty()) {
+    dout(20) << __func__ << " " << oid << " got.empty()" << dendl;
     return -ENOENT;
+  }
   if (out) {
     bufferlist::iterator bp = got.begin()->second.begin();
     ::decode(*out, bp);