]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw-multisite: fix endless loop in RGWBucketShardIncrementalSyncCR 22660/head
authorcfanz <songxinying@sensetime.com>
Thu, 21 Jun 2018 12:48:38 +0000 (20:48 +0800)
committercfanz <songxinying@sensetime.com>
Fri, 22 Jun 2018 05:01:12 +0000 (13:01 +0800)
Fixes: http://tracker.ceph.com/issues/24603
Signed-off-by: cfanz <songxinying@sensetime.com>
src/rgw/rgw_data_sync.cc

index 7fb4c14e5bb208795044e2b89c88bdf5a872d89c..36ca717bee845883f6cfac4df6a2f7f86bef3178 100644 (file)
@@ -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";