diff options
| -rw-r--r-- | src/third_party/wiredtiger/dist/api_data.py | 4 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/dist/stat_data.py | 1 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/config/config_def.c | 52 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/include/connection.h | 1 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/include/stat.h | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/include/wiredtiger.in | 215 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/support/stat.c | 7 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/tiered/tiered_config.c | 4 | ||||
| -rwxr-xr-x | src/third_party/wiredtiger/test/evergreen.yml | 18 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/test/suite/test_tiered04.py | 12 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/test/suite/test_tiered07.py | 3 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/test/suite/test_tiered13.py | 3 |
13 files changed, 150 insertions, 174 deletions
diff --git a/src/third_party/wiredtiger/dist/api_data.py b/src/third_party/wiredtiger/dist/api_data.py index 1163d922b13..5187f93ccda 100644 --- a/src/third_party/wiredtiger/dist/api_data.py +++ b/src/third_party/wiredtiger/dist/api_data.py @@ -219,10 +219,6 @@ 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', '10M', r''' - the approximate size of objects before creating them on the - tiered storage tier''', - min='100K', max='10TB'), ]), ] diff --git a/src/third_party/wiredtiger/dist/stat_data.py b/src/third_party/wiredtiger/dist/stat_data.py index da36da590a5..c48682685c4 100644 --- a/src/third_party/wiredtiger/dist/stat_data.py +++ b/src/third_party/wiredtiger/dist/stat_data.py @@ -916,7 +916,6 @@ conn_dsrc_stats = [ ########################################## # Tiered storage statistics ########################################## - StorageStat('tiered_object_size', 'tiered storage object size', 'no_clear,no_scale,size'), StorageStat('tiered_retention', 'tiered storage local retention time (secs)', 'no_clear,no_scale,size'), StorageStat('tiered_work_units_created', 'tiered operations scheduled'), StorageStat('tiered_work_units_dequeued', 'tiered operations dequeued and processed'), diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index 3d480e586ab..9ce9ba5f686 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-6.0", - "commit": "396f9004282cf8a8d8d7580dfea065ca0352f3d8" + "commit": "0393d02cd3a826511c57698e5110e15c50559a80" } diff --git a/src/third_party/wiredtiger/src/config/config_def.c b/src/third_party/wiredtiger/src/config/config_def.c index bc1a7a93990..53c7f8847db 100644 --- a/src/third_party/wiredtiger/src/config/config_def.c +++ b/src/third_party/wiredtiger/src/config/config_def.c @@ -291,9 +291,7 @@ 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}, - {"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_WT_SESSION_create[] = { {"access_pattern_hint", "string", NULL, "choices=[\"none\",\"random\",\"sequential\"]", NULL, 0}, @@ -339,7 +337,7 @@ static const WT_CONFIG_CHECK confchk_WT_SESSION_create[] = { {"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, - 7}, + 6}, {"type", "string", NULL, NULL, NULL, 0}, {"value_format", "format", __wt_struct_confchk, NULL, NULL, 0}, {"verbose", "list", NULL, "choices=[\"write_timestamp\"]", NULL, 0}, @@ -498,7 +496,7 @@ static const WT_CONFIG_CHECK confchk_file_config[] = { {"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, - 7}, + 6}, {"value_format", "format", __wt_struct_confchk, NULL, NULL, 0}, {"verbose", "list", NULL, "choices=[\"write_timestamp\"]", NULL, 0}, {"write_timestamp_usage", "string", NULL, @@ -550,7 +548,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, - 7}, + 6}, {"value_format", "format", __wt_struct_confchk, NULL, NULL, 0}, {"verbose", "list", NULL, "choices=[\"write_timestamp\"]", NULL, 0}, {"version", "string", NULL, NULL, NULL, 0}, @@ -618,7 +616,7 @@ static const WT_CONFIG_CHECK confchk_lsm_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, - 7}, + 6}, {"value_format", "format", __wt_struct_confchk, NULL, NULL, 0}, {"verbose", "list", NULL, "choices=[\"write_timestamp\"]", NULL, 0}, {"write_timestamp_usage", "string", NULL, @@ -671,7 +669,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, - 7}, + 6}, {"value_format", "format", __wt_struct_confchk, NULL, NULL, 0}, {"verbose", "list", NULL, "choices=[\"write_timestamp\"]", NULL, 0}, {"version", "string", NULL, NULL, NULL, 0}, @@ -740,7 +738,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, - 7}, + 6}, {"value_format", "format", __wt_struct_confchk, NULL, NULL, 0}, {"verbose", "list", NULL, "choices=[\"write_timestamp\"]", NULL, 0}, {"version", "string", NULL, NULL, NULL, 0}, @@ -794,7 +792,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, - 7}, + 6}, {"tiers", "list", NULL, NULL, NULL, 0}, {"value_format", "format", __wt_struct_confchk, NULL, NULL, 0}, {"verbose", "list", NULL, "choices=[\"write_timestamp\"]", NULL, 0}, @@ -1271,8 +1269,8 @@ static const WT_CONFIG_ENTRY config_entries[] = {{"WT_CONNECTION.add_collator", ",source=,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=,object_target_size=10M),type=file,value_format=u," - "verbose=[],write_timestamp_usage=none", + "name=),type=file,value_format=u,verbose=[]," + "write_timestamp_usage=none", confchk_WT_SESSION_create, 50}, {"WT_SESSION.drop", "checkpoint_wait=true,force=false,lock_wait=true," @@ -1341,9 +1339,8 @@ 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=," - "object_target_size=10M),value_format=u,verbose=[]," - "write_timestamp_usage=none", + "bucket_prefix=,cache_directory=,local_retention=300,name=)," + "value_format=u,verbose=[],write_timestamp_usage=none", confchk_file_config, 42}, {"file.meta", "access_pattern_hint=none,allocation_size=4KB,app_metadata=," @@ -1362,9 +1359,8 @@ 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=," - "object_target_size=10M),value_format=u,verbose=[]," - "version=(major=0,minor=0),write_timestamp_usage=none", + "cache_directory=,local_retention=300,name=),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," @@ -1394,9 +1390,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=," - "object_target_size=10M),value_format=u,verbose=[]," - "write_timestamp_usage=none", + "cache_directory=,local_retention=300,name=),value_format=u," + "verbose=[],write_timestamp_usage=none", confchk_lsm_meta, 46}, {"object.meta", "access_pattern_hint=none,allocation_size=4KB,app_metadata=," @@ -1415,9 +1410,8 @@ 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=," - "object_target_size=10M),value_format=u,verbose=[]," - "version=(major=0,minor=0),write_timestamp_usage=none", + "cache_directory=,local_retention=300,name=),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," @@ -1442,9 +1436,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=," - "object_target_size=10M),value_format=u,verbose=[]," - "version=(major=0,minor=0),write_timestamp_usage=none", + "bucket_prefix=,cache_directory=,local_retention=300,name=)," + "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=," @@ -1464,8 +1458,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=,object_target_size=10M),tiers=,value_format=u,verbose=[]," - "version=(major=0,minor=0),write_timestamp_usage=none", + "name=),tiers=,value_format=u,verbose=[],version=(major=0," + "minor=0),write_timestamp_usage=none", confchk_tiered_meta, 52}, {"wiredtiger_open", "backup_restore_target=," diff --git a/src/third_party/wiredtiger/src/include/connection.h b/src/third_party/wiredtiger/src/include/connection.h index 2723ee14570..326d9f90033 100644 --- a/src/third_party/wiredtiger/src/include/connection.h +++ b/src/third_party/wiredtiger/src/include/connection.h @@ -40,7 +40,6 @@ struct __wt_bucket_storage { const char *bucket_prefix; /* Bucket prefix */ const char *cache_directory; /* Locally cached file location */ int owned; /* Storage needs to be terminated */ - uint64_t object_size; /* Tiered object size */ uint64_t retain_secs; /* Tiered period */ const char *auth_token; /* Tiered authentication cookie */ WT_FILE_SYSTEM *file_system; /* File system for bucket */ diff --git a/src/third_party/wiredtiger/src/include/stat.h b/src/third_party/wiredtiger/src/include/stat.h index 2b80cca70c0..df2915742eb 100644 --- a/src/third_party/wiredtiger/src/include/stat.h +++ b/src/third_party/wiredtiger/src/include/stat.h @@ -756,7 +756,6 @@ struct __wt_connection_stats { int64_t tiered_work_units_dequeued; int64_t tiered_work_units_created; int64_t tiered_retention; - int64_t tiered_object_size; int64_t thread_fsync_active; int64_t thread_read_active; int64_t thread_write_active; @@ -1072,7 +1071,6 @@ struct __wt_dsrc_stats { int64_t tiered_work_units_dequeued; int64_t tiered_work_units_created; int64_t tiered_retention; - int64_t tiered_object_size; int64_t txn_read_race_prepare_update; int64_t txn_rts_hs_stop_older_than_newer_start; int64_t txn_rts_inconsistent_ckpt; diff --git a/src/third_party/wiredtiger/src/include/wiredtiger.in b/src/third_party/wiredtiger/src/include/wiredtiger.in index 0418417ff1f..6c77ab92bb2 100644 --- a/src/third_party/wiredtiger/src/include/wiredtiger.in +++ b/src/third_party/wiredtiger/src/include/wiredtiger.in @@ -1337,9 +1337,6 @@ struct __wt_session { * @config{ name, permitted values are \c "none" or custom storage * source name created with WT_CONNECTION::add_storage_source. See @ref * custom_storage_sources for more information., a string; default \c none.} - * @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{type, set the type of data source used to store a column group\, index or simple * table. By default\, a \c "file:" URI is derived from the object name. The \c type @@ -6184,238 +6181,236 @@ extern int wiredtiger_extension_terminate(WT_CONNECTION *connection); #define WT_STAT_CONN_TIERED_WORK_UNITS_CREATED 1422 /*! session: tiered storage local retention time (secs) */ #define WT_STAT_CONN_TIERED_RETENTION 1423 -/*! session: tiered storage object size */ -#define WT_STAT_CONN_TIERED_OBJECT_SIZE 1424 /*! thread-state: active filesystem fsync calls */ -#define WT_STAT_CONN_THREAD_FSYNC_ACTIVE 1425 +#define WT_STAT_CONN_THREAD_FSYNC_ACTIVE 1424 /*! thread-state: active filesystem read calls */ -#define WT_STAT_CONN_THREAD_READ_ACTIVE 1426 +#define WT_STAT_CONN_THREAD_READ_ACTIVE 1425 /*! thread-state: active filesystem write calls */ -#define WT_STAT_CONN_THREAD_WRITE_ACTIVE 1427 +#define WT_STAT_CONN_THREAD_WRITE_ACTIVE 1426 /*! thread-yield: application thread time evicting (usecs) */ -#define WT_STAT_CONN_APPLICATION_EVICT_TIME 1428 +#define WT_STAT_CONN_APPLICATION_EVICT_TIME 1427 /*! thread-yield: application thread time waiting for cache (usecs) */ -#define WT_STAT_CONN_APPLICATION_CACHE_TIME 1429 +#define WT_STAT_CONN_APPLICATION_CACHE_TIME 1428 /*! * thread-yield: connection close blocked waiting for transaction state * stabilization */ -#define WT_STAT_CONN_TXN_RELEASE_BLOCKED 1430 +#define WT_STAT_CONN_TXN_RELEASE_BLOCKED 1429 /*! thread-yield: connection close yielded for lsm manager shutdown */ -#define WT_STAT_CONN_CONN_CLOSE_BLOCKED_LSM 1431 +#define WT_STAT_CONN_CONN_CLOSE_BLOCKED_LSM 1430 /*! thread-yield: data handle lock yielded */ -#define WT_STAT_CONN_DHANDLE_LOCK_BLOCKED 1432 +#define WT_STAT_CONN_DHANDLE_LOCK_BLOCKED 1431 /*! * thread-yield: get reference for page index and slot time sleeping * (usecs) */ -#define WT_STAT_CONN_PAGE_INDEX_SLOT_REF_BLOCKED 1433 +#define WT_STAT_CONN_PAGE_INDEX_SLOT_REF_BLOCKED 1432 /*! thread-yield: page access yielded due to prepare state change */ -#define WT_STAT_CONN_PREPARED_TRANSITION_BLOCKED_PAGE 1434 +#define WT_STAT_CONN_PREPARED_TRANSITION_BLOCKED_PAGE 1433 /*! thread-yield: page acquire busy blocked */ -#define WT_STAT_CONN_PAGE_BUSY_BLOCKED 1435 +#define WT_STAT_CONN_PAGE_BUSY_BLOCKED 1434 /*! thread-yield: page acquire eviction blocked */ -#define WT_STAT_CONN_PAGE_FORCIBLE_EVICT_BLOCKED 1436 +#define WT_STAT_CONN_PAGE_FORCIBLE_EVICT_BLOCKED 1435 /*! thread-yield: page acquire locked blocked */ -#define WT_STAT_CONN_PAGE_LOCKED_BLOCKED 1437 +#define WT_STAT_CONN_PAGE_LOCKED_BLOCKED 1436 /*! thread-yield: page acquire read blocked */ -#define WT_STAT_CONN_PAGE_READ_BLOCKED 1438 +#define WT_STAT_CONN_PAGE_READ_BLOCKED 1437 /*! thread-yield: page acquire time sleeping (usecs) */ -#define WT_STAT_CONN_PAGE_SLEEP 1439 +#define WT_STAT_CONN_PAGE_SLEEP 1438 /*! * thread-yield: page delete rollback time sleeping for state change * (usecs) */ -#define WT_STAT_CONN_PAGE_DEL_ROLLBACK_BLOCKED 1440 +#define WT_STAT_CONN_PAGE_DEL_ROLLBACK_BLOCKED 1439 /*! thread-yield: page reconciliation yielded due to child modification */ -#define WT_STAT_CONN_CHILD_MODIFY_BLOCKED_PAGE 1441 +#define WT_STAT_CONN_CHILD_MODIFY_BLOCKED_PAGE 1440 /*! transaction: Number of prepared updates */ -#define WT_STAT_CONN_TXN_PREPARED_UPDATES 1442 +#define WT_STAT_CONN_TXN_PREPARED_UPDATES 1441 /*! transaction: Number of prepared updates committed */ -#define WT_STAT_CONN_TXN_PREPARED_UPDATES_COMMITTED 1443 +#define WT_STAT_CONN_TXN_PREPARED_UPDATES_COMMITTED 1442 /*! transaction: Number of prepared updates repeated on the same key */ -#define WT_STAT_CONN_TXN_PREPARED_UPDATES_KEY_REPEATED 1444 +#define WT_STAT_CONN_TXN_PREPARED_UPDATES_KEY_REPEATED 1443 /*! transaction: Number of prepared updates rolled back */ -#define WT_STAT_CONN_TXN_PREPARED_UPDATES_ROLLEDBACK 1445 +#define WT_STAT_CONN_TXN_PREPARED_UPDATES_ROLLEDBACK 1444 /*! transaction: prepared transactions */ -#define WT_STAT_CONN_TXN_PREPARE 1446 +#define WT_STAT_CONN_TXN_PREPARE 1445 /*! transaction: prepared transactions committed */ -#define WT_STAT_CONN_TXN_PREPARE_COMMIT 1447 +#define WT_STAT_CONN_TXN_PREPARE_COMMIT 1446 /*! transaction: prepared transactions currently active */ -#define WT_STAT_CONN_TXN_PREPARE_ACTIVE 1448 +#define WT_STAT_CONN_TXN_PREPARE_ACTIVE 1447 /*! transaction: prepared transactions rolled back */ -#define WT_STAT_CONN_TXN_PREPARE_ROLLBACK 1449 +#define WT_STAT_CONN_TXN_PREPARE_ROLLBACK 1448 /*! * transaction: prepared transactions rolled back and do not remove the * history store entry */ -#define WT_STAT_CONN_TXN_PREPARE_ROLLBACK_DO_NOT_REMOVE_HS_UPDATE 1450 +#define WT_STAT_CONN_TXN_PREPARE_ROLLBACK_DO_NOT_REMOVE_HS_UPDATE 1449 /*! * transaction: prepared transactions rolled back and fix the history * store entry with checkpoint reserved transaction id */ -#define WT_STAT_CONN_TXN_PREPARE_ROLLBACK_FIX_HS_UPDATE_WITH_CKPT_RESERVED_TXNID 1451 +#define WT_STAT_CONN_TXN_PREPARE_ROLLBACK_FIX_HS_UPDATE_WITH_CKPT_RESERVED_TXNID 1450 /*! transaction: query timestamp calls */ -#define WT_STAT_CONN_TXN_QUERY_TS 1452 +#define WT_STAT_CONN_TXN_QUERY_TS 1451 /*! transaction: race to read prepared update retry */ -#define WT_STAT_CONN_TXN_READ_RACE_PREPARE_UPDATE 1453 +#define WT_STAT_CONN_TXN_READ_RACE_PREPARE_UPDATE 1452 /*! transaction: rollback to stable calls */ -#define WT_STAT_CONN_TXN_RTS 1454 +#define WT_STAT_CONN_TXN_RTS 1453 /*! * transaction: rollback to stable history store records with stop * timestamps older than newer records */ -#define WT_STAT_CONN_TXN_RTS_HS_STOP_OLDER_THAN_NEWER_START 1455 +#define WT_STAT_CONN_TXN_RTS_HS_STOP_OLDER_THAN_NEWER_START 1454 /*! transaction: rollback to stable inconsistent checkpoint */ -#define WT_STAT_CONN_TXN_RTS_INCONSISTENT_CKPT 1456 +#define WT_STAT_CONN_TXN_RTS_INCONSISTENT_CKPT 1455 /*! transaction: rollback to stable keys removed */ -#define WT_STAT_CONN_TXN_RTS_KEYS_REMOVED 1457 +#define WT_STAT_CONN_TXN_RTS_KEYS_REMOVED 1456 /*! transaction: rollback to stable keys restored */ -#define WT_STAT_CONN_TXN_RTS_KEYS_RESTORED 1458 +#define WT_STAT_CONN_TXN_RTS_KEYS_RESTORED 1457 /*! transaction: rollback to stable pages visited */ -#define WT_STAT_CONN_TXN_RTS_PAGES_VISITED 1459 +#define WT_STAT_CONN_TXN_RTS_PAGES_VISITED 1458 /*! transaction: rollback to stable restored tombstones from history store */ -#define WT_STAT_CONN_TXN_RTS_HS_RESTORE_TOMBSTONES 1460 +#define WT_STAT_CONN_TXN_RTS_HS_RESTORE_TOMBSTONES 1459 /*! transaction: rollback to stable restored updates from history store */ -#define WT_STAT_CONN_TXN_RTS_HS_RESTORE_UPDATES 1461 +#define WT_STAT_CONN_TXN_RTS_HS_RESTORE_UPDATES 1460 /*! transaction: rollback to stable skipping delete rle */ -#define WT_STAT_CONN_TXN_RTS_DELETE_RLE_SKIPPED 1462 +#define WT_STAT_CONN_TXN_RTS_DELETE_RLE_SKIPPED 1461 /*! transaction: rollback to stable skipping stable rle */ -#define WT_STAT_CONN_TXN_RTS_STABLE_RLE_SKIPPED 1463 +#define WT_STAT_CONN_TXN_RTS_STABLE_RLE_SKIPPED 1462 /*! transaction: rollback to stable sweeping history store keys */ -#define WT_STAT_CONN_TXN_RTS_SWEEP_HS_KEYS 1464 +#define WT_STAT_CONN_TXN_RTS_SWEEP_HS_KEYS 1463 /*! transaction: rollback to stable tree walk skipping pages */ -#define WT_STAT_CONN_TXN_RTS_TREE_WALK_SKIP_PAGES 1465 +#define WT_STAT_CONN_TXN_RTS_TREE_WALK_SKIP_PAGES 1464 /*! transaction: rollback to stable updates aborted */ -#define WT_STAT_CONN_TXN_RTS_UPD_ABORTED 1466 +#define WT_STAT_CONN_TXN_RTS_UPD_ABORTED 1465 /*! transaction: rollback to stable updates removed from history store */ -#define WT_STAT_CONN_TXN_RTS_HS_REMOVED 1467 +#define WT_STAT_CONN_TXN_RTS_HS_REMOVED 1466 /*! transaction: sessions scanned in each walk of concurrent sessions */ -#define WT_STAT_CONN_TXN_SESSIONS_WALKED 1468 +#define WT_STAT_CONN_TXN_SESSIONS_WALKED 1467 /*! transaction: set timestamp calls */ -#define WT_STAT_CONN_TXN_SET_TS 1469 +#define WT_STAT_CONN_TXN_SET_TS 1468 /*! transaction: set timestamp durable calls */ -#define WT_STAT_CONN_TXN_SET_TS_DURABLE 1470 +#define WT_STAT_CONN_TXN_SET_TS_DURABLE 1469 /*! transaction: set timestamp durable updates */ -#define WT_STAT_CONN_TXN_SET_TS_DURABLE_UPD 1471 +#define WT_STAT_CONN_TXN_SET_TS_DURABLE_UPD 1470 /*! transaction: set timestamp oldest calls */ -#define WT_STAT_CONN_TXN_SET_TS_OLDEST 1472 +#define WT_STAT_CONN_TXN_SET_TS_OLDEST 1471 /*! transaction: set timestamp oldest updates */ -#define WT_STAT_CONN_TXN_SET_TS_OLDEST_UPD 1473 +#define WT_STAT_CONN_TXN_SET_TS_OLDEST_UPD 1472 /*! transaction: set timestamp stable calls */ -#define WT_STAT_CONN_TXN_SET_TS_STABLE 1474 +#define WT_STAT_CONN_TXN_SET_TS_STABLE 1473 /*! transaction: set timestamp stable updates */ -#define WT_STAT_CONN_TXN_SET_TS_STABLE_UPD 1475 +#define WT_STAT_CONN_TXN_SET_TS_STABLE_UPD 1474 /*! transaction: transaction begins */ -#define WT_STAT_CONN_TXN_BEGIN 1476 +#define WT_STAT_CONN_TXN_BEGIN 1475 /*! transaction: transaction checkpoint currently running */ -#define WT_STAT_CONN_TXN_CHECKPOINT_RUNNING 1477 +#define WT_STAT_CONN_TXN_CHECKPOINT_RUNNING 1476 /*! * transaction: transaction checkpoint currently running for history * store file */ -#define WT_STAT_CONN_TXN_CHECKPOINT_RUNNING_HS 1478 +#define WT_STAT_CONN_TXN_CHECKPOINT_RUNNING_HS 1477 /*! transaction: transaction checkpoint generation */ -#define WT_STAT_CONN_TXN_CHECKPOINT_GENERATION 1479 +#define WT_STAT_CONN_TXN_CHECKPOINT_GENERATION 1478 /*! * transaction: transaction checkpoint history store file duration * (usecs) */ -#define WT_STAT_CONN_TXN_HS_CKPT_DURATION 1480 +#define WT_STAT_CONN_TXN_HS_CKPT_DURATION 1479 /*! transaction: transaction checkpoint max time (msecs) */ -#define WT_STAT_CONN_TXN_CHECKPOINT_TIME_MAX 1481 +#define WT_STAT_CONN_TXN_CHECKPOINT_TIME_MAX 1480 /*! transaction: transaction checkpoint min time (msecs) */ -#define WT_STAT_CONN_TXN_CHECKPOINT_TIME_MIN 1482 +#define WT_STAT_CONN_TXN_CHECKPOINT_TIME_MIN 1481 /*! * transaction: transaction checkpoint most recent duration for gathering * all handles (usecs) */ -#define WT_STAT_CONN_TXN_CHECKPOINT_HANDLE_DURATION 1483 +#define WT_STAT_CONN_TXN_CHECKPOINT_HANDLE_DURATION 1482 /*! * transaction: transaction checkpoint most recent duration for gathering * applied handles (usecs) */ -#define WT_STAT_CONN_TXN_CHECKPOINT_HANDLE_DURATION_APPLY 1484 +#define WT_STAT_CONN_TXN_CHECKPOINT_HANDLE_DURATION_APPLY 1483 /*! * transaction: transaction checkpoint most recent duration for gathering * skipped handles (usecs) */ -#define WT_STAT_CONN_TXN_CHECKPOINT_HANDLE_DURATION_SKIP 1485 +#define WT_STAT_CONN_TXN_CHECKPOINT_HANDLE_DURATION_SKIP 1484 /*! transaction: transaction checkpoint most recent handles applied */ -#define WT_STAT_CONN_TXN_CHECKPOINT_HANDLE_APPLIED 1486 +#define WT_STAT_CONN_TXN_CHECKPOINT_HANDLE_APPLIED 1485 /*! transaction: transaction checkpoint most recent handles skipped */ -#define WT_STAT_CONN_TXN_CHECKPOINT_HANDLE_SKIPPED 1487 +#define WT_STAT_CONN_TXN_CHECKPOINT_HANDLE_SKIPPED 1486 /*! transaction: transaction checkpoint most recent handles walked */ -#define WT_STAT_CONN_TXN_CHECKPOINT_HANDLE_WALKED 1488 +#define WT_STAT_CONN_TXN_CHECKPOINT_HANDLE_WALKED 1487 /*! transaction: transaction checkpoint most recent time (msecs) */ -#define WT_STAT_CONN_TXN_CHECKPOINT_TIME_RECENT 1489 +#define WT_STAT_CONN_TXN_CHECKPOINT_TIME_RECENT 1488 /*! transaction: transaction checkpoint prepare currently running */ -#define WT_STAT_CONN_TXN_CHECKPOINT_PREP_RUNNING 1490 +#define WT_STAT_CONN_TXN_CHECKPOINT_PREP_RUNNING 1489 /*! transaction: transaction checkpoint prepare max time (msecs) */ -#define WT_STAT_CONN_TXN_CHECKPOINT_PREP_MAX 1491 +#define WT_STAT_CONN_TXN_CHECKPOINT_PREP_MAX 1490 /*! transaction: transaction checkpoint prepare min time (msecs) */ -#define WT_STAT_CONN_TXN_CHECKPOINT_PREP_MIN 1492 +#define WT_STAT_CONN_TXN_CHECKPOINT_PREP_MIN 1491 /*! transaction: transaction checkpoint prepare most recent time (msecs) */ -#define WT_STAT_CONN_TXN_CHECKPOINT_PREP_RECENT 1493 +#define WT_STAT_CONN_TXN_CHECKPOINT_PREP_RECENT 1492 /*! transaction: transaction checkpoint prepare total time (msecs) */ -#define WT_STAT_CONN_TXN_CHECKPOINT_PREP_TOTAL 1494 +#define WT_STAT_CONN_TXN_CHECKPOINT_PREP_TOTAL 1493 /*! transaction: transaction checkpoint scrub dirty target */ -#define WT_STAT_CONN_TXN_CHECKPOINT_SCRUB_TARGET 1495 +#define WT_STAT_CONN_TXN_CHECKPOINT_SCRUB_TARGET 1494 /*! transaction: transaction checkpoint scrub time (msecs) */ -#define WT_STAT_CONN_TXN_CHECKPOINT_SCRUB_TIME 1496 +#define WT_STAT_CONN_TXN_CHECKPOINT_SCRUB_TIME 1495 /*! transaction: transaction checkpoint total time (msecs) */ -#define WT_STAT_CONN_TXN_CHECKPOINT_TIME_TOTAL 1497 +#define WT_STAT_CONN_TXN_CHECKPOINT_TIME_TOTAL 1496 /*! transaction: transaction checkpoints */ -#define WT_STAT_CONN_TXN_CHECKPOINT 1498 +#define WT_STAT_CONN_TXN_CHECKPOINT 1497 /*! transaction: transaction checkpoints due to obsolete pages */ -#define WT_STAT_CONN_TXN_CHECKPOINT_OBSOLETE_APPLIED 1499 +#define WT_STAT_CONN_TXN_CHECKPOINT_OBSOLETE_APPLIED 1498 /*! * transaction: transaction checkpoints skipped because database was * clean */ -#define WT_STAT_CONN_TXN_CHECKPOINT_SKIPPED 1500 +#define WT_STAT_CONN_TXN_CHECKPOINT_SKIPPED 1499 /*! transaction: transaction failures due to history store */ -#define WT_STAT_CONN_TXN_FAIL_CACHE 1501 +#define WT_STAT_CONN_TXN_FAIL_CACHE 1500 /*! * transaction: transaction fsync calls for checkpoint after allocating * the transaction ID */ -#define WT_STAT_CONN_TXN_CHECKPOINT_FSYNC_POST 1502 +#define WT_STAT_CONN_TXN_CHECKPOINT_FSYNC_POST 1501 /*! * transaction: transaction fsync duration for checkpoint after * allocating the transaction ID (usecs) */ -#define WT_STAT_CONN_TXN_CHECKPOINT_FSYNC_POST_DURATION 1503 +#define WT_STAT_CONN_TXN_CHECKPOINT_FSYNC_POST_DURATION 1502 /*! transaction: transaction range of IDs currently pinned */ -#define WT_STAT_CONN_TXN_PINNED_RANGE 1504 +#define WT_STAT_CONN_TXN_PINNED_RANGE 1503 /*! transaction: transaction range of IDs currently pinned by a checkpoint */ -#define WT_STAT_CONN_TXN_PINNED_CHECKPOINT_RANGE 1505 +#define WT_STAT_CONN_TXN_PINNED_CHECKPOINT_RANGE 1504 /*! transaction: transaction range of timestamps currently pinned */ -#define WT_STAT_CONN_TXN_PINNED_TIMESTAMP 1506 +#define WT_STAT_CONN_TXN_PINNED_TIMESTAMP 1505 /*! transaction: transaction range of timestamps pinned by a checkpoint */ -#define WT_STAT_CONN_TXN_PINNED_TIMESTAMP_CHECKPOINT 1507 +#define WT_STAT_CONN_TXN_PINNED_TIMESTAMP_CHECKPOINT 1506 /*! * transaction: transaction range of timestamps pinned by the oldest * active read timestamp */ -#define WT_STAT_CONN_TXN_PINNED_TIMESTAMP_READER 1508 +#define WT_STAT_CONN_TXN_PINNED_TIMESTAMP_READER 1507 /*! * transaction: transaction range of timestamps pinned by the oldest * timestamp */ -#define WT_STAT_CONN_TXN_PINNED_TIMESTAMP_OLDEST 1509 +#define WT_STAT_CONN_TXN_PINNED_TIMESTAMP_OLDEST 1508 /*! transaction: transaction read timestamp of the oldest active reader */ -#define WT_STAT_CONN_TXN_TIMESTAMP_OLDEST_ACTIVE_READ 1510 +#define WT_STAT_CONN_TXN_TIMESTAMP_OLDEST_ACTIVE_READ 1509 /*! transaction: transaction rollback to stable currently running */ -#define WT_STAT_CONN_TXN_ROLLBACK_TO_STABLE_RUNNING 1511 +#define WT_STAT_CONN_TXN_ROLLBACK_TO_STABLE_RUNNING 1510 /*! transaction: transaction walk of concurrent sessions */ -#define WT_STAT_CONN_TXN_WALK_SESSIONS 1512 +#define WT_STAT_CONN_TXN_WALK_SESSIONS 1511 /*! transaction: transactions committed */ -#define WT_STAT_CONN_TXN_COMMIT 1513 +#define WT_STAT_CONN_TXN_COMMIT 1512 /*! transaction: transactions rolled back */ -#define WT_STAT_CONN_TXN_ROLLBACK 1514 +#define WT_STAT_CONN_TXN_ROLLBACK 1513 /*! transaction: update conflicts */ -#define WT_STAT_CONN_TXN_UPDATE_CONFLICT 1515 +#define WT_STAT_CONN_TXN_UPDATE_CONFLICT 1514 /*! * @} @@ -7062,37 +7057,35 @@ extern int wiredtiger_extension_terminate(WT_CONNECTION *connection); #define WT_STAT_DSRC_TIERED_WORK_UNITS_CREATED 2215 /*! session: tiered storage local retention time (secs) */ #define WT_STAT_DSRC_TIERED_RETENTION 2216 -/*! session: tiered storage object size */ -#define WT_STAT_DSRC_TIERED_OBJECT_SIZE 2217 /*! transaction: race to read prepared update retry */ -#define WT_STAT_DSRC_TXN_READ_RACE_PREPARE_UPDATE 2218 +#define WT_STAT_DSRC_TXN_READ_RACE_PREPARE_UPDATE 2217 /*! * transaction: rollback to stable history store records with stop * timestamps older than newer records */ -#define WT_STAT_DSRC_TXN_RTS_HS_STOP_OLDER_THAN_NEWER_START 2219 +#define WT_STAT_DSRC_TXN_RTS_HS_STOP_OLDER_THAN_NEWER_START 2218 /*! transaction: rollback to stable inconsistent checkpoint */ -#define WT_STAT_DSRC_TXN_RTS_INCONSISTENT_CKPT 2220 +#define WT_STAT_DSRC_TXN_RTS_INCONSISTENT_CKPT 2219 /*! transaction: rollback to stable keys removed */ -#define WT_STAT_DSRC_TXN_RTS_KEYS_REMOVED 2221 +#define WT_STAT_DSRC_TXN_RTS_KEYS_REMOVED 2220 /*! transaction: rollback to stable keys restored */ -#define WT_STAT_DSRC_TXN_RTS_KEYS_RESTORED 2222 +#define WT_STAT_DSRC_TXN_RTS_KEYS_RESTORED 2221 /*! transaction: rollback to stable restored tombstones from history store */ -#define WT_STAT_DSRC_TXN_RTS_HS_RESTORE_TOMBSTONES 2223 +#define WT_STAT_DSRC_TXN_RTS_HS_RESTORE_TOMBSTONES 2222 /*! transaction: rollback to stable restored updates from history store */ -#define WT_STAT_DSRC_TXN_RTS_HS_RESTORE_UPDATES 2224 +#define WT_STAT_DSRC_TXN_RTS_HS_RESTORE_UPDATES 2223 /*! transaction: rollback to stable skipping delete rle */ -#define WT_STAT_DSRC_TXN_RTS_DELETE_RLE_SKIPPED 2225 +#define WT_STAT_DSRC_TXN_RTS_DELETE_RLE_SKIPPED 2224 /*! transaction: rollback to stable skipping stable rle */ -#define WT_STAT_DSRC_TXN_RTS_STABLE_RLE_SKIPPED 2226 +#define WT_STAT_DSRC_TXN_RTS_STABLE_RLE_SKIPPED 2225 /*! transaction: rollback to stable sweeping history store keys */ -#define WT_STAT_DSRC_TXN_RTS_SWEEP_HS_KEYS 2227 +#define WT_STAT_DSRC_TXN_RTS_SWEEP_HS_KEYS 2226 /*! transaction: rollback to stable updates removed from history store */ -#define WT_STAT_DSRC_TXN_RTS_HS_REMOVED 2228 +#define WT_STAT_DSRC_TXN_RTS_HS_REMOVED 2227 /*! transaction: transaction checkpoints due to obsolete pages */ -#define WT_STAT_DSRC_TXN_CHECKPOINT_OBSOLETE_APPLIED 2229 +#define WT_STAT_DSRC_TXN_CHECKPOINT_OBSOLETE_APPLIED 2228 /*! transaction: update conflicts */ -#define WT_STAT_DSRC_TXN_UPDATE_CONFLICT 2230 +#define WT_STAT_DSRC_TXN_UPDATE_CONFLICT 2229 /*! * @} diff --git a/src/third_party/wiredtiger/src/support/stat.c b/src/third_party/wiredtiger/src/support/stat.c index d26fab52cea..54e1480dff5 100644 --- a/src/third_party/wiredtiger/src/support/stat.c +++ b/src/third_party/wiredtiger/src/support/stat.c @@ -229,7 +229,6 @@ static const char *const __stats_dsrc_desc[] = { "session: tiered operations dequeued and processed", "session: tiered operations scheduled", "session: tiered storage local retention time (secs)", - "session: tiered storage object size", "transaction: race to read prepared update retry", "transaction: rollback to stable history store records with stop timestamps older than newer " "records", @@ -501,7 +500,6 @@ __wt_stat_dsrc_clear_single(WT_DSRC_STATS *stats) stats->tiered_work_units_dequeued = 0; stats->tiered_work_units_created = 0; /* not clearing tiered_retention */ - /* not clearing tiered_object_size */ stats->txn_read_race_prepare_update = 0; stats->txn_rts_hs_stop_older_than_newer_start = 0; stats->txn_rts_inconsistent_ckpt = 0; @@ -762,7 +760,6 @@ __wt_stat_dsrc_aggregate_single(WT_DSRC_STATS *from, WT_DSRC_STATS *to) to->tiered_work_units_dequeued += from->tiered_work_units_dequeued; to->tiered_work_units_created += from->tiered_work_units_created; to->tiered_retention += from->tiered_retention; - to->tiered_object_size += from->tiered_object_size; to->txn_read_race_prepare_update += from->txn_read_race_prepare_update; to->txn_rts_hs_stop_older_than_newer_start += from->txn_rts_hs_stop_older_than_newer_start; to->txn_rts_inconsistent_ckpt += from->txn_rts_inconsistent_ckpt; @@ -1030,7 +1027,6 @@ __wt_stat_dsrc_aggregate(WT_DSRC_STATS **from, WT_DSRC_STATS *to) to->tiered_work_units_dequeued += WT_STAT_READ(from, tiered_work_units_dequeued); to->tiered_work_units_created += WT_STAT_READ(from, tiered_work_units_created); to->tiered_retention += WT_STAT_READ(from, tiered_retention); - to->tiered_object_size += WT_STAT_READ(from, tiered_object_size); to->txn_read_race_prepare_update += WT_STAT_READ(from, txn_read_race_prepare_update); to->txn_rts_hs_stop_older_than_newer_start += WT_STAT_READ(from, txn_rts_hs_stop_older_than_newer_start); @@ -1486,7 +1482,6 @@ static const char *const __stats_connection_desc[] = { "session: tiered operations dequeued and processed", "session: tiered operations scheduled", "session: tiered storage local retention time (secs)", - "session: tiered storage object size", "thread-state: active filesystem fsync calls", "thread-state: active filesystem read calls", "thread-state: active filesystem write calls", @@ -2045,7 +2040,6 @@ __wt_stat_connection_clear_single(WT_CONNECTION_STATS *stats) stats->tiered_work_units_dequeued = 0; stats->tiered_work_units_created = 0; /* not clearing tiered_retention */ - /* not clearing tiered_object_size */ /* not clearing thread_fsync_active */ /* not clearing thread_read_active */ /* not clearing thread_write_active */ @@ -2617,7 +2611,6 @@ __wt_stat_connection_aggregate(WT_CONNECTION_STATS **from, WT_CONNECTION_STATS * to->tiered_work_units_dequeued += WT_STAT_READ(from, tiered_work_units_dequeued); to->tiered_work_units_created += WT_STAT_READ(from, tiered_work_units_created); to->tiered_retention += WT_STAT_READ(from, tiered_retention); - to->tiered_object_size += WT_STAT_READ(from, tiered_object_size); to->thread_fsync_active += WT_STAT_READ(from, thread_fsync_active); to->thread_read_active += WT_STAT_READ(from, thread_read_active); to->thread_write_active += WT_STAT_READ(from, thread_write_active); diff --git a/src/third_party/wiredtiger/src/tiered/tiered_config.c b/src/third_party/wiredtiger/src/tiered/tiered_config.c index 817ef8cc226..39963a10269 100644 --- a/src/third_party/wiredtiger/src/tiered/tiered_config.c +++ b/src/third_party/wiredtiger/src/tiered/tiered_config.c @@ -47,9 +47,6 @@ __tiered_common_config(WT_SESSION_IMPL *session, const char **cfg, WT_BUCKET_STO WT_RET(__wt_config_gets(session, cfg, "tiered_storage.local_retention", &cval)); bstorage->retain_secs = (uint64_t)cval.val; - WT_RET(__wt_config_gets(session, cfg, "tiered_storage.object_target_size", &cval)); - bstorage->object_size = (uint64_t)cval.val; - return (0); } @@ -173,7 +170,6 @@ __wt_tiered_conn_config(WT_SESSION_IMPL *session, const char **cfg, bool reconfi session, WT_VERB_TIERED, "TIERED_CONFIG: prefix %s", conn->bstorage->bucket_prefix); WT_ASSERT(session, conn->bstorage != NULL); - WT_STAT_CONN_SET(session, tiered_object_size, conn->bstorage->object_size); WT_STAT_CONN_SET(session, tiered_retention, conn->bstorage->retain_secs); /* diff --git a/src/third_party/wiredtiger/test/evergreen.yml b/src/third_party/wiredtiger/test/evergreen.yml index f7ceb1ae574..d54464daf43 100755 --- a/src/third_party/wiredtiger/test/evergreen.yml +++ b/src/third_party/wiredtiger/test/evergreen.yml @@ -3935,6 +3935,9 @@ buildvariants: - name: ubuntu2004-perf-tests display_name: Ubuntu 20.04 Performance tests + # Perf tests are NOT expected to be triggered on Evergreen projects + # other than "WiredTiger (develop)". + activate: false batchtime: 1440 # 1 day run_on: - ubuntu2004-medium @@ -4064,6 +4067,9 @@ buildvariants: - name: documentation-update display_name: "~ Documentation update" + # Documentation update is NOT expected to be triggered on Evergreen projects + # other than "WiredTiger (develop)" + activate: false batchtime: 10080 # 7 days run_on: - ubuntu2004-test @@ -4132,6 +4138,9 @@ buildvariants: - name: code-statistics display_name: "Code statistics" + # Code coverage and complexity metrics are NOT expected to be triggered on Evergreen projects + # other than "WiredTiger (develop)". + activate: false batchtime: 10080 # 7 days run_on: - ubuntu2004-test @@ -4150,6 +4159,9 @@ buildvariants: - name: compatibility-tests-less-frequent display_name: Compatibility tests (less frequent) + # Compatibility tests are NOT expected to be triggered on Evergreen projects + # other than "WiredTiger (develop)". + activate: false batchtime: 10080 # 7 days run_on: - ubuntu1804-test @@ -4159,6 +4171,9 @@ buildvariants: - name: compatibility-tests-daily display_name: Compatibility tests (daily) + # Compatibility tests are NOT expected to be triggered on Evergreen projects + # other than "WiredTiger (develop)". + activate: false batchtime: 1440 # 1 day run_on: - ubuntu2004-test @@ -4167,6 +4182,9 @@ buildvariants: - name: compatibility-tests display_name: Compatibility tests + # Compatibility tests are NOT expected to be triggered on Evergreen projects + # other than "WiredTiger (develop)". + activate: false run_on: - ubuntu2004-test tasks: diff --git a/src/third_party/wiredtiger/test/suite/test_tiered04.py b/src/third_party/wiredtiger/test/suite/test_tiered04.py index dc6ac853454..58e91fc2e97 100644 --- a/src/third_party/wiredtiger/test/suite/test_tiered04.py +++ b/src/third_party/wiredtiger/test/suite/test_tiered04.py @@ -65,10 +65,6 @@ class test_tiered04(wttest.WiredTigerTestCase): uri1 = "table:test_other_tiered04" uri_none = "table:test_local04" - object_sys = "9M" - object_sys_val = 9 * 1024 * 1024 - object_uri = "15M" - object_uri_val = 15 * 1024 * 1024 retention = 3 retention1 = 600 def conn_config(self): @@ -82,8 +78,7 @@ class test_tiered04(wttest.WiredTigerTestCase): 'bucket=%s,' % self.bucket + \ 'bucket_prefix=%s,' % self.prefix + \ 'local_retention=%d,' % self.retention + \ - 'name=%s,' % self.ss_name + \ - 'object_target_size=%s)' % self.object_sys + 'name=%s)' % self.ss_name return self.saved_conn # Load the storage store extension. @@ -136,8 +131,7 @@ class test_tiered04(wttest.WiredTigerTestCase): 'bucket=%s,' % self.bucket1 + \ 'bucket_prefix=%s,' % self.prefix1 + \ 'local_retention=%d,' % self.retention1 + \ - 'name=%s,' % self.ss_name + \ - 'object_target_size=%s)' % self.object_uri + 'name=%s)' % self.ss_name self.pr("create non-sys tiered") self.session.create(self.uri1, base_create + conf) conf = ',tiered_storage=(name=none)' @@ -216,8 +210,6 @@ class test_tiered04(wttest.WiredTigerTestCase): calls = self.get_stat(stat.conn.flush_tier, None) self.assertEqual(calls, flush) - obj = self.get_stat(stat.conn.tiered_object_size, None) - self.assertEqual(obj, self.object_sys_val) # As we flush each object, the next object exists, but our first flush was a no-op. # So the value for the last file: object should be 'flush'. diff --git a/src/third_party/wiredtiger/test/suite/test_tiered07.py b/src/third_party/wiredtiger/test/suite/test_tiered07.py index 96170327072..ab43c1d1efa 100644 --- a/src/third_party/wiredtiger/test/suite/test_tiered07.py +++ b/src/third_party/wiredtiger/test/suite/test_tiered07.py @@ -79,8 +79,7 @@ class test_tiered07(wttest.WiredTigerTestCase): 'tiered_storage=(auth_token=%s,' % self.auth_token + \ 'bucket=%s,' % self.bucket + \ 'bucket_prefix=%s,' % self.bucket_prefix + \ - 'name=%s,' % self.ss_name + \ - 'object_target_size=20M)' + 'name=%s)' % self.ss_name def check(self, tc, n): for i in range(0, n): diff --git a/src/third_party/wiredtiger/test/suite/test_tiered13.py b/src/third_party/wiredtiger/test/suite/test_tiered13.py index bdd4c7bf265..ea2c5ada2b5 100644 --- a/src/third_party/wiredtiger/test/suite/test_tiered13.py +++ b/src/third_party/wiredtiger/test/suite/test_tiered13.py @@ -80,8 +80,7 @@ class test_tiered13(test_import_base): 'create,tiered_storage=(auth_token=%s,' % self.auth_token + \ 'bucket=%s,' % self.bucket + \ 'bucket_prefix=%s,' % self.bucket_prefix + \ - 'name=%s,' % self.ss_name + \ - 'object_target_size=20M),' + 'name=%s)' % self.ss_name return self.saved_conn def test_tiered13(self): |