journal: stop processing removal after error

Fixed: http://tracker.ceph.com/issues/18738
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 040004f53f7d334fc9452e3f5fd80169cad5f65e)

diff --git a/src/journal/JournalTrimmer.cc b/src/journal/JournalTrimmer.cc
index 3a26fb32399cc1408eac7d1158a9d7d10736c33b..ec48f9aaed048450d54d0559cf144e53c83e021e 100644 (file)
--- a/src/journal/JournalTrimmer.cc
+++ b/src/journal/JournalTrimmer.cc
@@ -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;
         }
       }