From: Casey Bodley Date: Mon, 9 Oct 2017 18:46:47 +0000 (-0400) Subject: rgw: RGWDataSyncControlCR retries on all errors X-Git-Tag: v12.2.2~46^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a340f1acab04587f5b2c323abc1a14b8dd7de915;p=ceph.git rgw: RGWDataSyncControlCR retries on all errors 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 (cherry picked from commit 065e67bbd312240f5128c31f5525098c62f3afce) Conflicts: src/rgw/rgw_data_sync.cc (sync tracing) --- diff --git a/src/rgw/rgw_data_sync.cc b/src/rgw/rgw_data_sync.cc index a66481e9025..daaffb7cde9 100644 --- a/src/rgw/rgw_data_sync.cc +++ b/src/rgw/rgw_data_sync.cc @@ -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) { }