]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
journal: stop processing removal after error 13193/head
authorJason Dillaman <dillaman@redhat.com>
Mon, 30 Jan 2017 22:41:51 +0000 (17:41 -0500)
committerJason Dillaman <dillaman@redhat.com>
Mon, 30 Jan 2017 22:41:51 +0000 (17:41 -0500)
Fixed: http://tracker.ceph.com/issues/18738
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
src/journal/JournalTrimmer.cc

index 3a26fb32399cc1408eac7d1158a9d7d10736c33b..ec48f9aaed048450d54d0559cf144e53c83e021e 100644 (file)
@@ -79,8 +79,10 @@ void JournalTrimmer::remove_objects(bool force, Context *on_finish) {
 
         if (registered_clients.size() == 0) {
           on_finish->complete(-EINVAL);
+          return;
         } else if (registered_clients.size() > 1) {
           on_finish->complete(-EBUSY);
+          return;
         }
       }