From 6655f48cc9aabb6aec5882579fc6ffd56657c754 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Sun, 21 Jan 2018 14:19:01 -0600
Subject: [PATCH] osd/SnapMapper: clean up broken snapmapper entry if present

Better to clean up than to crash the OSD.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit fc378a0dc2aafbeee44871a304717b916a3f9f88)
---
 src/osd/SnapMapper.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/osd/SnapMapper.cc b/src/osd/SnapMapper.cc
index 81c548510045..c88b7ea1565b 100644
--- a/src/osd/SnapMapper.cc
+++ b/src/osd/SnapMapper.cc
@@ -243,7 +243,12 @@ void SnapMapper::add_oid(
   {
     object_snaps out;
     int r = get_snaps(oid, &out);
-    assert(r == -ENOENT);
+    if (r != -ENOENT) {
+      derr << __func__ << " found existing snaps mapped on " << oid
+	   << ", removing" << dendl;
+      assert(!cct->_conf->osd_debug_verify_snaps);
+      remove_oid(oid, t);
+    }
   }
 
   object_snaps _snaps(oid, snaps);
-- 
2.47.3