From: Jason Dillaman <dillaman@redhat.com>
Date: Mon, 30 Jan 2017 22:41:51 +0000 (-0500)
Subject: journal: stop processing removal after error
X-Git-Tag: v12.0.0~48^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=040004f53f7d334fc9452e3f5fd80169cad5f65e;p=ceph.git

journal: stop processing removal after error

Fixed: http://tracker.ceph.com/issues/18738
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/src/journal/JournalTrimmer.cc b/src/journal/JournalTrimmer.cc
index 3a26fb32399c..ec48f9aaed04 100644
--- 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;
         }
       }