Skip to content

Commit 832da87

Browse files
authored
[sys-3153] remove resync_manifest_on_open option (#287)
This option was a temporary option used to rollout manifest resync on shard open safely. It's ok to remove it now.
1 parent feb393b commit 832da87

File tree

3 files changed

+1
-17
lines changed

3 files changed

+1
-17
lines changed

cloud/cloud_file_system_impl.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1538,8 +1538,7 @@ IOStatus CloudFileSystemImpl::LoadCloudManifest(const std::string& local_dbname,
15381538
st = LoadLocalCloudManifest(local_dbname);
15391539
}
15401540

1541-
if (st.ok() && cloud_fs_options.resync_on_open &&
1542-
cloud_fs_options.resync_manifest_on_open) {
1541+
if (st.ok() && cloud_fs_options.resync_on_open) {
15431542
auto epoch = cloud_manifest_->GetCurrentEpoch();
15441543
st = FetchManifest(local_dbname, epoch);
15451544
if (st.IsNotFound()) {

cloud/db_cloud_test.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ class CloudTest : public testing::Test {
5757
dbname_ = test::TmpDir() + "/db_cloud-" + test_id_;
5858
clone_dir_ = test::TmpDir() + "/ctest-" + test_id_;
5959
cloud_fs_options_.TEST_Initialize("dbcloudtest.", dbname_);
60-
cloud_fs_options_.resync_manifest_on_open = true;
6160
cloud_fs_options_.use_aws_transfer_manager = true;
6261
// To catch any possible file deletion bugs, cloud files are deleted
6362
// right away
@@ -2813,7 +2812,6 @@ TEST_F(CloudTest, FileDeletionJobsCanceledWhenCloudEnvDestructed) {
28132812
// The failure case of opening a corrupted db which doesn't have MANIFEST file
28142813
TEST_F(CloudTest, OpenWithManifestMissing) {
28152814
cloud_fs_options_.resync_on_open = true;
2816-
cloud_fs_options_.resync_manifest_on_open = true;
28172815
OpenDB();
28182816
auto epoch = GetCloudFileSystemImpl()->GetCloudManifest()->GetCurrentEpoch();
28192817
CloseDB();

include/rocksdb/cloud/cloud_file_system.h

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -298,17 +298,6 @@ class CloudFileSystemOptions {
298298
// Default: false
299299
bool resync_on_open;
300300

301-
// Experimental option!
302-
// This option only affects how resync_on_open works. If resync_on_open is
303-
// true, and resync_manifest_on_open is true, besides fetching CLOUDMANFIEST
304-
// from s3, we will fetch latest MANIFEST file as well.
305-
//
306-
// This is a temporary option to help quickly rollback the change if something
307-
// unexpected is wrong.
308-
// TODO(wei): remove this option once we are confident about the change.
309-
// Default: true
310-
bool resync_manifest_on_open;
311-
312301
// If true, we will skip the dbid verification on startup. This is currently
313302
// only used in tests and is not recommended setting.
314303
// Default: false
@@ -418,7 +407,6 @@ class CloudFileSystemOptions {
418407
bool _server_side_encryption = false, std::string _encryption_key_id = "",
419408
bool _create_bucket_if_missing = true, uint64_t _request_timeout_ms = 0,
420409
bool _run_purger = false, bool _resync_on_open = false,
421-
bool _resync_manifest_on_open = true,
422410
bool _skip_dbid_verification = false,
423411
bool _use_aws_transfer_manager = false,
424412
int _number_objects_listed_in_one_iteration = 5000,
@@ -443,7 +431,6 @@ class CloudFileSystemOptions {
443431
request_timeout_ms(_request_timeout_ms),
444432
run_purger(_run_purger),
445433
resync_on_open(_resync_on_open),
446-
resync_manifest_on_open(_resync_manifest_on_open),
447434
skip_dbid_verification(_skip_dbid_verification),
448435
use_aws_transfer_manager(_use_aws_transfer_manager),
449436
number_objects_listed_in_one_iteration(

0 commit comments

Comments
 (0)