]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: RGWDataSyncControlCR retries on all errors 18591/head
authorCasey Bodley <cbodley@redhat.com>
Mon, 9 Oct 2017 18:46:47 +0000 (14:46 -0400)
committerCasey Bodley <cbodley@redhat.com>
Fri, 27 Oct 2017 13:49:49 +0000 (09:49 -0400)
similar to RGWMetaSyncShardControlCR, we don't want to exit and
stop the data sync processor thread on failures. we want to keep
retrying with backoff

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 065e67bbd312240f5128c31f5525098c62f3afce)

Conflicts:
src/rgw/rgw_data_sync.cc (sync tracing)

src/rgw/rgw_data_sync.cc

index a66481e902544bdb8a27bab8e6ea574a3ed07ab9..daaffb7cde9eb7b2c10b9eeb9490c7e9c581b588 100644 (file)
@@ -1596,8 +1596,9 @@ class RGWDataSyncControlCR : public RGWBackoffControlCR
   RGWDataSyncEnv *sync_env;
   uint32_t num_shards;
 
+  static constexpr bool exit_on_error = false; // retry on all errors
 public:
-  RGWDataSyncControlCR(RGWDataSyncEnv *_sync_env, uint32_t _num_shards) : RGWBackoffControlCR(_sync_env->cct, true),
+  RGWDataSyncControlCR(RGWDataSyncEnv *_sync_env, uint32_t _num_shards) : RGWBackoffControlCR(_sync_env->cct, exit_on_error),
                                                       sync_env(_sync_env), num_shards(_num_shards) {
   }