diff options
author | Chenhao Qu <chenhao.qu@mongodb.com> | 2022-09-19 20:08:23 +1000 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-09-19 11:05:24 +0000 |
commit | 67286bc765d2aa12227fbe12fa8558d2e161f9c0 (patch) | |
tree | 88dd62f69b21a77f52fdfd168b7dc35fab0534ca /src | |
parent | 42b3face6dc7662f8ffe08c7cc11d8610e4e7a26 (diff) | |
download | mongo-67286bc765d2aa12227fbe12fa8558d2e161f9c0.tar.gz |
Import wiredtiger: 963ee963c0429a97813c6a87fb96da071ccaed72 from branch mongodb-master
ref: 8d341b49c4..963ee963c0
for: 6.2.0-rc0
WT-9734 Enable stats for csuite tests and format (#8269)
Diffstat (limited to 'src')
61 files changed, 193 insertions, 190 deletions
diff --git a/src/third_party/wiredtiger/bench/wt2853_perf/main.c b/src/third_party/wiredtiger/bench/wt2853_perf/main.c index e7ac7efd027..d69cd893702 100644 --- a/src/third_party/wiredtiger/bench/wt2853_perf/main.c +++ b/src/third_party/wiredtiger/bench/wt2853_perf/main.c @@ -107,7 +107,8 @@ main(int argc, char *argv[]) testutil_make_work_dir(opts->home); testutil_progress(opts, "start"); - testutil_check(wiredtiger_open(opts->home, NULL, "create,cache_size=1G", &opts->conn)); + testutil_check( + wiredtiger_open(opts->home, NULL, "create,cache_size=1G,statistics=(all)", &opts->conn)); testutil_progress(opts, "wiredtiger_open"); testutil_check(opts->conn->open_session(opts->conn, NULL, NULL, &session)); diff --git a/src/third_party/wiredtiger/examples/c/ex_access.c b/src/third_party/wiredtiger/examples/c/ex_access.c index 8a066772d9d..b617d607834 100644 --- a/src/third_party/wiredtiger/examples/c/ex_access.c +++ b/src/third_party/wiredtiger/examples/c/ex_access.c @@ -43,7 +43,7 @@ access_example(void) int ret; /* Open a connection to the database, creating it if necessary. */ - error_check(wiredtiger_open(home, NULL, "create", &conn)); + error_check(wiredtiger_open(home, NULL, "create,statistics=(all)", &conn)); /* Open a session handle for the database. */ error_check(conn->open_session(conn, NULL, NULL, &session)); diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index d28d13f0c9b..088b219aaf2 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": "8d341b49c4919089c7ff2d8468f47210c4d31d34" + "commit": "963ee963c0429a97813c6a87fb96da071ccaed72" } diff --git a/src/third_party/wiredtiger/test/bloom/test_bloom.c b/src/third_party/wiredtiger/test/bloom/test_bloom.c index e142d041026..a090fa0eec6 100644 --- a/src/third_party/wiredtiger/test/bloom/test_bloom.c +++ b/src/third_party/wiredtiger/test/bloom/test_bloom.c @@ -133,8 +133,8 @@ setup(void) * "standard" configuration. */ testutil_check(__wt_snprintf(config, sizeof(config), - "create,error_prefix=\"%s\",cache_size=%" PRIu32 "MB,%s", progname, g.c_cache, - g.config_open == NULL ? "" : g.config_open)); + "create,statistics=(all),error_prefix=\"%s\",cache_size=%" PRIu32 "MB,%s", progname, + g.c_cache, g.config_open == NULL ? "" : g.config_open)); testutil_check(wiredtiger_open(home, NULL, config, &conn)); diff --git a/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.c b/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.c index b51d9d7de57..02875212112 100644 --- a/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.c +++ b/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.c @@ -297,7 +297,7 @@ wt_connect(const char *config_open) /* Set up the basic configuration string first. */ testutil_check(__wt_snprintf(config, sizeof(config), - "create,cache_cursors=false,statistics=(fast),statistics_log=(json,wait=1),log=(enabled)," + "create,cache_cursors=false,statistics=(all),statistics_log=(json,wait=1),log=(enabled)," "error_prefix=\"%s\",cache_size=1G, eviction_dirty_trigger=%i, " "eviction_dirty_target=%i,%s%s%s", progname, fast_eviction ? 5 : 20, fast_eviction ? 1 : 5, g.debug_mode ? DEBUG_MODE_CFG : "", diff --git a/src/third_party/wiredtiger/test/csuite/incr_backup/main.c b/src/third_party/wiredtiger/test/csuite/incr_backup/main.c index 3975aafaba2..b00a7a28099 100644 --- a/src/third_party/wiredtiger/test/csuite/incr_backup/main.c +++ b/src/third_party/wiredtiger/test/csuite/incr_backup/main.c @@ -49,7 +49,7 @@ #define KEY_FORMAT "key-%d-%d" #define TABLE_FORMAT "key_format=S,value_format=u" -#define CONN_CONFIG_COMMON "timing_stress_for_test=[backup_rename]" +#define CONN_CONFIG_COMMON "timing_stress_for_test=[backup_rename],statistics=(all)" #define NUM_ALLOC 5 static const char *alloc_sizes[] = {"512B", "8K", "64K", "1M", "16M"}; diff --git a/src/third_party/wiredtiger/test/csuite/random_abort/main.c b/src/third_party/wiredtiger/test/csuite/random_abort/main.c index 07145b05861..8bc3c2b9daa 100644 --- a/src/third_party/wiredtiger/test/csuite/random_abort/main.c +++ b/src/third_party/wiredtiger/test/csuite/random_abort/main.c @@ -62,11 +62,11 @@ static bool inmem; #define MAX_RECORD_FILES 3 #define ENV_CONFIG_COMPAT ",compatibility=(release=\"2.9\")" -#define ENV_CONFIG_DEF "create,log=(file_max=10M,enabled)" +#define ENV_CONFIG_DEF "create,log=(file_max=10M,enabled),statistics=(all)" #define ENV_CONFIG_TXNSYNC \ "create,log=(file_max=10M,enabled)," \ - "transaction_sync=(enabled,method=none)" -#define ENV_CONFIG_REC "log=(recover=on)" + "transaction_sync=(enabled,method=none),statistics=(all)" +#define ENV_CONFIG_REC "log=(recover=on),statistics=(all)" /* * A minimum width of 10, along with zero filling, means that all the keys sort according to their diff --git a/src/third_party/wiredtiger/test/csuite/random_directio/main.c b/src/third_party/wiredtiger/test/csuite/random_directio/main.c index 0bbca8ba145..5ee6c14b169 100644 --- a/src/third_party/wiredtiger/test/csuite/random_directio/main.c +++ b/src/third_party/wiredtiger/test/csuite/random_directio/main.c @@ -99,15 +99,15 @@ static const char *const uri_rev = "table:rev"; #define KEY_SEP "_" /* Must be one char string */ -#define ENV_CONFIG \ - "create,log=(file_max=10M,enabled)," \ +#define ENV_CONFIG \ + "create,log=(file_max=10M,enabled),statistics=(all)," \ "transaction_sync=(enabled,method=%s)" #define ENV_CONFIG_TIER \ ",tiered_storage=(bucket=./bucket,bucket_prefix=pfx-,local_retention=2,name=dir_store)" #define ENV_CONFIG_TIER_EXT \ ",extensions=(%s../../../ext/storage_sources/dir_store/" \ "libwiredtiger_dir_store.so=(early_load=true))" -#define ENV_CONFIG_REC "log=(recover=on)" +#define ENV_CONFIG_REC "log=(recover=on),statistics=(all)" /* 64 spaces */ #define SPACES " " diff --git a/src/third_party/wiredtiger/test/csuite/rwlock/main.c b/src/third_party/wiredtiger/test/csuite/rwlock/main.c index dd7ff6f5b6a..2c606e2697f 100644 --- a/src/third_party/wiredtiger/test/csuite/rwlock/main.c +++ b/src/third_party/wiredtiger/test/csuite/rwlock/main.c @@ -67,7 +67,7 @@ main(int argc, char *argv[]) testutil_make_work_dir(opts->home); testutil_check( - wiredtiger_open(opts->home, NULL, "create,session_max=1000,statistics=(fast)", &opts->conn)); + wiredtiger_open(opts->home, NULL, "create,session_max=1000,statistics=(all)", &opts->conn)); testutil_check(__wt_rwlock_init(NULL, &rwlock)); testutil_check(pthread_rwlock_init(&p_rwlock, NULL)); diff --git a/src/third_party/wiredtiger/test/csuite/schema_abort/main.c b/src/third_party/wiredtiger/test/csuite/schema_abort/main.c index 3cdb386ea0e..2f92a0a3585 100644 --- a/src/third_party/wiredtiger/test/csuite/schema_abort/main.c +++ b/src/third_party/wiredtiger/test/csuite/schema_abort/main.c @@ -90,7 +90,7 @@ static volatile THREAD_TS th_ts[MAX_TH]; #define ENV_CONFIG_DEF \ "create," \ "eviction_updates_trigger=95,eviction_updates_target=80," \ - "log=(enabled,file_max=10M,remove=false)" + "log=(enabled,file_max=10M,remove=false),statistics=(all)" #define ENV_CONFIG_TIER \ ",tiered_storage=(bucket=./" \ "bucket,bucket_prefix=pfx-,local_retention=2,name=dir_store)" @@ -100,7 +100,7 @@ static volatile THREAD_TS th_ts[MAX_TH]; #define ENV_CONFIG_TXNSYNC \ ENV_CONFIG_DEF \ ",transaction_sync=(enabled,method=none)" -#define ENV_CONFIG_REC "log=(recover=on,remove=false)" +#define ENV_CONFIG_REC "log=(recover=on,remove=false),statistics=(all)" /* * A minimum width of 10, along with zero filling, means that all the keys sort according to their diff --git a/src/third_party/wiredtiger/test/csuite/scope/main.c b/src/third_party/wiredtiger/test/csuite/scope/main.c index 907fe8c3ad8..66e88a15c9c 100644 --- a/src/third_party/wiredtiger/test/csuite/scope/main.c +++ b/src/third_party/wiredtiger/test/csuite/scope/main.c @@ -374,7 +374,8 @@ main(int argc, char *argv[]) testutil_check(testutil_parse_opts(argc, argv, opts)); testutil_make_work_dir(opts->home); - testutil_check(wiredtiger_open(opts->home, &event_handler, "create", &opts->conn)); + testutil_check( + wiredtiger_open(opts->home, &event_handler, "create,statistics=(all)", &opts->conn)); run(opts->conn, "file:file.SS", "key_format=S,value_format=S"); run(opts->conn, "file:file.Su", "key_format=S,value_format=u"); diff --git a/src/third_party/wiredtiger/test/csuite/tiered_abort/main.c b/src/third_party/wiredtiger/test/csuite/tiered_abort/main.c index 3f8e4ffb14b..478d01ad99d 100644 --- a/src/third_party/wiredtiger/test/csuite/tiered_abort/main.c +++ b/src/third_party/wiredtiger/test/csuite/tiered_abort/main.c @@ -101,7 +101,7 @@ static uint32_t flush_calls = 1; "debug_mode=(table_logging=true,checkpoint_retention=5)," \ "eviction_updates_target=20,eviction_updates_trigger=90," \ "log=(enabled,file_max=10M,remove=true),session_max=%d," \ - "statistics=(fast),statistics_log=(wait=1,json=true)," \ + "statistics=(all),statistics_log=(wait=1,json=true)," \ "tiered_storage=(bucket=%s,bucket_prefix=%s," \ "local_retention=%d,interval=%d,name=dir_store)" #define ENV_CONFIG_TXNSYNC \ @@ -109,7 +109,8 @@ static uint32_t flush_calls = 1; ",eviction_dirty_target=20,eviction_dirty_trigger=90" \ ",transaction_sync=(enabled,method=none)" /* Set the flush_checkpoint debug mode so that the parent can call flush_tier alone. */ -#define ENV_CONFIG_REC "log=(recover=on,remove=false),debug_mode=(flush_checkpoint)" +#define ENV_CONFIG_REC \ + "log=(recover=on,remove=false),debug_mode=(flush_checkpoint),statistics=(all)" /* * A minimum width of 10, along with zero filling, means that all the keys sort according to their diff --git a/src/third_party/wiredtiger/test/csuite/timestamp_abort/main.c b/src/third_party/wiredtiger/test/csuite/timestamp_abort/main.c index 0782168ec5f..96494830d1b 100644 --- a/src/third_party/wiredtiger/test/csuite/timestamp_abort/main.c +++ b/src/third_party/wiredtiger/test/csuite/timestamp_abort/main.c @@ -100,11 +100,11 @@ static uint64_t global_ts = 1; "debug_mode=(table_logging=true,checkpoint_retention=5)," \ "eviction_updates_target=20,eviction_updates_trigger=90," \ "log=(enabled,file_max=10M,remove=true),session_max=%d," \ - "statistics=(fast),statistics_log=(wait=%d,json=true)" + "statistics=(all),statistics_log=(wait=%d,json=true)" #define ENV_CONFIG_TXNSYNC \ ENV_CONFIG_DEF \ ",transaction_sync=(enabled,method=none)" -#define ENV_CONFIG_REC "log=(recover=on,remove=false)" +#define ENV_CONFIG_REC "log=(recover=on,remove=false),statistics=(all)" /* * A minimum width of 10, along with zero filling, means that all the keys sort according to their diff --git a/src/third_party/wiredtiger/test/csuite/truncated_log/main.c b/src/third_party/wiredtiger/test/csuite/truncated_log/main.c index 96faabec9f4..85241ff8a46 100644 --- a/src/third_party/wiredtiger/test/csuite/truncated_log/main.c +++ b/src/third_party/wiredtiger/test/csuite/truncated_log/main.c @@ -38,8 +38,8 @@ static bool use_columns = false; #define ENV_CONFIG \ "create,log=(enabled,file_max=100K,remove=false)," \ - "transaction_sync=(enabled,method=none)" -#define ENV_CONFIG_REC "log=(recover=on)" + "transaction_sync=(enabled,method=none),statistics=(all)" +#define ENV_CONFIG_REC "log=(recover=on),statistics=(all)" #define LOG_FILE_1 "WiredTigerLog.0000000001" diff --git a/src/third_party/wiredtiger/test/csuite/wt1965_col_efficiency/main.c b/src/third_party/wiredtiger/test/csuite/wt1965_col_efficiency/main.c index 37b96f036b6..c3d289374d1 100644 --- a/src/third_party/wiredtiger/test/csuite/wt1965_col_efficiency/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt1965_col_efficiency/main.c @@ -121,7 +121,7 @@ main(int argc, char *argv[]) testutil_check(wiredtiger_open(opts->home, NULL, "create,cache_size=1G,checkpoint=(wait=30),eviction_trigger=80,eviction_target=64,eviction_" "dirty_target=65,eviction_dirty_trigger=80,log=(enabled,file_max=10M),transaction_sync=(" - "enabled=true,method=none)", + "enabled=true,method=none),statistics=(all)", &opts->conn)); testutil_check(opts->conn->open_session(opts->conn, NULL, NULL, &session)); diff --git a/src/third_party/wiredtiger/test/csuite/wt2246_col_append/main.c b/src/third_party/wiredtiger/test/csuite/wt2246_col_append/main.c index f1a115caf93..768e7c375aa 100644 --- a/src/third_party/wiredtiger/test/csuite/wt2246_col_append/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt2246_col_append/main.c @@ -115,7 +115,7 @@ main(int argc, char *argv[]) testutil_make_work_dir(opts->home); testutil_check(__wt_snprintf(buf, sizeof(buf), - "create,cache_size=%s,eviction=(threads_max=5),statistics=(fast)", + "create,cache_size=%s,eviction=(threads_max=5),statistics=(all)", opts->table_type == TABLE_FIX ? "500MB" : "2GB")); testutil_check(wiredtiger_open(opts->home, NULL, buf, &opts->conn)); testutil_check(opts->conn->open_session(opts->conn, NULL, NULL, &session)); @@ -129,7 +129,7 @@ main(int argc, char *argv[]) /* Force to disk and re-open. */ testutil_check(opts->conn->close(opts->conn, NULL)); - testutil_check(wiredtiger_open(opts->home, NULL, NULL, &opts->conn)); + testutil_check(wiredtiger_open(opts->home, NULL, "statistics=(all)", &opts->conn)); (void)signal(SIGINT, onsig); diff --git a/src/third_party/wiredtiger/test/csuite/wt2323_join_visibility/main.c b/src/third_party/wiredtiger/test/csuite/wt2323_join_visibility/main.c index f7efa51bd9a..ce8e2a0842e 100644 --- a/src/third_party/wiredtiger/test/csuite/wt2323_join_visibility/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt2323_join_visibility/main.c @@ -116,7 +116,8 @@ main(int argc, char *argv[]) testutil_check( __wt_snprintf(sharedopts->joinuri, sizeof(sharedopts->joinuri), "join:%s", opts->uri)); - testutil_check(wiredtiger_open(opts->home, NULL, "create,cache_size=1G", &opts->conn)); + testutil_check( + wiredtiger_open(opts->home, NULL, "create,cache_size=1G,statistics=(all)", &opts->conn)); test_join(opts, sharedopts, true, true); test_join(opts, sharedopts, true, false); diff --git a/src/third_party/wiredtiger/test/csuite/wt2403_lsm_workload/main.c b/src/third_party/wiredtiger/test/csuite/wt2403_lsm_workload/main.c index 90c29685776..6d817dbfa5e 100644 --- a/src/third_party/wiredtiger/test/csuite/wt2403_lsm_workload/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt2403_lsm_workload/main.c @@ -120,7 +120,8 @@ main(int argc, char *argv[]) memset(opts, 0, sizeof(*opts)); testutil_check(testutil_parse_opts(argc, argv, opts)); testutil_make_work_dir(opts->home); - testutil_check(wiredtiger_open(opts->home, NULL, "create,cache_size=200M", &opts->conn)); + testutil_check( + wiredtiger_open(opts->home, NULL, "create,cache_size=200M,statistics=(all)", &opts->conn)); testutil_check(opts->conn->open_session(opts->conn, NULL, NULL, &session)); testutil_check(opts->conn->open_session(opts->conn, NULL, NULL, &session2)); diff --git a/src/third_party/wiredtiger/test/csuite/wt2535_insert_race/main.c b/src/third_party/wiredtiger/test/csuite/wt2535_insert_race/main.c index 586a1c52ff1..43186d5ce4d 100644 --- a/src/third_party/wiredtiger/test/csuite/wt2535_insert_race/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt2535_insert_race/main.c @@ -105,7 +105,7 @@ main(int argc, char *argv[]) testutil_make_work_dir(opts->home); testutil_check(wiredtiger_open(opts->home, NULL, - "create,cache_size=2G,eviction=(threads_max=5),statistics=(fast)", &opts->conn)); + "create,cache_size=2G,eviction=(threads_max=5),statistics=(all)", &opts->conn)); testutil_check(opts->conn->open_session(opts->conn, NULL, NULL, &session)); testutil_check(__wt_snprintf(tableconf, sizeof(tableconf), "key_format=%s,value_format=%s,leaf_page_max=32k,", opts->table_type == TABLE_ROW ? "Q" : "r", diff --git a/src/third_party/wiredtiger/test/csuite/wt2592_join_schema/main.c b/src/third_party/wiredtiger/test/csuite/wt2592_join_schema/main.c index 2592ce00e77..4d6049a1f34 100644 --- a/src/third_party/wiredtiger/test/csuite/wt2592_join_schema/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt2592_join_schema/main.c @@ -76,7 +76,8 @@ main(int argc, char *argv[]) testutil_check(__wt_snprintf(yearuri, sizeof(yearuri), "index:%s:year", tablename)); testutil_check(__wt_snprintf(joinuri, sizeof(joinuri), "join:%s", opts->uri)); - testutil_check(wiredtiger_open(opts->home, NULL, "create,cache_size=200M", &opts->conn)); + testutil_check( + wiredtiger_open(opts->home, NULL, "create,cache_size=200M,statistics=(all)", &opts->conn)); testutil_check(opts->conn->open_session(opts->conn, NULL, NULL, &session)); testutil_check(session->create( session, opts->uri, "key_format=r,value_format=5sHQ,columns=(id,country,year,population)")); diff --git a/src/third_party/wiredtiger/test/csuite/wt2695_checksum/main.c b/src/third_party/wiredtiger/test/csuite/wt2695_checksum/main.c index 1095077aab9..9aa3d6d38fa 100644 --- a/src/third_party/wiredtiger/test/csuite/wt2695_checksum/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt2695_checksum/main.c @@ -62,7 +62,7 @@ main(int argc, char *argv[]) memset(opts, 0, sizeof(*opts)); testutil_check(testutil_parse_opts(argc, argv, opts)); testutil_make_work_dir(opts->home); - testutil_check(wiredtiger_open(opts->home, NULL, "create", &opts->conn)); + testutil_check(wiredtiger_open(opts->home, NULL, "create,statistics=(all)", &opts->conn)); /* Initialize the RNG. */ __wt_random_init_seed(NULL, &rnd); diff --git a/src/third_party/wiredtiger/test/csuite/wt2719_reconfig/main.c b/src/third_party/wiredtiger/test/csuite/wt2719_reconfig/main.c index 4ae7b410122..195f61b05e9 100644 --- a/src/third_party/wiredtiger/test/csuite/wt2719_reconfig/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt2719_reconfig/main.c @@ -177,7 +177,8 @@ main(int argc, char *argv[]) testutil_check(testutil_parse_opts(argc, argv, opts)); testutil_make_work_dir(opts->home); - testutil_check(wiredtiger_open(opts->home, &event_handler, "create", &opts->conn)); + testutil_check( + wiredtiger_open(opts->home, &event_handler, "create,statistics=(all)", &opts->conn)); /* Open an LSM file so the LSM reconfiguration options make sense. */ testutil_check(opts->conn->open_session(opts->conn, NULL, NULL, &session)); diff --git a/src/third_party/wiredtiger/test/csuite/wt2834_join_bloom_fix/main.c b/src/third_party/wiredtiger/test/csuite/wt2834_join_bloom_fix/main.c index fe64ff34c8c..50e4b9e1e56 100644 --- a/src/third_party/wiredtiger/test/csuite/wt2834_join_bloom_fix/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt2834_join_bloom_fix/main.c @@ -69,7 +69,8 @@ main(int argc, char *argv[]) testutil_make_work_dir(opts->home); testutil_progress(opts, "start"); - testutil_check(wiredtiger_open(opts->home, NULL, "create,cache_size=250M", &opts->conn)); + testutil_check( + wiredtiger_open(opts->home, NULL, "create,cache_size=250M,statistics=(all)", &opts->conn)); testutil_progress(opts, "wiredtiger_open"); testutil_check(opts->conn->open_session(opts->conn, NULL, NULL, &session)); testutil_progress(opts, "sessions opened"); diff --git a/src/third_party/wiredtiger/test/csuite/wt2909_checkpoint_integrity/main.c b/src/third_party/wiredtiger/test/csuite/wt2909_checkpoint_integrity/main.c index 49faf572d8e..afbb3ca5986 100644 --- a/src/third_party/wiredtiger/test/csuite/wt2909_checkpoint_integrity/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt2909_checkpoint_integrity/main.c @@ -111,7 +111,8 @@ check_results(TEST_OPTS *opts, uint64_t *foundp) testutil_check(create_big_string(&bigref)); nrecords = opts->nrecords; - testutil_check(wiredtiger_open(opts->home, NULL, "create,log=(enabled)", &opts->conn)); + testutil_check( + wiredtiger_open(opts->home, NULL, "create,log=(enabled),statistics=(all)", &opts->conn)); testutil_check(opts->conn->open_session(opts->conn, NULL, NULL, &session)); testutil_check(session->open_cursor(session, "table:subtest", NULL, NULL, &maincur)); @@ -521,7 +522,7 @@ subtest_main(int argc, char *argv[], bool close_test) testutil_build_dir(opts, buf, 1024); testutil_check(__wt_snprintf(config, sizeof(config), "create,cache_size=250M,log=(enabled),transaction_sync=(enabled,method=none),extensions=(%s/" - "%s=(early_load,config={environment=true,verbose=true}))", + "%s=(early_load,config={environment=true,verbose=true})),statistics=(all)", buf, WT_FAIL_FS_LIB)); testutil_check(wiredtiger_open(opts->home, &event_handler, config, &opts->conn)); diff --git a/src/third_party/wiredtiger/test/csuite/wt2999_join_extractor/main.c b/src/third_party/wiredtiger/test/csuite/wt2999_join_extractor/main.c index 4d247273202..ab10d11111f 100644 --- a/src/third_party/wiredtiger/test/csuite/wt2999_join_extractor/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt2999_join_extractor/main.c @@ -107,7 +107,7 @@ main(int argc, char *argv[]) testutil_check(testutil_parse_opts(argc, argv, opts)); testutil_make_work_dir(opts->home); - testutil_check(wiredtiger_open(opts->home, NULL, "create", &conn)); + testutil_check(wiredtiger_open(opts->home, NULL, "create,statistics=(all)", &conn)); opts->conn = conn; testutil_check(conn->open_session(conn, NULL, NULL, &session)); diff --git a/src/third_party/wiredtiger/test/csuite/wt3120_filesys/main.c b/src/third_party/wiredtiger/test/csuite/wt3120_filesys/main.c index 13a7c858ada..b7bf3ea992f 100644 --- a/src/third_party/wiredtiger/test/csuite/wt3120_filesys/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt3120_filesys/main.c @@ -54,8 +54,8 @@ main(int argc, char *argv[]) #define WT_FAIL_FS_LIB "ext/test/fail_fs/.libs/libwiredtiger_fail_fs.so" #endif testutil_build_dir(opts, buf, 1024); - testutil_check(__wt_snprintf( - config, sizeof(config), "create,extensions=(%s/%s=(early_load=true))", buf, WT_FAIL_FS_LIB)); + testutil_check(__wt_snprintf(config, sizeof(config), + "create,extensions=(%s/%s=(early_load=true)),statistics=(all)", buf, WT_FAIL_FS_LIB)); testutil_check(wiredtiger_open(opts->home, NULL, config, &opts->conn)); testutil_check(opts->conn->open_session(opts->conn, NULL, NULL, &session)); testutil_check(session->create(session, opts->uri, "key_format=S,value_format=S")); @@ -72,7 +72,7 @@ main(int argc, char *argv[]) /* Force to disk and re-open. */ testutil_check(opts->conn->close(opts->conn, NULL)); - testutil_check(wiredtiger_open(opts->home, NULL, NULL, &opts->conn)); + testutil_check(wiredtiger_open(opts->home, NULL, "statistics=(all)", &opts->conn)); testutil_check(opts->conn->open_session(opts->conn, NULL, NULL, &session)); testutil_check(session->open_cursor(session, opts->uri, NULL, NULL, &cursor)); diff --git a/src/third_party/wiredtiger/test/csuite/wt3135_search_near_collator/main.c b/src/third_party/wiredtiger/test/csuite/wt3135_search_near_collator/main.c index 4d65a3875ff..7de9c44e43f 100644 --- a/src/third_party/wiredtiger/test/csuite/wt3135_search_near_collator/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt3135_search_near_collator/main.c @@ -347,7 +347,7 @@ main(int argc, char *argv[]) testutil_check(testutil_parse_opts(argc, argv, opts)); testutil_make_work_dir(opts->home); - testutil_check(wiredtiger_open(opts->home, NULL, "create", &opts->conn)); + testutil_check(wiredtiger_open(opts->home, NULL, "create,statistics=(all)", &opts->conn)); testutil_check(opts->conn->open_session(opts->conn, NULL, NULL, &session)); /* Add any collators and extractors used by tests */ diff --git a/src/third_party/wiredtiger/test/csuite/wt3184_dup_index_collator/main.c b/src/third_party/wiredtiger/test/csuite/wt3184_dup_index_collator/main.c index 5c438fd0430..248793ce564 100644 --- a/src/third_party/wiredtiger/test/csuite/wt3184_dup_index_collator/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt3184_dup_index_collator/main.c @@ -146,7 +146,7 @@ main(int argc, char *argv[]) testutil_check(testutil_parse_opts(argc, argv, opts)); testutil_make_work_dir(opts->home); - testutil_check(wiredtiger_open(opts->home, NULL, "create", &opts->conn)); + testutil_check(wiredtiger_open(opts->home, NULL, "create,statistics=(all)", &opts->conn)); testutil_check(opts->conn->open_session(opts->conn, NULL, NULL, &session)); testutil_check(opts->conn->add_collator(opts->conn, "index_coll", &index_coll, NULL)); diff --git a/src/third_party/wiredtiger/test/csuite/wt3338_partial_update/main.c b/src/third_party/wiredtiger/test/csuite/wt3338_partial_update/main.c index dfb01ce20ea..cfd2010c6c9 100644 --- a/src/third_party/wiredtiger/test/csuite/wt3338_partial_update/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt3338_partial_update/main.c @@ -251,7 +251,7 @@ main(int argc, char *argv[]) memset(opts, 0, sizeof(*opts)); testutil_check(testutil_parse_opts(argc, argv, opts)); testutil_make_work_dir(opts->home); - testutil_check(wiredtiger_open(opts->home, NULL, "create", &opts->conn)); + testutil_check(wiredtiger_open(opts->home, NULL, "create,statistics=(all)", &opts->conn)); testutil_check(opts->conn->open_session(opts->conn, NULL, NULL, &opts->session)); /* Run the test. */ diff --git a/src/third_party/wiredtiger/test/csuite/wt3363_checkpoint_op_races/main.c b/src/third_party/wiredtiger/test/csuite/wt3363_checkpoint_op_races/main.c index ef9ab2358b0..9e6205935d8 100644 --- a/src/third_party/wiredtiger/test/csuite/wt3363_checkpoint_op_races/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt3363_checkpoint_op_races/main.c @@ -94,7 +94,8 @@ main(int argc, char *argv[]) testutil_make_work_dir(opts->home); testutil_check(wiredtiger_open(opts->home, &event_handler, - "create,cache_size=1G,timing_stress_for_test=[checkpoint_slow]", &opts->conn)); + "create,cache_size=1G,timing_stress_for_test=[checkpoint_slow],statistics=(all)", + &opts->conn)); testutil_check(pthread_create(&ckpt_thread, NULL, do_checkpoints, opts)); diff --git a/src/third_party/wiredtiger/test/csuite/wt3874_pad_byte_collator/main.c b/src/third_party/wiredtiger/test/csuite/wt3874_pad_byte_collator/main.c index 6b817873e53..a5a35358a45 100644 --- a/src/third_party/wiredtiger/test/csuite/wt3874_pad_byte_collator/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt3874_pad_byte_collator/main.c @@ -77,7 +77,8 @@ main(int argc, char *argv[]) testutil_check(testutil_parse_opts(argc, argv, opts)); testutil_make_work_dir(opts->home); - testutil_check(wiredtiger_open(opts->home, NULL, "create,log=(enabled)", &opts->conn)); + testutil_check( + wiredtiger_open(opts->home, NULL, "create,log=(enabled),statistics=(all)", &opts->conn)); conn = opts->conn; testutil_check(conn->add_collator(conn, "my_coll", &my_coll, NULL)); testutil_check(conn->open_session(opts->conn, NULL, NULL, &session)); diff --git a/src/third_party/wiredtiger/test/csuite/wt4105_large_doc_small_upd/main.c b/src/third_party/wiredtiger/test/csuite/wt4105_large_doc_small_upd/main.c index d1f1615df14..5c236c65e5d 100644 --- a/src/third_party/wiredtiger/test/csuite/wt4105_large_doc_small_upd/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt4105_large_doc_small_upd/main.c @@ -98,7 +98,7 @@ main(int argc, char *argv[]) testutil_make_work_dir(opts->home); testutil_check(wiredtiger_open(opts->home, &event_handler, - "create,cache_size=1G,statistics_log=(json,wait=1)", &opts->conn)); + "create,cache_size=1G,statistics_log=(json,wait=1),statistics=(all)", &opts->conn)); testutil_check(opts->conn->open_session(opts->conn, NULL, NULL, &session)); testutil_check(__wt_snprintf(tableconf, sizeof(tableconf), diff --git a/src/third_party/wiredtiger/test/csuite/wt4156_metadata_salvage/main.c b/src/third_party/wiredtiger/test/csuite/wt4156_metadata_salvage/main.c index 71e5660aaf4..72362888423 100644 --- a/src/third_party/wiredtiger/test/csuite/wt4156_metadata_salvage/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt4156_metadata_salvage/main.c @@ -362,7 +362,8 @@ open_with_corruption(const char *sfx) testutil_check(__wt_snprintf(buf, sizeof(buf), "%s", home)); /* Don't abort in the diagnostic builds on detecting corruption. */ - ret = wiredtiger_open(buf, &event_handler, "debug_mode=(corruption_abort=false)", &conn); + ret = wiredtiger_open( + buf, &event_handler, "debug_mode=(corruption_abort=false),statistics=(all)", &conn); /* * Not all out of sync combinations lead to corruption. We keep the previous checkpoint in the @@ -396,7 +397,7 @@ open_with_salvage(const char *sfx, TABLE_INFO *table_data) testutil_check(__wt_snprintf(buf, sizeof(buf), "%s.%s", home, sfx)); else testutil_check(__wt_snprintf(buf, sizeof(buf), "%s", home)); - testutil_check(wiredtiger_open(buf, &event_handler, "salvage=true", &conn)); + testutil_check(wiredtiger_open(buf, &event_handler, "salvage=true,statistics=(all)", &conn)); testutil_assert(conn != NULL); if (sfx != NULL) testutil_check(__wt_snprintf(buf, sizeof(buf), "%s.%s/%s", home, sfx, WT_METAFILE_SLVG)); @@ -427,7 +428,7 @@ open_normal(const char *sfx, TABLE_INFO *table_data) testutil_check(__wt_snprintf(buf, sizeof(buf), "%s.%s", home, sfx)); else testutil_check(__wt_snprintf(buf, sizeof(buf), "%s", home)); - testutil_check(wiredtiger_open(buf, &event_handler, NULL, &conn)); + testutil_check(wiredtiger_open(buf, &event_handler, "statistics=(all)", &conn)); verify_metadata(conn, &table_data[0]); testutil_check(conn->close(conn, NULL)); } @@ -484,7 +485,7 @@ main(int argc, char *argv[]) home = opts->home; testutil_make_work_dir(home); - testutil_check(wiredtiger_open(home, &event_handler, "create", &opts->conn)); + testutil_check(wiredtiger_open(home, &event_handler, "create,statistics=(all)", &opts->conn)); testutil_check(opts->conn->open_session(opts->conn, NULL, NULL, &wt_session)); /* diff --git a/src/third_party/wiredtiger/test/csuite/wt4699_json/main.c b/src/third_party/wiredtiger/test/csuite/wt4699_json/main.c index 17786430b94..17f927d23f7 100644 --- a/src/third_party/wiredtiger/test/csuite/wt4699_json/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt4699_json/main.c @@ -51,7 +51,7 @@ main(int argc, char *argv[]) testutil_check(testutil_parse_opts(argc, argv, opts)); testutil_make_work_dir(opts->home); - testutil_check(wiredtiger_open(opts->home, NULL, "create", &opts->conn)); + testutil_check(wiredtiger_open(opts->home, NULL, "create,statistics=(all)", &opts->conn)); testutil_check(opts->conn->open_session(opts->conn, NULL, NULL, &session)); /* Create a single record in a table with two fields in its value. */ diff --git a/src/third_party/wiredtiger/test/csuite/wt4803_history_store_abort/main.c b/src/third_party/wiredtiger/test/csuite/wt4803_history_store_abort/main.c index 3587d24fbdc..6efbd3b51d4 100644 --- a/src/third_party/wiredtiger/test/csuite/wt4803_history_store_abort/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt4803_history_store_abort/main.c @@ -97,7 +97,7 @@ hs_workload(TEST_OPTS *opts, const char *hs_file_max) testutil_make_work_dir(opts->home); testutil_check(__wt_snprintf(open_config, sizeof(open_config), - "create,cache_size=50MB,history_store=(file_max=%s)", hs_file_max)); + "create,cache_size=50MB,history_store=(file_max=%s),statistics=(all)", hs_file_max)); testutil_check(wiredtiger_open(opts->home, &event_handler, open_config, &opts->conn)); testutil_check(opts->conn->open_session(opts->conn, NULL, NULL, &session)); diff --git a/src/third_party/wiredtiger/test/csuite/wt4891_meta_ckptlist_get_alloc/main.c b/src/third_party/wiredtiger/test/csuite/wt4891_meta_ckptlist_get_alloc/main.c index 42322a8d1e0..2542892a163 100644 --- a/src/third_party/wiredtiger/test/csuite/wt4891_meta_ckptlist_get_alloc/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt4891_meta_ckptlist_get_alloc/main.c @@ -52,7 +52,7 @@ main(int argc, char *argv[]) testutil_make_work_dir(opts->home); - testutil_check(wiredtiger_open(opts->home, NULL, "create", &opts->conn)); + testutil_check(wiredtiger_open(opts->home, NULL, "create,statistics=(all)", &opts->conn)); testutil_check(opts->conn->open_session(opts->conn, NULL, NULL, &session)); diff --git a/src/third_party/wiredtiger/test/csuite/wt6185_modify_ts/main.c b/src/third_party/wiredtiger/test/csuite/wt6185_modify_ts/main.c index 50ad99ba5e1..4c2d68955f2 100644 --- a/src/third_party/wiredtiger/test/csuite/wt6185_modify_ts/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt6185_modify_ts/main.c @@ -367,7 +367,7 @@ main(int argc, char *argv[]) table_config, sizeof(table_config), "key_format=%s,value_format=S", use_columns ? "r" : "S")); /* Load 100 records. */ - testutil_check(wiredtiger_open(path, NULL, "create", &conn)); + testutil_check(wiredtiger_open(path, NULL, "create,statistics=(all)", &conn)); testutil_check(conn->open_session(conn, NULL, NULL, &session)); testutil_check(session->create(session, "file:xxx", table_config)); testutil_check(session->open_cursor(session, "file:xxx", NULL, NULL, &c)); @@ -381,7 +381,7 @@ main(int argc, char *argv[]) /* Flush, reopen and verify a record. */ testutil_check(conn->close(conn, NULL)); - testutil_check(wiredtiger_open(path, NULL, NULL, &conn)); + testutil_check(wiredtiger_open(path, NULL, "statistics=(all)", &conn)); testutil_check(conn->open_session(conn, NULL, NULL, &session)); testutil_check(session->create(session, "file:xxx", NULL)); testutil_check(session->open_cursor(session, "file:xxx", NULL, NULL, &c)); diff --git a/src/third_party/wiredtiger/test/csuite/wt6616_checkpoint_oldest_ts/main.c b/src/third_party/wiredtiger/test/csuite/wt6616_checkpoint_oldest_ts/main.c index d38ed37417c..eb69d852498 100644 --- a/src/third_party/wiredtiger/test/csuite/wt6616_checkpoint_oldest_ts/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt6616_checkpoint_oldest_ts/main.c @@ -65,10 +65,10 @@ static const char *const ckpt_file = "checkpoint_done"; "create," \ "eviction_updates_target=20,eviction_updates_trigger=90," \ "log=(enabled,file_max=10M,remove=true)," \ - "statistics=(fast),statistics_log=(wait=1,json=true)," \ + "statistics=(all),statistics_log=(wait=1,json=true)," \ "timing_stress_for_test=[checkpoint_slow]" -#define ENV_CONFIG_REC "log=(recover=on,remove=false)" +#define ENV_CONFIG_REC "log=(recover=on,remove=false),statistics=(all)" static void handler(int) WT_GCC_FUNC_DECL_ATTRIBUTE((noreturn)); static void usage(void) WT_GCC_FUNC_DECL_ATTRIBUTE((noreturn)); diff --git a/src/third_party/wiredtiger/test/csuite/wt8246_compact_rts_data_correctness/main.c b/src/third_party/wiredtiger/test/csuite/wt8246_compact_rts_data_correctness/main.c index f23e3777293..13c4833a8c2 100644 --- a/src/third_party/wiredtiger/test/csuite/wt8246_compact_rts_data_correctness/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt8246_compact_rts_data_correctness/main.c @@ -33,7 +33,7 @@ #define NUM_RECORDS 800000 -#define ENV_CONFIG_REC "log=(recover=on,remove=false)" +#define ENV_CONFIG_REC "log=(recover=on,remove=false),statistics=(all)" /* Constants and variables declaration. */ /* * You may want to add "verbose=[compact,compact_progress]" to the connection config string to get diff --git a/src/third_party/wiredtiger/test/csuite/wt8659_reconstruct_database_from_logs/main.c b/src/third_party/wiredtiger/test/csuite/wt8659_reconstruct_database_from_logs/main.c index 4cd5cb20ca0..d49a0128391 100644 --- a/src/third_party/wiredtiger/test/csuite/wt8659_reconstruct_database_from_logs/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt8659_reconstruct_database_from_logs/main.c @@ -30,7 +30,7 @@ #define MAX_KEYS 100000 static const char *const conn_config = - "create,cache_size=100MB,log=(archive=false,enabled=true,file_max=100K)"; + "create,cache_size=100MB,log=(archive=false,enabled=true,file_max=100K),statistics=(all)"; static const char *const table_config = "key_format=S,value_format=S"; static const char *const full_out = "backup_full"; diff --git a/src/third_party/wiredtiger/test/csuite/wt8963_insert_stress/main.c b/src/third_party/wiredtiger/test/csuite/wt8963_insert_stress/main.c index cc049687efa..846702d12a9 100644 --- a/src/third_party/wiredtiger/test/csuite/wt8963_insert_stress/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt8963_insert_stress/main.c @@ -40,7 +40,7 @@ #define KEY_MAX UINT32_MAX #define TABLE_CONFIG_FMT "key_format=%s,value_format=%s,memory_page_image_max=50MB" -static const char *const conn_config = "create,cache_size=4G"; +static const char *const conn_config = "create,cache_size=4G,statistics=(all)"; static uint64_t ready_counter; diff --git a/src/third_party/wiredtiger/test/fops/t.c b/src/third_party/wiredtiger/test/fops/t.c index fa011b2c069..aa96682cd74 100644 --- a/src/third_party/wiredtiger/test/fops/t.c +++ b/src/third_party/wiredtiger/test/fops/t.c @@ -155,8 +155,9 @@ wt_startup(char *config_open) testutil_make_work_dir(home); testutil_check(__wt_snprintf(config_buf, sizeof(config_buf), - "create,error_prefix=\"%s\",cache_size=5MB%s%s,operation_tracking=(enabled=false)", progname, - config_open == NULL ? "" : ",", config_open == NULL ? "" : config_open)); + "create,error_prefix=\"%s\",cache_size=5MB%s%s,operation_tracking=(enabled=false),statistics=" + "(all)", + progname, config_open == NULL ? "" : ",", config_open == NULL ? "" : config_open)); testutil_check(wiredtiger_open(home, &event_handler, config_buf, &conn)); } diff --git a/src/third_party/wiredtiger/test/format/config.sh b/src/third_party/wiredtiger/test/format/config.sh index 6586e02e096..dd87cbc98f6 100755 --- a/src/third_party/wiredtiger/test/format/config.sh +++ b/src/third_party/wiredtiger/test/format/config.sh @@ -236,8 +236,6 @@ CONFIG configuration_list[] = { {"runs.verify_failure_dump", "configure page dump on repeatable read error", C_BOOL | C_IGNORE, 0, 0, 1} -{"statistics", "configure statistics", C_BOOL, 20, 0, 0} - {"statistics.server", "configure statistics server thread", C_BOOL, 5, 0, 0} {"stress.aggressive_sweep", "stress aggressive sweep", C_BOOL, 2, 0, 0} diff --git a/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-5637 b/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-5637 index cc3955699bc..64f0321ff6f 100644 --- a/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-5637 +++ b/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-5637 @@ -77,7 +77,6 @@ runs.threads=5 runs.timer=360 runs.type=row-store runs.verify_failure_dump=0 -statistics=1 statistics.server=0 stress.aggressive_sweep=0 stress.checkpoint=0 diff --git a/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-6568 b/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-6568 index 0dfcc069ffb..293f0d4d7c3 100644 --- a/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-6568 +++ b/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-6568 @@ -76,7 +76,6 @@ runs.threads=32 runs.timer=6 runs.type=row-store runs.verify_failure_dump=0 -statistics=0 statistics.server=0 stress.aggressive_sweep=0 stress.checkpoint=0 diff --git a/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-6725 b/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-6725 index 54aafd08f0b..938606204c6 100644 --- a/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-6725 +++ b/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-6725 @@ -1,100 +1,99 @@ - ############################################ - # RUN PARAMETERS: V2 - ############################################ - assert.commit_timestamp=0 - assert.read_timestamp=0 - backup=0 - backup.incremental=off - backup.incr_granularity=15817 - btree.bitcnt=6 - btree.compression=none - btree.dictionary=0 - btree.huffman_value=0 - btree.internal_key_truncation=1 - btree.internal_page_max=15 - btree.key_gap=18 - btree.key_max=67 - btree.key_min=11 - btree.leaf_page_max=13 - btree.memory_page_max=3 - btree.prefix_compression=0 - btree.prefix_compression_min=6 - btree.repeat_data_pct=39 - btree.reverse=0 - btree.split_pct=63 - btree.value_max=2140 - btree.value_min=13 - cache=36 - cache.evict_max=2 - cache.minimum=20 - checkpoint=on - checkpoint.log_size=161 - checkpoint.wait=91 - disk.checksum=uncompressed - disk.data_extend=0 - disk.direct_io=0 - disk.encryption=rotn-7 - disk.firstfit=0 - disk.mmap=1 - disk.mmap_all=0 - format.abort=0 - format.independent_thread_rng=0 - format.major_timeout=0 - logging=0 - logging.archive=0 - logging.compression=none - logging.file_max=244424 - logging.prealloc=0 - lsm.auto_throttle=1 - lsm.bloom=1 - lsm.bloom_bit_count=7 - lsm.bloom_hash_count=30 - lsm.bloom_oldest=0 - lsm.chunk_size=10 - lsm.merge_max=13 - lsm.worker_threads=3 - ops.alter=1 - ops.compaction=0 - ops.hs_cursor=0 - ops.pct.delete=12 - ops.pct.insert=0 - ops.pct.modify=50 - ops.pct.read=2 - ops.pct.write=36 - ops.prepare=1 - ops.random_cursor=0 - ops.salvage=0 - ops.truncate=1 - ops.verify=1 - quiet=1 - runs=1 - runs.in_memory=0 - runs.ops=0 - runs.rows=100000 - runs.source=table - runs.threads=6 - runs.timer=4 - runs.type=row-store - runs.verify_failure_dump=0 - statistics=1 - statistics.server=0 - stress.aggressive_sweep=0 - stress.checkpoint=0 - stress.checkpoint_prepare=0 - stress.hs_checkpoint_delay=0 - stress.hs_sweep=0 - stress.split_1=0 - stress.split_2=0 - stress.split_3=0 - stress.split_4=0 - stress.split_5=0 - stress.split_6=0 - stress.split_7=0 - transaction.frequency=100 - transaction.isolation=snapshot - transaction.rollback_to_stable=0 - transaction.timestamps=1 - wiredtiger.config= - wiredtiger.rwlock=0 - wiredtiger.leak_memory=0 - ############################################ +############################################ +# RUN PARAMETERS: V2 +############################################ +assert.commit_timestamp=0 +assert.read_timestamp=0 +backup=0 +backup.incremental=off +backup.incr_granularity=15817 +btree.bitcnt=6 +btree.compression=none +btree.dictionary=0 +btree.huffman_value=0 +btree.internal_key_truncation=1 +btree.internal_page_max=15 +btree.key_gap=18 +btree.key_max=67 +btree.key_min=11 +btree.leaf_page_max=13 +btree.memory_page_max=3 +btree.prefix_compression=0 +btree.prefix_compression_min=6 +btree.repeat_data_pct=39 +btree.reverse=0 +btree.split_pct=63 +btree.value_max=2140 +btree.value_min=13 +cache=36 +cache.evict_max=2 +cache.minimum=20 +checkpoint=on +checkpoint.log_size=161 +checkpoint.wait=91 +disk.checksum=uncompressed +disk.data_extend=0 +disk.direct_io=0 +disk.encryption=rotn-7 +disk.firstfit=0 +disk.mmap=1 +disk.mmap_all=0 +format.abort=0 +format.independent_thread_rng=0 +format.major_timeout=0 +logging=0 +logging.archive=0 +logging.compression=none +logging.file_max=244424 +logging.prealloc=0 +lsm.auto_throttle=1 +lsm.bloom=1 +lsm.bloom_bit_count=7 +lsm.bloom_hash_count=30 +lsm.bloom_oldest=0 +lsm.chunk_size=10 +lsm.merge_max=13 +lsm.worker_threads=3 +ops.alter=1 +ops.compaction=0 +ops.hs_cursor=0 +ops.pct.delete=12 +ops.pct.insert=0 +ops.pct.modify=50 +ops.pct.read=2 +ops.pct.write=36 +ops.prepare=1 +ops.random_cursor=0 +ops.salvage=0 +ops.truncate=1 +ops.verify=1 +quiet=1 +runs=1 +runs.in_memory=0 +runs.ops=0 +runs.rows=100000 +runs.source=table +runs.threads=6 +runs.timer=4 +runs.type=row-store +runs.verify_failure_dump=0 +statistics.server=0 +stress.aggressive_sweep=0 +stress.checkpoint=0 +stress.checkpoint_prepare=0 +stress.hs_checkpoint_delay=0 +stress.hs_sweep=0 +stress.split_1=0 +stress.split_2=0 +stress.split_3=0 +stress.split_4=0 +stress.split_5=0 +stress.split_6=0 +stress.split_7=0 +transaction.frequency=100 +transaction.isolation=snapshot +transaction.rollback_to_stable=0 +transaction.timestamps=1 +wiredtiger.config= +wiredtiger.rwlock=0 +wiredtiger.leak_memory=0 +############################################ diff --git a/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-6727 b/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-6727 index bb5ecf39d51..97ddaa3c267 100644 --- a/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-6727 +++ b/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-6727 @@ -75,7 +75,6 @@ runs.source=table runs.threads=16 runs.timer=4 runs.type=row-store -statistics=0 statistics.server=0 stress.aggressive_sweep=0 stress.checkpoint=0 diff --git a/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-8234 b/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-8234 index aecb8d62fe2..6aa67f4fddf 100644 --- a/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-8234 +++ b/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-8234 @@ -75,7 +75,6 @@ runs.threads=4 runs.timer=11 runs.type=row-store runs.verify_failure_dump=0 -statistics=0 statistics.server=0 stress.aggressive_sweep=0 stress.checkpoint=0 diff --git a/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9477 b/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9477 index 629728790c6..56be92802a3 100644 --- a/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9477 +++ b/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9477 @@ -46,7 +46,6 @@ runs.threads=15 runs.timer=8 runs.type=variable-length column-store runs.verify_failure_dump=0 -statistics=0 statistics.server=0 stress.aggressive_sweep=0 stress.checkpoint=0 diff --git a/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9751 b/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9751 index 8ff2a91c49d..e055a500f98 100644 --- a/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9751 +++ b/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9751 @@ -48,7 +48,6 @@ runs.threads=6 runs.timer=1 runs.type=variable-length column-store runs.verify_failure_dump=0 -statistics=0 statistics.server=1 stress.aggressive_sweep=0 stress.checkpoint=0 diff --git a/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9772 b/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9772 index 54210bbc872..0024c897471 100644 --- a/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9772 +++ b/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9772 @@ -45,7 +45,6 @@ runs.tables=5 runs.threads=28 runs.timer=6 runs.verify_failure_dump=0 -statistics=1 statistics.server=0 stress.aggressive_sweep=0 stress.checkpoint=0 diff --git a/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9792 b/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9792 index 4889602e518..7d4d3915491 100644 --- a/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9792 +++ b/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9792 @@ -45,7 +45,6 @@ runs.tables=3 runs.threads=16 runs.timer=6 runs.verify_failure_dump=0 -statistics=0 statistics.server=0 stress.aggressive_sweep=0 stress.checkpoint=0 diff --git a/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9805 b/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9805 index 34fd526585b..0182ec60df8 100644 --- a/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9805 +++ b/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9805 @@ -45,7 +45,6 @@ runs.tables=5 runs.threads=32 runs.timer=26 runs.verify_failure_dump=0 -statistics=0 statistics.server=0 stress.aggressive_sweep=0 stress.checkpoint=0 diff --git a/src/third_party/wiredtiger/test/format/trace.c b/src/third_party/wiredtiger/test/format/trace.c index afc7565d32b..27c91068443 100644 --- a/src/third_party/wiredtiger/test/format/trace.c +++ b/src/third_party/wiredtiger/test/format/trace.c @@ -99,7 +99,8 @@ trace_init(void) /* Configure logging with automatic removal, and keep the last N log files. */ testutil_check(__wt_snprintf(config, sizeof(config), - "create,log=(enabled=true,remove=true),debug_mode=(log_retention=%d)", retain)); + "create,log=(enabled=true,remove=true),debug_mode=(log_retention=%d),statistics=(all)", + retain)); testutil_check(__wt_snprintf(tracedir, sizeof(tracedir), "%s/%s", g.home, TRACE_DIR)); testutil_checkfmt( wiredtiger_open(tracedir, NULL, config, &g.trace_conn), "%s: %s", tracedir, config); diff --git a/src/third_party/wiredtiger/test/format/wts.c b/src/third_party/wiredtiger/test/format/wts.c index ea0753aee17..7c74b4d1fdb 100644 --- a/src/third_party/wiredtiger/test/format/wts.c +++ b/src/third_party/wiredtiger/test/format/wts.c @@ -219,7 +219,8 @@ create_database(const char *home, WT_CONNECTION **connp) "MB" ",checkpoint_sync=false" ",error_prefix=\"%s\"" - ",operation_timeout_ms=2000", + ",operation_timeout_ms=2000" + ",statistics=(all)", GV(CACHE), progname); /* In-memory configuration. */ @@ -282,12 +283,10 @@ create_database(const char *home, WT_CONNECTION **connp) */ if (GV(STATISTICS_SERVER)) { if (mmrand(NULL, 0, 20) == 1) - CONFIG_APPEND( - p, ",statistics=(fast),statistics_log=(json,on_close,wait=5,sources=(\"file:\"))"); + CONFIG_APPEND(p, ",statistics_log=(json,on_close,wait=5,sources=(\"file:\"))"); else - CONFIG_APPEND(p, ",statistics=(fast),statistics_log=(json,on_close,wait=5)"); - } else - CONFIG_APPEND(p, ",statistics=(%s)", GV(STATISTICS) ? "fast" : "none"); + CONFIG_APPEND(p, ",statistics_log=(json,on_close,wait=5)"); + } /* Optional timing stress. */ configure_timing_stress(&p, max); @@ -485,7 +484,7 @@ wts_open(const char *home, WT_CONNECTION **connp, bool verify_metadata) if (enc != NULL) CONFIG_APPEND(p, ",encryption=(name=%s)", enc); - CONFIG_APPEND(p, ",error_prefix=\"%s\"", progname); + CONFIG_APPEND(p, ",error_prefix=\"%s\",statistics=(all)", progname); /* Optional timing stress. */ configure_timing_stress(&p, max); diff --git a/src/third_party/wiredtiger/test/fuzz/fuzz_util.c b/src/third_party/wiredtiger/test/fuzz/fuzz_util.c index d50d611032d..da9c1196ff4 100644 --- a/src/third_party/wiredtiger/test/fuzz/fuzz_util.c +++ b/src/third_party/wiredtiger/test/fuzz/fuzz_util.c @@ -67,7 +67,8 @@ fuzzutil_setup(void) WT_CLEAR(home); fuzzutil_generate_home_name(home); testutil_make_work_dir(home); - testutil_check(wiredtiger_open(home, NULL, "create,cache_size=5MB", &fuzz_state.conn)); + testutil_check( + wiredtiger_open(home, NULL, "create,cache_size=5MB,statistics=(all)", &fuzz_state.conn)); testutil_check(fuzz_state.conn->open_session(fuzz_state.conn, NULL, NULL, &fuzz_state.session)); } diff --git a/src/third_party/wiredtiger/test/huge/huge.c b/src/third_party/wiredtiger/test/huge/huge.c index 83c12b508c7..172c1d32bae 100644 --- a/src/third_party/wiredtiger/test/huge/huge.c +++ b/src/third_party/wiredtiger/test/huge/huge.c @@ -107,7 +107,7 @@ run(CONFIG *cp, int bigkey, size_t bytes) * Open/create the database, connection, session and cursor; set the cache size large, we don't * want to try and evict anything. */ - testutil_check(wiredtiger_open(home, NULL, "create,cache_size=10GB", &conn)); + testutil_check(wiredtiger_open(home, NULL, "create,cache_size=10GB,statistics=(all)", &conn)); testutil_check(conn->open_session(conn, NULL, NULL, &session)); testutil_check(session->create(session, cp->uri, cp->config)); testutil_check(session->open_cursor(session, cp->uri, NULL, NULL, &cursor)); diff --git a/src/third_party/wiredtiger/test/manydbs/manydbs.c b/src/third_party/wiredtiger/test/manydbs/manydbs.c index dc8906d7925..552c648af99 100644 --- a/src/third_party/wiredtiger/test/manydbs/manydbs.c +++ b/src/third_party/wiredtiger/test/manydbs/manydbs.c @@ -36,7 +36,7 @@ static const char *const uri = "table:main"; #define WTOPEN_CFG_COMMON \ "create,log=(enabled,file_max=10M,remove=false)," \ - "statistics=(fast),statistics_log=(wait=5)," + "statistics=(all),statistics_log=(wait=5)," #define WT_CONFIG0 \ WTOPEN_CFG_COMMON \ "transaction_sync=(enabled=false)" diff --git a/src/third_party/wiredtiger/test/readonly/readonly.c b/src/third_party/wiredtiger/test/readonly/readonly.c index c80248ba285..bb53629f34e 100644 --- a/src/third_party/wiredtiger/test/readonly/readonly.c +++ b/src/third_party/wiredtiger/test/readonly/readonly.c @@ -44,9 +44,9 @@ static const char *const uri = "table:main"; #define ENV_CONFIG \ "create,log=(enabled,file_max=10M,remove=false)," \ - "operation_tracking=(enabled=false),transaction_sync=(enabled,method=none)" -#define ENV_CONFIG_RD "operation_tracking=(enabled=false),readonly=true" -#define ENV_CONFIG_WR "operation_tracking=(enabled=false),readonly=false" + "operation_tracking=(enabled=false),transaction_sync=(enabled,method=none),statistics=(all)" +#define ENV_CONFIG_RD "operation_tracking=(enabled=false),readonly=true,statistics=(all)" +#define ENV_CONFIG_WR "operation_tracking=(enabled=false),readonly=false,statistics=(all)" #define MAX_VAL 4096 #define MAX_KV 10000 diff --git a/src/third_party/wiredtiger/test/salvage/salvage.c b/src/third_party/wiredtiger/test/salvage/salvage.c index 0bf29bf810e..8b0f8557c3b 100644 --- a/src/third_party/wiredtiger/test/salvage/salvage.c +++ b/src/third_party/wiredtiger/test/salvage/salvage.c @@ -519,7 +519,8 @@ build(int ikey, int ivalue, int cnt) /* * Disable logging: we're modifying files directly, we don't want to run recovery. */ - testutil_check(wiredtiger_open(HOME, NULL, "create,log=(enabled=false)", &conn)); + testutil_check( + wiredtiger_open(HOME, NULL, "create,log=(enabled=false),statistics=(all)", &conn)); testutil_check(conn->open_session(conn, NULL, NULL, &session)); testutil_check(session->drop(session, LOAD_URI, "force")); @@ -701,8 +702,8 @@ process(void) /* Salvage. */ config[0] = '\0'; if (verbose) - testutil_check(__wt_snprintf( - config, sizeof(config), "error_prefix=\"%s\",verbose=[salvage,verify],", progname)); + testutil_check(__wt_snprintf(config, sizeof(config), + "error_prefix=\"%s\",verbose=[salvage,verify],statistics=(all),", progname)); strcat(config, "log=(enabled=false),"); testutil_check(wiredtiger_open(HOME, NULL, config, &conn)); diff --git a/src/third_party/wiredtiger/test/syscall/wt2336_base/main.c b/src/third_party/wiredtiger/test/syscall/wt2336_base/main.c index 2ac3c8ee834..f72561f916f 100644 --- a/src/third_party/wiredtiger/test/syscall/wt2336_base/main.c +++ b/src/third_party/wiredtiger/test/syscall/wt2336_base/main.c @@ -61,7 +61,7 @@ main(int argc, char *argv[]) (void)argc; (void)argv; fprintf(stderr, SEPARATOR "wiredtiger_open\n"); - if ((ret = wiredtiger_open(".", NULL, "create", &conn)) != 0) + if ((ret = wiredtiger_open(".", NULL, "create,statistics=(all)", &conn)) != 0) fail(ret); usleep(100); |