From: cfanz <songxinying@sensetime.com>
Date: Thu, 21 Jun 2018 12:48:38 +0000 (+0800)
Subject: rgw-multisite: fix endless loop in RGWBucketShardIncrementalSyncCR
X-Git-Tag: v13.2.1~41^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=68fd755f9eb4d811951ababcdea0e01475f606a8;p=ceph.git

rgw-multisite: fix endless loop in RGWBucketShardIncrementalSyncCR

Fixes: http://tracker.ceph.com/issues/24603

Signed-off-by: cfanz <songxinying@sensetime.com>
(cherry picked from commit 0633a9a00ebc6ea487f773af38ddd7a685e78dfc)
---

diff --git a/src/rgw/rgw_data_sync.cc b/src/rgw/rgw_data_sync.cc
index 1833d5d42030..57c35da70ef7 100644
--- a/src/rgw/rgw_data_sync.cc
+++ b/src/rgw/rgw_data_sync.cc
@@ -3029,6 +3029,12 @@ int RGWBucketShardIncrementalSyncCR::operate()
               /* we have reported this error */
             }
           }
+          if (sync_status != 0)
+            break;
+        }
+        if (sync_status != 0) {
+          /* get error, stop */
+          break;
         }
         if (!marker_tracker.index_key_to_marker(key, cur_id)) {
           set_status() << "can't do op, sync already in progress for object";