diff options
author | Casey Bodley <cbodley@redhat.com> | 2018-09-12 15:19:13 +0200 |
---|---|---|
committer | Casey Bodley <cbodley@redhat.com> | 2018-09-19 16:32:55 +0200 |
commit | 4cf38b90d35831423bc0977854255438afcc44c1 (patch) | |
tree | 5c2a2168683997e794246aaf26430d6f7055e36f | |
parent | rgw: remove dependencies on cls_statelog (diff) | |
download | ceph-4cf38b90d35831423bc0977854255438afcc44c1.tar.xz ceph-4cf38b90d35831423bc0977854255438afcc44c1.zip |
common: remove config variables related to rgw opstate
Signed-off-by: Casey Bodley <cbodley@redhat.com>
-rw-r--r-- | doc/radosgw/multisite.rst | 4 | ||||
-rw-r--r-- | src/common/legacy_config_opts.h | 2 | ||||
-rw-r--r-- | src/common/options.cc | 8 | ||||
-rw-r--r-- | src/test/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/tools/ceph-dencoder/CMakeLists.txt | 1 |
5 files changed, 0 insertions, 17 deletions
diff --git a/doc/radosgw/multisite.rst b/doc/radosgw/multisite.rst index c382919bd79..69f5e94e10a 100644 --- a/doc/radosgw/multisite.rst +++ b/doc/radosgw/multisite.rst @@ -1455,10 +1455,6 @@ instance. | | zone group. We do not recommend | | | | | changing this setting. | | | +-------------------------------------+-----------------------------------+---------+-----------------------+ -| ``rgw_num_zone_opstate_shards`` | The maximum number of shards for | Integer | ``128`` | -| | keeping inter-zone group | | | -| | synchronization progress. | | | -+-------------------------------------+-----------------------------------+---------+-----------------------+ .. _`Pools`: ../pools diff --git a/src/common/legacy_config_opts.h b/src/common/legacy_config_opts.h index 2b3fb0d62c4..c4367483a68 100644 --- a/src/common/legacy_config_opts.h +++ b/src/common/legacy_config_opts.h @@ -1439,8 +1439,6 @@ OPTION(rgw_relaxed_s3_bucket_names, OPT_BOOL) // enable relaxed bucket name rule OPTION(rgw_defer_to_bucket_acls, OPT_STR) // if the user has bucket perms) OPTION(rgw_list_buckets_max_chunk, OPT_INT) // max buckets to retrieve in a single op when listing user buckets OPTION(rgw_md_log_max_shards, OPT_INT) // max shards for metadata log -OPTION(rgw_num_zone_opstate_shards, OPT_INT) // max shards for keeping inter-region copy progress info -OPTION(rgw_opstate_ratelimit_sec, OPT_INT) // min time between opstate updates on a single upload (0 for disabling ratelimit) OPTION(rgw_curl_wait_timeout_ms, OPT_INT) // timeout for certain curl calls OPTION(rgw_curl_low_speed_limit, OPT_INT) // low speed limit for certain curl calls OPTION(rgw_curl_low_speed_time, OPT_INT) // low speed time for certain curl calls diff --git a/src/common/options.cc b/src/common/options.cc index 6a30e5d9c3c..56eea23f281 100644 --- a/src/common/options.cc +++ b/src/common/options.cc @@ -5877,14 +5877,6 @@ std::vector<Option> get_rgw_options() { "the metadata sync parallelism as a shard can only be processed by a single " "RGW at a time"), - Option("rgw_num_zone_opstate_shards", Option::TYPE_INT, Option::LEVEL_DEV) - .set_default(128) - .set_description(""), - - Option("rgw_opstate_ratelimit_sec", Option::TYPE_INT, Option::LEVEL_DEV) - .set_default(30) - .set_description(""), - Option("rgw_curl_wait_timeout_ms", Option::TYPE_INT, Option::LEVEL_DEV) .set_default(1000) .set_description(""), diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index 98c09eb3a81..bc06de68aac 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -199,7 +199,6 @@ if(${WITH_RADOSGW}) global cls_version_client cls_log_client - cls_statelog_client cls_refcount_client cls_rgw_client cls_user_client @@ -226,7 +225,6 @@ if(${WITH_RADOSGW}) global cls_version_client cls_log_client - cls_statelog_client cls_refcount_client cls_rgw_client cls_user_client diff --git a/src/tools/ceph-dencoder/CMakeLists.txt b/src/tools/ceph-dencoder/CMakeLists.txt index be0f9d1863b..d500b5f5911 100644 --- a/src/tools/ceph-dencoder/CMakeLists.txt +++ b/src/tools/ceph-dencoder/CMakeLists.txt @@ -47,7 +47,6 @@ target_link_libraries(ceph-dencoder cls_lock_client cls_refcount_client cls_log_client - cls_statelog_client cls_version_client cls_user_client cls_journal_client |