]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Objecter: abort enumeration when we encouter pool dne
authorxie xingguo <xie.xingguo@zte.com.cn>
Fri, 8 Jan 2016 04:56:06 +0000 (12:56 +0800)
committerxie xingguo <xie.xingguo@zte.com.cn>
Fri, 8 Jan 2016 04:56:06 +0000 (12:56 +0800)
Otherwise we may risk of executing the callback twice, which is fatal.

Fixes: #14299
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
src/osdc/Objecter.cc

index d01dc9d9561f419577c76cbacf16730a8ae6ea24..cd24478a6151049753ddfdb57b6b5f9fe4f39aff 100644 (file)
@@ -4902,6 +4902,7 @@ void Objecter::enumerate_objects(
                      "osd epoch " << osdmap->get_epoch() << dendl;
     rwlock.unlock();
     on_finish->complete(-ENOENT);
+    return;
   } else {
     rwlock.unlock();
   }