From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Fri, 8 Jan 2016 04:56:06 +0000 (+0800)
Subject: Objecter: abort enumeration when we encouter pool dne
X-Git-Tag: v10.0.3~65^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=52e796f920e3929efb2c15dcade63e1f5d3257d3;p=ceph.git

Objecter: abort enumeration when we encouter pool dne

Otherwise we may risk of executing the callback twice, which is fatal.

Fixes: #14299
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index d01dc9d9561f..cd24478a6151 100644
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -4902,6 +4902,7 @@ void Objecter::enumerate_objects(
                      "osd epoch " << osdmap->get_epoch() << dendl;
     rwlock.unlock();
     on_finish->complete(-ENOENT);
+    return;
   } else {
     rwlock.unlock();
   }