diff options
author | Etienne Petrel <etienne.petrel@mongodb.com> | 2022-06-15 00:16:50 +0000 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-06-15 00:46:40 +0000 |
commit | c090521a7054a05a2528176bfca104c31e01dd77 (patch) | |
tree | b66f672886dd4063fc85e69fc3b46565ca27a430 /src/third_party | |
parent | 95aad3a90fec6d9be78daf989ed4162f9a4a24da (diff) | |
download | mongo-c090521a7054a05a2528176bfca104c31e01dd77.tar.gz |
Import wiredtiger: d9f9b08dfc14190698c9d79d5dd5516990095856 from branch mongodb-master
ref: fc9a2a2ac8..d9f9b08dfc
for: 6.1.0-rc0
WT-9302 deprecating object_target_size in api_data.py, adding changes from config_def.c and wiredtiger.in
Diffstat (limited to 'src/third_party')
-rw-r--r-- | src/third_party/wiredtiger/dist/api_data.py | 6 | ||||
-rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
-rw-r--r-- | src/third_party/wiredtiger/src/config/config_def.c | 105 | ||||
-rw-r--r-- | src/third_party/wiredtiger/src/include/wiredtiger.in | 3 |
4 files changed, 55 insertions, 61 deletions
diff --git a/src/third_party/wiredtiger/dist/api_data.py b/src/third_party/wiredtiger/dist/api_data.py index 02485ae7666..76fe1d4e9b6 100644 --- a/src/third_party/wiredtiger/dist/api_data.py +++ b/src/third_party/wiredtiger/dist/api_data.py @@ -201,6 +201,9 @@ tiered_config = [ time in seconds to retain data on tiered storage on the local tier for faster read access''', min='0', max='10000'), + Config('object_target_size', '0', r''' + this option is no longer supported, retained for backward compatibility''', + min='0', undoc=True), ]), ] @@ -951,9 +954,6 @@ tiered_storage_configuration_common = [ time in seconds to retain data on tiered storage on the local tier for faster read access''', min='0', max='10000'), - Config('object_target_size', '10M', r''' - the approximate size of objects before creating them on the tiered storage tier''', - min='100K', max='10TB'), ] connection_reconfigure_tiered_storage_configuration = [ Config('tiered_storage', '', r''' diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index eee73859f9c..00f3f08a46e 100644 --- a/src/third_party/wiredtiger/import.data +++ b/src/third_party/wiredtiger/import.data @@ -2,5 +2,5 @@ "vendor": "wiredtiger", "github": "wiredtiger/wiredtiger.git", "branch": "mongodb-master", - "commit": "fc9a2a2ac8558f923590095b8c8ad77911f66e18" + "commit": "d9f9b08dfc14190698c9d79d5dd5516990095856" } diff --git a/src/third_party/wiredtiger/src/config/config_def.c b/src/third_party/wiredtiger/src/config/config_def.c index d51a8946859..7e1cfbfdaab 100644 --- a/src/third_party/wiredtiger/src/config/config_def.c +++ b/src/third_party/wiredtiger/src/config/config_def.c @@ -114,9 +114,7 @@ static const WT_CONFIG_CHECK confchk_WT_CONNECTION_reconfigure_statistics_log_su {"wait", "int", NULL, "min=0,max=100000", NULL, 0}, {NULL, NULL, NULL, NULL, NULL, 0}}; static const WT_CONFIG_CHECK confchk_WT_CONNECTION_reconfigure_tiered_storage_subconfigs[] = { - {"local_retention", "int", NULL, "min=0,max=10000", NULL, 0}, - {"object_target_size", "int", NULL, "min=100K,max=10TB", NULL, 0}, - {NULL, NULL, NULL, NULL, NULL, 0}}; + {"local_retention", "int", NULL, "min=0,max=10000", NULL, 0}, {NULL, NULL, NULL, NULL, NULL, 0}}; static const WT_CONFIG_CHECK confchk_WT_CONNECTION_reconfigure[] = { {"block_cache", "category", NULL, NULL, confchk_wiredtiger_open_block_cache_subconfigs, 12}, @@ -153,7 +151,7 @@ static const WT_CONFIG_CHECK confchk_WT_CONNECTION_reconfigure[] = { {"statistics_log", "category", NULL, NULL, confchk_WT_CONNECTION_reconfigure_statistics_log_subconfigs, 5}, {"tiered_storage", "category", NULL, NULL, - confchk_WT_CONNECTION_reconfigure_tiered_storage_subconfigs, 2}, + confchk_WT_CONNECTION_reconfigure_tiered_storage_subconfigs, 1}, {"timing_stress_for_test", "list", NULL, "choices=[\"aggressive_sweep\",\"backup_rename\"," "\"checkpoint_reserved_txnid_delay\",\"checkpoint_slow\"," @@ -293,7 +291,8 @@ static const WT_CONFIG_CHECK confchk_WT_SESSION_create_tiered_storage_subconfigs {"bucket_prefix", "string", NULL, NULL, NULL, 0}, {"cache_directory", "string", NULL, NULL, NULL, 0}, {"local_retention", "int", NULL, "min=0,max=10000", NULL, 0}, - {"name", "string", NULL, NULL, NULL, 0}, {NULL, NULL, NULL, NULL, NULL, 0}}; + {"name", "string", NULL, NULL, NULL, 0}, {"object_target_size", "int", NULL, "min=0", NULL, 0}, + {NULL, NULL, NULL, NULL, NULL, 0}}; static const WT_CONFIG_CHECK confchk_WT_SESSION_create[] = { {"access_pattern_hint", "string", NULL, "choices=[\"none\",\"random\",\"sequential\"]", NULL, 0}, @@ -337,7 +336,7 @@ static const WT_CONFIG_CHECK confchk_WT_SESSION_create[] = { {"split_deepen_per_child", "int", NULL, NULL, NULL, 0}, {"split_pct", "int", NULL, "min=50,max=100", NULL, 0}, {"tiered_storage", "category", NULL, NULL, confchk_WT_SESSION_create_tiered_storage_subconfigs, - 6}, + 7}, {"type", "string", NULL, NULL, NULL, 0}, {"value_format", "format", __wt_struct_confchk, NULL, NULL, 0}, {"verbose", "list", NULL, "choices=[\"write_timestamp\"]", NULL, 0}, @@ -495,7 +494,7 @@ static const WT_CONFIG_CHECK confchk_file_config[] = { {"split_deepen_per_child", "int", NULL, NULL, NULL, 0}, {"split_pct", "int", NULL, "min=50,max=100", NULL, 0}, {"tiered_storage", "category", NULL, NULL, confchk_WT_SESSION_create_tiered_storage_subconfigs, - 6}, + 7}, {"value_format", "format", __wt_struct_confchk, NULL, NULL, 0}, {"verbose", "list", NULL, "choices=[\"write_timestamp\"]", NULL, 0}, {"write_timestamp_usage", "string", NULL, @@ -547,7 +546,7 @@ static const WT_CONFIG_CHECK confchk_file_meta[] = { {"split_pct", "int", NULL, "min=50,max=100", NULL, 0}, {"tiered_object", "boolean", NULL, NULL, NULL, 0}, {"tiered_storage", "category", NULL, NULL, confchk_WT_SESSION_create_tiered_storage_subconfigs, - 6}, + 7}, {"value_format", "format", __wt_struct_confchk, NULL, NULL, 0}, {"verbose", "list", NULL, "choices=[\"write_timestamp\"]", NULL, 0}, {"version", "string", NULL, NULL, NULL, 0}, @@ -613,7 +612,7 @@ static const WT_CONFIG_CHECK confchk_lsm_meta[] = { {"split_deepen_per_child", "int", NULL, NULL, NULL, 0}, {"split_pct", "int", NULL, "min=50,max=100", NULL, 0}, {"tiered_storage", "category", NULL, NULL, confchk_WT_SESSION_create_tiered_storage_subconfigs, - 6}, + 7}, {"value_format", "format", __wt_struct_confchk, NULL, NULL, 0}, {"verbose", "list", NULL, "choices=[\"write_timestamp\"]", NULL, 0}, {"write_timestamp_usage", "string", NULL, @@ -666,7 +665,7 @@ static const WT_CONFIG_CHECK confchk_object_meta[] = { {"split_pct", "int", NULL, "min=50,max=100", NULL, 0}, {"tiered_object", "boolean", NULL, NULL, NULL, 0}, {"tiered_storage", "category", NULL, NULL, confchk_WT_SESSION_create_tiered_storage_subconfigs, - 6}, + 7}, {"value_format", "format", __wt_struct_confchk, NULL, NULL, 0}, {"verbose", "list", NULL, "choices=[\"write_timestamp\"]", NULL, 0}, {"version", "string", NULL, NULL, NULL, 0}, @@ -735,7 +734,7 @@ static const WT_CONFIG_CHECK confchk_tier_meta[] = { {"split_pct", "int", NULL, "min=50,max=100", NULL, 0}, {"tiered_object", "boolean", NULL, NULL, NULL, 0}, {"tiered_storage", "category", NULL, NULL, confchk_WT_SESSION_create_tiered_storage_subconfigs, - 6}, + 7}, {"value_format", "format", __wt_struct_confchk, NULL, NULL, 0}, {"verbose", "list", NULL, "choices=[\"write_timestamp\"]", NULL, 0}, {"version", "string", NULL, NULL, NULL, 0}, @@ -789,7 +788,7 @@ static const WT_CONFIG_CHECK confchk_tiered_meta[] = { {"split_pct", "int", NULL, "min=50,max=100", NULL, 0}, {"tiered_object", "boolean", NULL, NULL, NULL, 0}, {"tiered_storage", "category", NULL, NULL, confchk_WT_SESSION_create_tiered_storage_subconfigs, - 6}, + 7}, {"tiers", "list", NULL, NULL, NULL, 0}, {"value_format", "format", __wt_struct_confchk, NULL, NULL, 0}, {"verbose", "list", NULL, "choices=[\"write_timestamp\"]", NULL, 0}, @@ -835,9 +834,7 @@ static const WT_CONFIG_CHECK confchk_tiered_storage_subconfigs[] = { {"cache_directory", "string", NULL, NULL, NULL, 0}, {"interval", "int", NULL, "min=1,max=1000", NULL, 0}, {"local_retention", "int", NULL, "min=0,max=10000", NULL, 0}, - {"name", "string", NULL, NULL, NULL, 0}, - {"object_target_size", "int", NULL, "min=100K,max=10TB", NULL, 0}, - {NULL, NULL, NULL, NULL, NULL, 0}}; + {"name", "string", NULL, NULL, NULL, 0}, {NULL, NULL, NULL, NULL, NULL, 0}}; static const WT_CONFIG_CHECK confchk_wiredtiger_open_transaction_sync_subconfigs[] = { {"enabled", "boolean", NULL, NULL, NULL, 0}, @@ -895,7 +892,7 @@ static const WT_CONFIG_CHECK confchk_wiredtiger_open[] = { "\"clear\",\"tree_walk\"]", NULL, 0}, {"statistics_log", "category", NULL, NULL, confchk_wiredtiger_open_statistics_log_subconfigs, 6}, - {"tiered_storage", "category", NULL, NULL, confchk_tiered_storage_subconfigs, 8}, + {"tiered_storage", "category", NULL, NULL, confchk_tiered_storage_subconfigs, 7}, {"timing_stress_for_test", "list", NULL, "choices=[\"aggressive_sweep\",\"backup_rename\"," "\"checkpoint_reserved_txnid_delay\",\"checkpoint_slow\"," @@ -978,7 +975,7 @@ static const WT_CONFIG_CHECK confchk_wiredtiger_open_all[] = { "\"clear\",\"tree_walk\"]", NULL, 0}, {"statistics_log", "category", NULL, NULL, confchk_wiredtiger_open_statistics_log_subconfigs, 6}, - {"tiered_storage", "category", NULL, NULL, confchk_tiered_storage_subconfigs, 8}, + {"tiered_storage", "category", NULL, NULL, confchk_tiered_storage_subconfigs, 7}, {"timing_stress_for_test", "list", NULL, "choices=[\"aggressive_sweep\",\"backup_rename\"," "\"checkpoint_reserved_txnid_delay\",\"checkpoint_slow\"," @@ -1059,7 +1056,7 @@ static const WT_CONFIG_CHECK confchk_wiredtiger_open_basecfg[] = { "\"clear\",\"tree_walk\"]", NULL, 0}, {"statistics_log", "category", NULL, NULL, confchk_wiredtiger_open_statistics_log_subconfigs, 6}, - {"tiered_storage", "category", NULL, NULL, confchk_tiered_storage_subconfigs, 8}, + {"tiered_storage", "category", NULL, NULL, confchk_tiered_storage_subconfigs, 7}, {"timing_stress_for_test", "list", NULL, "choices=[\"aggressive_sweep\",\"backup_rename\"," "\"checkpoint_reserved_txnid_delay\",\"checkpoint_slow\"," @@ -1138,7 +1135,7 @@ static const WT_CONFIG_CHECK confchk_wiredtiger_open_usercfg[] = { "\"clear\",\"tree_walk\"]", NULL, 0}, {"statistics_log", "category", NULL, NULL, confchk_wiredtiger_open_statistics_log_subconfigs, 6}, - {"tiered_storage", "category", NULL, NULL, confchk_tiered_storage_subconfigs, 8}, + {"tiered_storage", "category", NULL, NULL, confchk_tiered_storage_subconfigs, 7}, {"timing_stress_for_test", "list", NULL, "choices=[\"aggressive_sweep\",\"backup_rename\"," "\"checkpoint_reserved_txnid_delay\",\"checkpoint_slow\"," @@ -1213,8 +1210,8 @@ static const WT_CONFIG_ENTRY config_entries[] = {{"WT_CONNECTION.add_collator", "path=\".\"),shared_cache=(chunk=10MB,name=,quota=0,reserve=0," "size=500MB),statistics=none,statistics_log=(json=false," "on_close=false,sources=,timestamp=\"%b %d %H:%M:%S\",wait=0)," - "tiered_storage=(local_retention=300,object_target_size=10M)," - "timing_stress_for_test=,verbose=[]", + "tiered_storage=(local_retention=300),timing_stress_for_test=," + "verbose=[]", confchk_WT_CONNECTION_reconfigure, 30}, {"WT_CONNECTION.rollback_to_stable", "", NULL, 0}, {"WT_CONNECTION.set_file_system", "", NULL, 0}, {"WT_CONNECTION.set_timestamp", @@ -1268,8 +1265,8 @@ static const WT_CONFIG_ENTRY config_entries[] = {{"WT_CONNECTION.add_collator", "prefix_compression=false,prefix_compression_min=4,source=," "split_deepen_min_child=0,split_deepen_per_child=0,split_pct=90," "tiered_storage=(auth_token=,bucket=,bucket_prefix=," - "cache_directory=,local_retention=300,name=),type=file," - "value_format=u,verbose=[],write_timestamp_usage=none", + "cache_directory=,local_retention=300,name=,object_target_size=0)" + ",type=file,value_format=u,verbose=[],write_timestamp_usage=none", confchk_WT_SESSION_create, 48}, {"WT_SESSION.drop", "checkpoint_wait=true,force=false,lock_wait=true," @@ -1340,8 +1337,8 @@ static const WT_CONFIG_ENTRY config_entries[] = {{"WT_CONNECTION.add_collator", "prefix_compression=false,prefix_compression_min=4," "split_deepen_min_child=0,split_deepen_per_child=0,split_pct=90," "tiered_storage=(auth_token=,bucket=,bucket_prefix=," - "cache_directory=,local_retention=300,name=),value_format=u," - "verbose=[],write_timestamp_usage=none", + "cache_directory=,local_retention=300,name=,object_target_size=0)" + ",value_format=u,verbose=[],write_timestamp_usage=none", confchk_file_config, 40}, {"file.meta", "access_pattern_hint=none,allocation_size=4KB,app_metadata=," @@ -1360,8 +1357,9 @@ static const WT_CONFIG_ENTRY config_entries[] = {{"WT_CONNECTION.add_collator", "prefix_compression_min=4,readonly=false,split_deepen_min_child=0" ",split_deepen_per_child=0,split_pct=90,tiered_object=false," "tiered_storage=(auth_token=,bucket=,bucket_prefix=," - "cache_directory=,local_retention=300,name=),value_format=u," - "verbose=[],version=(major=0,minor=0),write_timestamp_usage=none", + "cache_directory=,local_retention=300,name=,object_target_size=0)" + ",value_format=u,verbose=[],version=(major=0,minor=0)," + "write_timestamp_usage=none", confchk_file_meta, 47}, {"index.meta", "app_metadata=,assert=(commit_timestamp=none," @@ -1390,8 +1388,8 @@ static const WT_CONFIG_ENTRY config_entries[] = {{"WT_CONNECTION.add_collator", "os_cache_max=0,prefix_compression=false,prefix_compression_min=4" ",split_deepen_min_child=0,split_deepen_per_child=0,split_pct=90," "tiered_storage=(auth_token=,bucket=,bucket_prefix=," - "cache_directory=,local_retention=300,name=),value_format=u," - "verbose=[],write_timestamp_usage=none", + "cache_directory=,local_retention=300,name=,object_target_size=0)" + ",value_format=u,verbose=[],write_timestamp_usage=none", confchk_lsm_meta, 44}, {"object.meta", "access_pattern_hint=none,allocation_size=4KB,app_metadata=," @@ -1410,8 +1408,9 @@ static const WT_CONFIG_ENTRY config_entries[] = {{"WT_CONNECTION.add_collator", "prefix_compression_min=4,readonly=false,split_deepen_min_child=0" ",split_deepen_per_child=0,split_pct=90,tiered_object=false," "tiered_storage=(auth_token=,bucket=,bucket_prefix=," - "cache_directory=,local_retention=300,name=),value_format=u," - "verbose=[],version=(major=0,minor=0),write_timestamp_usage=none", + "cache_directory=,local_retention=300,name=,object_target_size=0)" + ",value_format=u,verbose=[],version=(major=0,minor=0)," + "write_timestamp_usage=none", confchk_object_meta, 49}, {"table.meta", "app_metadata=,assert=(commit_timestamp=none," @@ -1436,9 +1435,9 @@ static const WT_CONFIG_ENTRY config_entries[] = {{"WT_CONNECTION.add_collator", "prefix_compression=false,prefix_compression_min=4,readonly=false" ",split_deepen_min_child=0,split_deepen_per_child=0,split_pct=90," "tiered_object=false,tiered_storage=(auth_token=,bucket=," - "bucket_prefix=,cache_directory=,local_retention=300,name=)," - "value_format=u,verbose=[],version=(major=0,minor=0)," - "write_timestamp_usage=none", + "bucket_prefix=,cache_directory=,local_retention=300,name=," + "object_target_size=0),value_format=u,verbose=[],version=(major=0" + ",minor=0),write_timestamp_usage=none", confchk_tier_meta, 50}, {"tiered.meta", "access_pattern_hint=none,allocation_size=4KB,app_metadata=," @@ -1458,8 +1457,8 @@ static const WT_CONFIG_ENTRY config_entries[] = {{"WT_CONNECTION.add_collator", "readonly=false,split_deepen_min_child=0,split_deepen_per_child=0" ",split_pct=90,tiered_object=false,tiered_storage=(auth_token=," "bucket=,bucket_prefix=,cache_directory=,local_retention=300," - "name=),tiers=,value_format=u,verbose=[],version=(major=0," - "minor=0),write_timestamp_usage=none", + "name=,object_target_size=0),tiers=,value_format=u,verbose=[]," + "version=(major=0,minor=0),write_timestamp_usage=none", confchk_tiered_meta, 52}, {"wiredtiger_open", "backup_restore_target=," @@ -1497,11 +1496,10 @@ static const WT_CONFIG_ENTRY config_entries[] = {{"WT_CONNECTION.add_collator", "statistics=none,statistics_log=(json=false,on_close=false," "path=\".\",sources=,timestamp=\"%b %d %H:%M:%S\",wait=0)," "tiered_storage=(auth_token=,bucket=,bucket_prefix=," - "cache_directory=,interval=60,local_retention=300,name=," - "object_target_size=10M),timing_stress_for_test=," - "transaction_sync=(enabled=false,method=fsync)," - "use_environment=true,use_environment_priv=false,verbose=[]," - "verify_metadata=false,write_through=", + "cache_directory=,interval=60,local_retention=300,name=)," + "timing_stress_for_test=,transaction_sync=(enabled=false," + "method=fsync),use_environment=true,use_environment_priv=false," + "verbose=[],verify_metadata=false,write_through=", confchk_wiredtiger_open, 58}, {"wiredtiger_open_all", "backup_restore_target=," @@ -1539,11 +1537,11 @@ static const WT_CONFIG_ENTRY config_entries[] = {{"WT_CONNECTION.add_collator", "statistics=none,statistics_log=(json=false,on_close=false," "path=\".\",sources=,timestamp=\"%b %d %H:%M:%S\",wait=0)," "tiered_storage=(auth_token=,bucket=,bucket_prefix=," - "cache_directory=,interval=60,local_retention=300,name=," - "object_target_size=10M),timing_stress_for_test=," - "transaction_sync=(enabled=false,method=fsync)," - "use_environment=true,use_environment_priv=false,verbose=[]," - "verify_metadata=false,version=(major=0,minor=0),write_through=", + "cache_directory=,interval=60,local_retention=300,name=)," + "timing_stress_for_test=,transaction_sync=(enabled=false," + "method=fsync),use_environment=true,use_environment_priv=false," + "verbose=[],verify_metadata=false,version=(major=0,minor=0)," + "write_through=", confchk_wiredtiger_open_all, 59}, {"wiredtiger_open_basecfg", "backup_restore_target=," @@ -1579,10 +1577,10 @@ static const WT_CONFIG_ENTRY config_entries[] = {{"WT_CONNECTION.add_collator", "statistics=none,statistics_log=(json=false,on_close=false," "path=\".\",sources=,timestamp=\"%b %d %H:%M:%S\",wait=0)," "tiered_storage=(auth_token=,bucket=,bucket_prefix=," - "cache_directory=,interval=60,local_retention=300,name=," - "object_target_size=10M),timing_stress_for_test=," - "transaction_sync=(enabled=false,method=fsync),verbose=[]," - "verify_metadata=false,version=(major=0,minor=0),write_through=", + "cache_directory=,interval=60,local_retention=300,name=)," + "timing_stress_for_test=,transaction_sync=(enabled=false," + "method=fsync),verbose=[],verify_metadata=false,version=(major=0," + "minor=0),write_through=", confchk_wiredtiger_open_basecfg, 53}, {"wiredtiger_open_usercfg", "backup_restore_target=," @@ -1618,10 +1616,9 @@ static const WT_CONFIG_ENTRY config_entries[] = {{"WT_CONNECTION.add_collator", "statistics=none,statistics_log=(json=false,on_close=false," "path=\".\",sources=,timestamp=\"%b %d %H:%M:%S\",wait=0)," "tiered_storage=(auth_token=,bucket=,bucket_prefix=," - "cache_directory=,interval=60,local_retention=300,name=," - "object_target_size=10M),timing_stress_for_test=," - "transaction_sync=(enabled=false,method=fsync),verbose=[]," - "verify_metadata=false,write_through=", + "cache_directory=,interval=60,local_retention=300,name=)," + "timing_stress_for_test=,transaction_sync=(enabled=false," + "method=fsync),verbose=[],verify_metadata=false,write_through=", confchk_wiredtiger_open_usercfg, 52}, {NULL, NULL, NULL, 0}}; diff --git a/src/third_party/wiredtiger/src/include/wiredtiger.in b/src/third_party/wiredtiger/src/include/wiredtiger.in index b5023335d50..4d318e78b51 100644 --- a/src/third_party/wiredtiger/src/include/wiredtiger.in +++ b/src/third_party/wiredtiger/src/include/wiredtiger.in @@ -2412,9 +2412,6 @@ struct __wt_connection { * @config{ local_retention, time in seconds to retain data * on tiered storage on the local tier for faster read access., an integer between 0 and * 10000; default \c 300.} - * @config{ object_target_size, the - * approximate size of objects before creating them on the tiered storage tier., an integer - * between 100K and 10TB; default \c 10M.} * @config{ ),,} * @config{verbose, enable messages for various subsystems and operations. Options are * given as a list\, where each message type can optionally define an associated verbosity |