From 0f064d261c46159ec03d4a2a20053322b32b833c Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Mon, 9 Oct 2017 14:46:47 -0400 Subject: [PATCH] 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 (no data sync tracing in jewel, i.e. 065e67bbd312240f5128c31f5525098c62f3afce and follow-on commits will not be backported) --- src/rgw/rgw_data_sync.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/rgw/rgw_data_sync.cc b/src/rgw/rgw_data_sync.cc index 27aaba8167b17..57a5cf132c364 100644 --- a/src/rgw/rgw_data_sync.cc +++ b/src/rgw/rgw_data_sync.cc @@ -1482,8 +1482,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) { } -- 2.39.5