From 663ea9c1d981c50bd0ab454348587e6693a5c996 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Wed, 18 Nov 2020 16:24:11 -0500 Subject: [PATCH] rgw: disable backoff on data sync error_retry_time this backoff is triggered often by the per-bucket lease for full sync, and causes tests to fail with checkpoint timeouts Signed-off-by: Casey Bodley --- src/rgw/rgw_data_sync.cc | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/src/rgw/rgw_data_sync.cc b/src/rgw/rgw_data_sync.cc index 5ab040b999e82..d5941fba3c377 100644 --- a/src/rgw/rgw_data_sync.cc +++ b/src/rgw/rgw_data_sync.cc @@ -1432,11 +1432,7 @@ class RGWDataSyncShardCR : public RGWCoroutine { static constexpr int max_error_entries = DATA_SYNC_MAX_ERR_ENTRIES; ceph::coarse_real_time error_retry_time; - -#define RETRY_BACKOFF_SECS_MIN 60 -#define RETRY_BACKOFF_SECS_DEFAULT 60 -#define RETRY_BACKOFF_SECS_MAX 600 - uint32_t retry_backoff_secs = RETRY_BACKOFF_SECS_DEFAULT; + static constexpr uint32_t retry_backoff_secs = 60; RGWSyncTraceNodeRef tn; @@ -1690,15 +1686,6 @@ public: entry_timestamp, true), false); } if (!omapvals->more) { - if (error_marker.empty() && error_entries.empty()) { - /* the retry repo is empty, we back off a bit before calling it again */ - retry_backoff_secs *= 2; - if (retry_backoff_secs > RETRY_BACKOFF_SECS_MAX) { - retry_backoff_secs = RETRY_BACKOFF_SECS_MAX; - } - } else { - retry_backoff_secs = RETRY_BACKOFF_SECS_DEFAULT; - } error_retry_time = ceph::coarse_real_clock::now() + make_timespan(retry_backoff_secs); error_marker.clear(); } -- 2.39.5