From: Huan Zhang <zhanghuan@chinac.com>
Date: Tue, 20 Sep 2016 03:35:03 +0000 (+0800)
Subject: cleanup status global from rbd mirror if image removed
X-Git-Tag: v11.0.1~102^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c36e8050089ebc46fd6553a46b579665a8e19fcf;p=ceph.git

cleanup status global from rbd mirror if image removed

Signed-off-by: Huan Zhang <zhanghuan@chinac.com>
---

diff --git a/src/cls/rbd/cls_rbd.cc b/src/cls/rbd/cls_rbd.cc
index f7bf2e334110..3db3420cdc10 100644
--- a/src/cls/rbd/cls_rbd.cc
+++ b/src/cls/rbd/cls_rbd.cc
@@ -3256,6 +3256,15 @@ int image_remove(cls_method_context_t hctx, const string &image_id) {
            cpp_strerror(r).c_str());
     return r;
   }
+
+  r = cls_cxx_map_remove_key(hctx,
+                             status_global_key(mirror_image.global_image_id));
+  if (r < 0 && r != -ENOENT) {
+    CLS_ERR("error removing global status for image '%s': %s", image_id.c_str(),
+           cpp_strerror(r).c_str());
+    return r;
+  }
+
   return 0;
 }