Merge pull request #10372 from cbodley/wip-rgw-data-log-trim

rgw multisite: trim data logs as peer zones catch up

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

diff --cc src/common/config_opts.h
index 41678678f1d459bb66f5abb62b8bb0cb9679d788,622c1361cc5b0114e2aa852525e454bcc6d17880..b9cc870a8e1fcc2ae844ec9c9b05e6477b5f5291
--- 1/src/common/config_opts.h
--- 2/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@@ -1496,11 -1453,8 +1496,12 @@@ OPTION(rgw_num_async_rados_threads, OPT
  OPTION(rgw_md_notify_interval_msec, OPT_INT, 200) // metadata changes notification interval to followers
  OPTION(rgw_run_sync_thread, OPT_BOOL, true) // whether radosgw (not radosgw-admin) spawns the sync thread
  OPTION(rgw_sync_lease_period, OPT_INT, 120) // time in second for lease that rgw takes on a specific log (or log shard)
+ OPTION(rgw_sync_log_trim_interval, OPT_INT, 1200) // time in seconds between attempts to trim sync logs
  
 +OPTION(rgw_sync_data_inject_err_probability, OPT_DOUBLE, 0) // range [0, 1]
 +OPTION(rgw_sync_meta_inject_err_probability, OPT_DOUBLE, 0) // range [0, 1]
 +
 +
  OPTION(rgw_realm_reconfigure_delay, OPT_DOUBLE, 2) // seconds to wait before reloading realm configuration
  OPTION(rgw_period_push_interval, OPT_DOUBLE, 2) // seconds to wait before retrying "period push"
  OPTION(rgw_period_push_interval_max, OPT_DOUBLE, 30) // maximum interval after exponential backoff

diff --cc src/rgw/rgw_admin.cc
Simple merge

diff --cc src/rgw/rgw_data_sync.cc
Simple merge

diff --cc src/rgw/rgw_rados.cc
Simple merge

diff --cc src/rgw/rgw_rados.h
Simple merge

diff --cc src/rgw/rgw_sync.cc
Simple merge