diff options
Diffstat (limited to 'src/third_party/wiredtiger')
68 files changed, 157 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 6ef9d66033d..d69cd893702 100644 --- a/src/third_party/wiredtiger/bench/wt2853_perf/main.c +++ b/src/third_party/wiredtiger/bench/wt2853_perf/main.c @@ -107,8 +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,statistics=(all),statistics_log=(json,on_close,wait=5)", &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/import.data b/src/third_party/wiredtiger/import.data index a3e595697c0..7c7b62af70c 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": "eb9ed56c4f703dae010c23cb362ac46483b78e45" + "commit": "2426972d3aac50b2c94ef25a90af3d2d1021360a" } diff --git a/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.c b/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.c index bdf8acaf85e..1d91524ba56 100644 --- a/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.c +++ b/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.c @@ -292,8 +292,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=(all),statistics_log=(json,on_close,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 39257050116..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,9 +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],statistics=(all),statistics_log=(json,on_close,wait=" \ - "1)" +#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 a3a4e35f997..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,13 +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),statistics=(all),statistics_log=(json,on_close,wait=1)" -#define ENV_CONFIG_TXNSYNC \ - "create,log=(file_max=10M,enabled)," \ - "transaction_sync=(enabled,method=none),statistics=(all),statistics_log=(json,on_close,wait=" \ - "1)" -#define ENV_CONFIG_REC "log=(recover=on),statistics=(all),statistics_log=(json,on_close,wait=1)" +#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),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 25b968d35fe..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),statistics=(all),statistics_log=(json,on_close,wait=1)," \ +#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),statistics=(all),statistics_log=(json,on_close,wait=1)" +#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 43e4b308ccc..2c606e2697f 100644 --- a/src/third_party/wiredtiger/test/csuite/rwlock/main.c +++ b/src/third_party/wiredtiger/test/csuite/rwlock/main.c @@ -66,9 +66,8 @@ main(int argc, char *argv[]) running = true; testutil_make_work_dir(opts->home); - testutil_check(wiredtiger_open(opts->home, NULL, - "create,session_max=1000,statistics=(all),statistics_log=(json,on_close,wait=1)", - &opts->conn)); + testutil_check( + 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 90aab3a072c..1ffe3ca692a 100644 --- a/src/third_party/wiredtiger/test/csuite/schema_abort/main.c +++ b/src/third_party/wiredtiger/test/csuite/schema_abort/main.c @@ -87,11 +87,10 @@ typedef struct { static volatile THREAD_TS th_ts[MAX_TH]; #define ENV_CONFIG_COMPAT ",compatibility=(release=\"2.9\")" -#define ENV_CONFIG_DEF \ - "create," \ - "eviction_updates_trigger=95,eviction_updates_target=80," \ - "log=(enabled,file_max=10M,remove=false),statistics=(all),statistics_log=(json,on_close,wait=" \ - "1)" +#define ENV_CONFIG_DEF \ + "create," \ + "eviction_updates_trigger=95,eviction_updates_target=80," \ + "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)" @@ -101,8 +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),statistics=(all),statistics_log=(json,on_close,wait=1)" +#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 4d494401fa1..78b9694ac9f 100644 --- a/src/third_party/wiredtiger/test/csuite/scope/main.c +++ b/src/third_party/wiredtiger/test/csuite/scope/main.c @@ -374,8 +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,statistics=(all),statistics_log=(json,on_close,wait=1)", &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 c188603f513..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=(all),statistics_log=(json,on_close,wait=1)," \ + "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,9 +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),statistics=(all),statistics_log=" \ - "(json,on_close,wait=1)" +#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 4c68871b04c..1eaffd02955 100644 --- a/src/third_party/wiredtiger/test/csuite/timestamp_abort/main.c +++ b/src/third_party/wiredtiger/test/csuite/timestamp_abort/main.c @@ -101,12 +101,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=(all),statistics_log=(wait=%d,json,on_close)" + "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),statistics=(all),statistics_log=(json,on_close,wait=1)" +#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 568c7ba0f0a..85241ff8a46 100644 --- a/src/third_party/wiredtiger/test/csuite/truncated_log/main.c +++ b/src/third_party/wiredtiger/test/csuite/truncated_log/main.c @@ -36,11 +36,10 @@ static bool use_columns = false; #define RECORDS_FILE "records" -#define ENV_CONFIG \ - "create,log=(enabled,file_max=100K,remove=false)," \ - "transaction_sync=(enabled,method=none),statistics=(all),statistics_log=(json,on_close,wait=" \ - "1)" -#define ENV_CONFIG_REC "log=(recover=on),statistics=(all),statistics_log=(json,on_close,wait=1)" +#define ENV_CONFIG \ + "create,log=(enabled,file_max=100K,remove=false)," \ + "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 e54cb7ca813..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),statistics=(all),statistics_log=(json,on_close,wait=1)", + "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 d3a16858691..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 @@ -104,7 +104,7 @@ main(int argc, char *argv[]) wt_thread_t idlist[100]; clock_t ce, cs; uint64_t i, id; - char buf[256]; + char buf[100]; opts = &_opts; memset(opts, 0, sizeof(*opts)); @@ -115,8 +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=(all)," - "statistics_log=(json,on_close,wait=1)", + "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)); @@ -130,8 +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, "statistics=(all),statistics_log=(json,on_close,wait=1)", &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 340c7c7672d..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,8 +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,statistics=(all),statistics_log=(json,on_close,wait=1)", &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 1ff40ed754f..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,9 +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,statistics=(all),statistics_log=(json,on_close,wait=1)", - &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/wt2447_join_main_table/main.c b/src/third_party/wiredtiger/test/csuite/wt2447_join_main_table/main.c index a5724680703..a80dc7c8ad4 100644 --- a/src/third_party/wiredtiger/test/csuite/wt2447_join_main_table/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt2447_join_main_table/main.c @@ -126,8 +126,7 @@ main(int argc, char *argv[]) testutil_check(__wt_snprintf(index2uri, sizeof(index2uri), "index:%s:index2", tablename)); testutil_check(__wt_snprintf(joinuri, sizeof(joinuri), "join:%s", opts->uri)); - testutil_check(wiredtiger_open(opts->home, NULL, - "statistics=(all),statistics_log=(json,on_close,wait=1),create", &opts->conn)); + testutil_check(wiredtiger_open(opts->home, NULL, "statistics=(all),create", &opts->conn)); testutil_check(opts->conn->open_session(opts->conn, NULL, NULL, &session)); testutil_check(__wt_snprintf(table_cfg, sizeof(table_cfg), @@ -152,8 +151,8 @@ main(int argc, char *argv[]) free((void *)d.data); testutil_check(opts->conn->close(opts->conn, NULL)); - testutil_check(wiredtiger_open(opts->home, NULL, - "statistics=(all),statistics_log=(json,on_close,wait=1),create,cache_size=1GB", &opts->conn)); + testutil_check( + wiredtiger_open(opts->home, NULL, "statistics=(all),create,cache_size=1GB", &opts->conn)); testutil_check(opts->conn->open_session(opts->conn, NULL, NULL, &session)); testutil_check(session->open_cursor(session, index1uri, NULL, NULL, &cursor1)); 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 3baa220b79d..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,9 +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=(all),statistics_log=(json,on_" - "close,wait=1)", - &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 a33d1f4ebe4..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,9 +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,statistics=(all),statistics_log=(json,on_close,wait=1)", - &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 ec82fca3a69..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,8 +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,statistics=(all),statistics_log=(json,on_close,wait=1)", &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 640f029263f..610913e227d 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 6099644bf78..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,9 +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,statistics=(all),statistics_log=(json,on_close,wait=1)", - &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 3a9c02ee1a8..abff8420eed 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,8 +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),statistics=(all),statistics_log=(json,on_close,wait=1)", &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)); @@ -523,8 +523,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})),statistics=(all),statistics_log=(" - "json,on_close,wait=1)", + "%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/wt3120_filesys/main.c b/src/third_party/wiredtiger/test/csuite/wt3120_filesys/main.c index 54703a097b0..b7bf3ea992f 100644 --- a/src/third_party/wiredtiger/test/csuite/wt3120_filesys/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt3120_filesys/main.c @@ -55,9 +55,7 @@ main(int argc, char *argv[]) #endif testutil_build_dir(opts, buf, 1024); testutil_check(__wt_snprintf(config, sizeof(config), - "create,extensions=(%s/" - "%s=(early_load=true)),statistics=(all),statistics_log=(json,on_close,wait=1)", - buf, WT_FAIL_FS_LIB)); + "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")); @@ -74,8 +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, "statistics=(all),statistics_log=(json,on_close,wait=1)", &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 c86db245d9f..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,8 +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,statistics=(all),statistics_log=(json,on_close,wait=1)", &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 588ed06d43f..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,8 +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,statistics=(all),statistics_log=(json,on_close,wait=1)", &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 9317379ce64..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,8 +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,statistics=(all),statistics_log=(json,on_close,wait=1)", &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 e5c0fb2aab8..24db947628b 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,8 +94,7 @@ 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],statistics=(all),statistics_" - "log=(json,on_close,wait=1)", + "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 69be919f4b6..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,8 +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),statistics=(all),statistics_log=(json,on_close,wait=1)", &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 2e4fda01cd3..cab313f515d 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,9 +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),statistics=(all),statistics_log=(json,on_" - "close,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 5531c23bb55..e8879bbcad6 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,9 +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),statistics=(all),statistics_log=(json,on_close,wait=1)", - &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 @@ -398,8 +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,statistics=(all),statistics_log=(json,on_close,wait=1)", &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)); @@ -430,8 +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, "statistics=(all),statistics_log=(json,on_close,wait=1)", &conn)); + testutil_check(wiredtiger_open(buf, &event_handler, "statistics=(all)", &conn)); verify_metadata(conn, &table_data[0]); testutil_check(conn->close(conn, NULL)); } @@ -488,8 +485,7 @@ main(int argc, char *argv[]) home = opts->home; testutil_make_work_dir(home); - testutil_check(wiredtiger_open(home, &event_handler, - "create,statistics=(all),statistics_log=(json,on_close,wait=1)", &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/wt4333_handle_locks/main.c b/src/third_party/wiredtiger/test/csuite/wt4333_handle_locks/main.c index f30ba212104..c60e7140bf0 100644 --- a/src/third_party/wiredtiger/test/csuite/wt4333_handle_locks/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt4333_handle_locks/main.c @@ -294,8 +294,7 @@ runone(bool config_cache) "close_handle_minimum=1,close_idle_time=1,close_scan_interval=1)" ", mmap=true" ", session_max=%u" - ", statistics=(all)" - ", statistics_log=(json,on_close,wait=1)", + ", statistics=(all)", config_cache ? "true" : "false", workers + 100)); testutil_check(wiredtiger_open(home, NULL, buf, &conn)); 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 b9e2137746c..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,8 +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,statistics=(all),statistics_log=(json,on_close,wait=1)", &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 88b62a5994d..963f6527b9e 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,9 +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),statistics=(all),statistics_log=(json,on_" - "close,wait=1)", - 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 506f7c02884..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,8 +52,7 @@ main(int argc, char *argv[]) testutil_make_work_dir(opts->home); - testutil_check(wiredtiger_open(opts->home, NULL, - "create,statistics=(all),statistics_log=(json,on_close,wait=1)", &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 1c2c5d3222a..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,8 +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,statistics=(all),statistics_log=(json,on_close,wait=1)", &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)); @@ -382,8 +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, "statistics=(all),statistics_log=(json,on_close,wait=1)", &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 129ccd3f022..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,11 +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=(all),statistics_log=(json,on_close,wait=1)," \ + "statistics=(all),statistics_log=(wait=1,json=true)," \ "timing_stress_for_test=[checkpoint_slow]" -#define ENV_CONFIG_REC \ - "log=(recover=on,remove=false),statistics=(all),statistics_log=(json,on_close,wait=1)" +#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/wt7989_compact_checkpoint/main.c b/src/third_party/wiredtiger/test/csuite/wt7989_compact_checkpoint/main.c index 75d5011063b..868cc59649e 100644 --- a/src/third_party/wiredtiger/test/csuite/wt7989_compact_checkpoint/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt7989_compact_checkpoint/main.c @@ -45,8 +45,7 @@ * You may want to add "verbose=[compact,compact_progress]" to the connection config string to get * better view on what is happening. */ -static const char conn_config[] = - "create,cache_size=2GB,statistics=(all),statistics_log=(json,on_close,wait=1)"; +static const char conn_config[] = "create,cache_size=2GB,statistics=(all)"; static const char table_config_row[] = "allocation_size=4KB,leaf_page_max=4KB,key_format=Q,value_format=QQQS"; static const char table_config_col[] = diff --git a/src/third_party/wiredtiger/test/csuite/wt8057_compact_stress/main.c b/src/third_party/wiredtiger/test/csuite/wt8057_compact_stress/main.c index 79716d00090..e52e4c25fcc 100644 --- a/src/third_party/wiredtiger/test/csuite/wt8057_compact_stress/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt8057_compact_stress/main.c @@ -48,8 +48,7 @@ static uint64_t compact_event; * You may want to add "verbose=[compact,compact_progress]" to the connection config string to get * better view on what is happening. */ -static const char conn_config[] = - "create,cache_size=2GB,statistics=(all),statistics_log=(json,on_close,wait=1)"; +static const char conn_config[] = "create,cache_size=2GB,statistics=(all)"; static const char table_config_row[] = "allocation_size=4KB,leaf_page_max=4KB,key_format=Q,value_format=" WT_UNCHECKED_STRING(QS); static const char table_config_col[] = 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 64f9270b370..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,8 +33,7 @@ #define NUM_RECORDS 800000 -#define ENV_CONFIG_REC \ - "log=(recover=on,remove=false),statistics=(all),statistics_log=(json,on_close,wait=1)" +#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 @@ -42,7 +41,7 @@ */ static const char conn_config[] = "create,cache_size=1GB,timing_stress_for_test=[compact_slow],statistics=(all),statistics_log=(" - "json,on_close,wait=1)"; + "wait=1,json=true,on_close=true)"; static const char table_config_row[] = "allocation_size=4KB,leaf_page_max=4KB,key_format=Q,value_format=QQQS"; static const char table_config_col[] = 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 8bd0a7e5cb8..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,8 +30,7 @@ #define MAX_KEYS 100000 static const char *const conn_config = - "create,cache_size=100MB,log=(archive=false,enabled=true,file_max=100K),statistics=(all)," - "statistics_log=(json,on_close,wait=1)"; + "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 be6bdbff3b4..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,8 +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,statistics=(all),statistics_log=(json,on_close,wait=1)"; +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/cursor_order/cursor_order.c b/src/third_party/wiredtiger/test/cursor_order/cursor_order.c index f9bd69b9acd..2b4c1bc20e4 100644 --- a/src/third_party/wiredtiger/test/cursor_order/cursor_order.c +++ b/src/third_party/wiredtiger/test/cursor_order/cursor_order.c @@ -174,9 +174,9 @@ wt_connect(SHARED_CONFIG *cfg, char *config_open) testutil_clean_work_dir(home); testutil_make_work_dir(home); - testutil_check(__wt_snprintf(config, sizeof(config), - "create,statistics=(all),statistics_log=(json,on_close,wait=1),error_prefix=\"%s\",%s%s", - progname, config_open == NULL ? "" : ",", config_open == NULL ? "" : config_open)); + testutil_check( + __wt_snprintf(config, sizeof(config), "create,statistics=(all),error_prefix=\"%s\",%s%s", + progname, config_open == NULL ? "" : ",", config_open == NULL ? "" : config_open)); testutil_check(wiredtiger_open(home, &event_handler, config, &cfg->conn)); } diff --git a/src/third_party/wiredtiger/test/fops/t.c b/src/third_party/wiredtiger/test/fops/t.c index 6fff4b43a64..92de1f37e01 100644 --- a/src/third_party/wiredtiger/test/fops/t.c +++ b/src/third_party/wiredtiger/test/fops/t.c @@ -148,13 +148,13 @@ static void wt_startup(char *config_open) { static WT_EVENT_HANDLER event_handler = {handle_error, handle_message, NULL, NULL, NULL}; - char config_buf[512]; + char config_buf[128]; 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),statistics=" - "(all),statistics_log=(json,on_close,wait=1)", + "(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.h b/src/third_party/wiredtiger/test/format/config.h index cd70111022c..38b7adc3aac 100644 --- a/src/third_party/wiredtiger/test/format/config.h +++ b/src/third_party/wiredtiger/test/format/config.h @@ -112,27 +112,28 @@ typedef struct { #define V_GLOBAL_RUNS_TIMER 80 #define V_TABLE_RUNS_TYPE 81 #define V_GLOBAL_RUNS_VERIFY_FAILURE_DUMP 82 -#define V_GLOBAL_STRESS_AGGRESSIVE_SWEEP 83 -#define V_GLOBAL_STRESS_CHECKPOINT 84 -#define V_GLOBAL_STRESS_CHECKPOINT_EVICT_PAGE 85 -#define V_GLOBAL_STRESS_CHECKPOINT_PREPARE 86 -#define V_GLOBAL_STRESS_EVICT_REPOSITION 87 -#define V_GLOBAL_STRESS_FAILPOINT_EVICTION_FAIL_AFTER_RECONCILIATION 88 -#define V_GLOBAL_STRESS_FAILPOINT_HS_DELETE_KEY_FROM_TS 89 -#define V_GLOBAL_STRESS_HS_CHECKPOINT_DELAY 90 -#define V_GLOBAL_STRESS_HS_SEARCH 91 -#define V_GLOBAL_STRESS_HS_SWEEP 92 -#define V_GLOBAL_STRESS_SPLIT_1 93 -#define V_GLOBAL_STRESS_SPLIT_2 94 -#define V_GLOBAL_STRESS_SPLIT_3 95 -#define V_GLOBAL_STRESS_SPLIT_4 96 -#define V_GLOBAL_STRESS_SPLIT_5 97 -#define V_GLOBAL_STRESS_SPLIT_6 98 -#define V_GLOBAL_STRESS_SPLIT_7 99 -#define V_GLOBAL_TRANSACTION_IMPLICIT 100 -#define V_GLOBAL_TRANSACTION_TIMESTAMPS 101 -#define V_GLOBAL_WIREDTIGER_CONFIG 102 -#define V_GLOBAL_WIREDTIGER_RWLOCK 103 -#define V_GLOBAL_WIREDTIGER_LEAK_MEMORY 104 +#define V_GLOBAL_STATISTICS_SERVER 83 +#define V_GLOBAL_STRESS_AGGRESSIVE_SWEEP 84 +#define V_GLOBAL_STRESS_CHECKPOINT 85 +#define V_GLOBAL_STRESS_CHECKPOINT_EVICT_PAGE 86 +#define V_GLOBAL_STRESS_CHECKPOINT_PREPARE 87 +#define V_GLOBAL_STRESS_EVICT_REPOSITION 88 +#define V_GLOBAL_STRESS_FAILPOINT_EVICTION_FAIL_AFTER_RECONCILIATION 89 +#define V_GLOBAL_STRESS_FAILPOINT_HS_DELETE_KEY_FROM_TS 90 +#define V_GLOBAL_STRESS_HS_CHECKPOINT_DELAY 91 +#define V_GLOBAL_STRESS_HS_SEARCH 92 +#define V_GLOBAL_STRESS_HS_SWEEP 93 +#define V_GLOBAL_STRESS_SPLIT_1 94 +#define V_GLOBAL_STRESS_SPLIT_2 95 +#define V_GLOBAL_STRESS_SPLIT_3 96 +#define V_GLOBAL_STRESS_SPLIT_4 97 +#define V_GLOBAL_STRESS_SPLIT_5 98 +#define V_GLOBAL_STRESS_SPLIT_6 99 +#define V_GLOBAL_STRESS_SPLIT_7 100 +#define V_GLOBAL_TRANSACTION_IMPLICIT 101 +#define V_GLOBAL_TRANSACTION_TIMESTAMPS 102 +#define V_GLOBAL_WIREDTIGER_CONFIG 103 +#define V_GLOBAL_WIREDTIGER_RWLOCK 104 +#define V_GLOBAL_WIREDTIGER_LEAK_MEMORY 105 -#define V_ELEMENT_COUNT 105 +#define V_ELEMENT_COUNT 106 diff --git a/src/third_party/wiredtiger/test/format/config.sh b/src/third_party/wiredtiger/test/format/config.sh index b17c9c97959..4d6622a9060 100755 --- a/src/third_party/wiredtiger/test/format/config.sh +++ b/src/third_party/wiredtiger/test/format/config.sh @@ -242,6 +242,8 @@ CONFIG configuration_list[] = { {"runs.verify_failure_dump", "configure page dump on repeatable read error", C_BOOL | C_IGNORE, 0, 0, 1} +{"statistics.server", "configure statistics server thread", C_BOOL, 5, 0, 0} + {"stress.aggressive_sweep", "stress aggressive sweep", C_BOOL, 2, 0, 0} {"stress.checkpoint", "stress checkpoints", C_BOOL, 2, 0, 0} diff --git a/src/third_party/wiredtiger/test/format/config_def.c b/src/third_party/wiredtiger/test/format/config_def.c index 414edf22620..539ba902299 100644 --- a/src/third_party/wiredtiger/test/format/config_def.c +++ b/src/third_party/wiredtiger/test/format/config_def.c @@ -257,6 +257,9 @@ CONFIG configuration_list[] = { {"runs.verify_failure_dump", "configure page dump on repeatable read error", C_BOOL | C_IGNORE, 0, 0, 1, V_GLOBAL_RUNS_VERIFY_FAILURE_DUMP}, + {"statistics.server", "configure statistics server thread", + C_BOOL, 5, 0, 0, V_GLOBAL_STATISTICS_SERVER}, + {"stress.aggressive_sweep", "stress aggressive sweep", C_BOOL, 2, 0, 0, V_GLOBAL_STRESS_AGGRESSIVE_SWEEP}, 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 eea22e30a41..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,6 +77,7 @@ runs.threads=5 runs.timer=360 runs.type=row-store runs.verify_failure_dump=0 +statistics.server=0 stress.aggressive_sweep=0 stress.checkpoint=0 stress.checkpoint_prepare=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 0c5f75a20eb..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,6 +76,7 @@ runs.threads=32 runs.timer=6 runs.type=row-store runs.verify_failure_dump=0 +statistics.server=0 stress.aggressive_sweep=0 stress.checkpoint=0 stress.checkpoint_prepare=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 d7ada0016c7..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 @@ -76,6 +76,7 @@ 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 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 ca7ce62be7f..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,6 +75,7 @@ runs.source=table runs.threads=16 runs.timer=4 runs.type=row-store +statistics.server=0 stress.aggressive_sweep=0 stress.checkpoint=0 stress.hs_sweep=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 2f59ffdcedb..a18a053a496 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,6 +75,7 @@ runs.threads=4 runs.timer=11 runs.type=row-store runs.verify_failure_dump=0 +statistics.server=0 stress.aggressive_sweep=0 stress.checkpoint=0 stress.checkpoint_prepare=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 57fb678c747..b8360d5bbbd 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,6 +46,7 @@ runs.threads=15 runs.timer=8 runs.type=variable-length column-store runs.verify_failure_dump=0 +statistics.server=0 stress.aggressive_sweep=0 stress.checkpoint=0 stress.checkpoint_evict_page=1 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 b8e9e5a827f..68f8457ec9b 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,6 +48,7 @@ runs.threads=6 runs.timer=1 runs.type=variable-length column-store runs.verify_failure_dump=0 +statistics.server=1 stress.aggressive_sweep=0 stress.checkpoint=0 stress.checkpoint_evict_page=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 a96e4da5b86..39a8f6416cc 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,6 +45,7 @@ runs.tables=5 runs.threads=28 runs.timer=6 runs.verify_failure_dump=0 +statistics.server=0 stress.aggressive_sweep=0 stress.checkpoint=0 stress.checkpoint_evict_page=0 diff --git a/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9777 b/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9777 index a5899baab36..f4f29b06879 100644 --- a/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9777 +++ b/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9777 @@ -46,6 +46,7 @@ runs.threads=4 runs.timer=16 runs.verify_failure_dump=0 statistics=1 +statistics.server=0 stress.aggressive_sweep=0 stress.checkpoint=0 stress.checkpoint_evict_page=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 23ac064b258..4ff174cdb9e 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,6 +45,7 @@ runs.tables=3 runs.threads=16 runs.timer=6 runs.verify_failure_dump=0 +statistics.server=0 stress.aggressive_sweep=0 stress.checkpoint=0 stress.checkpoint_evict_page=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 99821d21258..293e55be470 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,6 +45,7 @@ runs.tables=5 runs.threads=32 runs.timer=26 runs.verify_failure_dump=0 +statistics.server=0 stress.aggressive_sweep=0 stress.checkpoint=0 stress.checkpoint_evict_page=0 diff --git a/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9830 b/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9830 index c586d3846eb..fd5f33a0ddf 100644 --- a/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9830 +++ b/src/third_party/wiredtiger/test/format/failure_configs/CONFIG.WT-9830 @@ -45,6 +45,8 @@ runs.tables=3 runs.threads=10 runs.timer=6 runs.verify_failure_dump=0 +statistics=1 +statistics.server=0 stress.aggressive_sweep=0 stress.checkpoint=0 stress.checkpoint_evict_page=0 diff --git a/src/third_party/wiredtiger/test/format/trace.c b/src/third_party/wiredtiger/test/format/trace.c index e5b64d93701..27c91068443 100644 --- a/src/third_party/wiredtiger/test/format/trace.c +++ b/src/third_party/wiredtiger/test/format/trace.c @@ -99,8 +99,7 @@ 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),statistics=(all)," - "statistics_log=(json,on_close,wait=5)", + "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( diff --git a/src/third_party/wiredtiger/test/format/wts.c b/src/third_party/wiredtiger/test/format/wts.c index 87b861a69b5..27ca5e0ca3b 100644 --- a/src/third_party/wiredtiger/test/format/wts.c +++ b/src/third_party/wiredtiger/test/format/wts.c @@ -216,8 +216,7 @@ create_database(const char *home, WT_CONNECTION **connp) ",checkpoint_sync=false" ",error_prefix=\"%s\"" ",operation_timeout_ms=2000" - ",statistics=(all)" - ",statistics_log=(json,on_close,wait=5)", + ",statistics=(all)", GV(CACHE), progname); /* In-memory configuration. */ @@ -285,9 +284,16 @@ create_database(const char *home, WT_CONNECTION **connp) CONFIG_APPEND(p, ",debug_mode=(realloc_malloc=true)"); } - /* Sometimes specify a set of sources just to exercise that code. */ - if (mmrand(NULL, 0, 20) == 1) - CONFIG_APPEND(p, ",statistics_log=(sources=(\"file:\"))"); + /* + * Run the statistics server and/or maintain statistics in the engine. Sometimes specify a set + * of sources just to exercise that code. + */ + if (GV(STATISTICS_SERVER)) { + if (mmrand(NULL, 0, 20) == 1) + CONFIG_APPEND(p, ",statistics_log=(json,on_close,wait=5,sources=(\"file:\"))"); + else + CONFIG_APPEND(p, ",statistics_log=(json,on_close,wait=5)"); + } /* Optional timing stress. */ configure_timing_stress(&p, max); @@ -485,8 +491,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\",statistics=(all),statistics_log=(json,on_close,wait=5)", 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 7456fb8bf15..da9c1196ff4 100644 --- a/src/third_party/wiredtiger/test/fuzz/fuzz_util.c +++ b/src/third_party/wiredtiger/test/fuzz/fuzz_util.c @@ -67,9 +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,statistics=(all),statistics_log=(json,on_close,wait=1)", - &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 3781f5a3e2e..172c1d32bae 100644 --- a/src/third_party/wiredtiger/test/huge/huge.c +++ b/src/third_party/wiredtiger/test/huge/huge.c @@ -107,8 +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,statistics=(all),statistics_log=(json,on_close,wait=1)", &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 18759dd853d..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=(all),statistics_log=(json,on_close,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 9564ef08477..bb53629f34e 100644 --- a/src/third_party/wiredtiger/test/readonly/readonly.c +++ b/src/third_party/wiredtiger/test/readonly/readonly.c @@ -42,16 +42,11 @@ static char home_rd2[HOME_SIZE + sizeof(HOME_RD2_SUFFIX)]; static const char *saved_argv0; /* Program command */ 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),statistics=(all)," \ - "statistics_log=(json,on_close,wait=1)" -#define ENV_CONFIG_RD \ - "operation_tracking=(enabled=false),readonly=true,statistics=(all),statistics_log=(json,on_" \ - "close,wait=1)" -#define ENV_CONFIG_WR \ - "operation_tracking=(enabled=false),readonly=false,statistics=(all),statistics_log=(json,on_" \ - "close,wait=1)" +#define ENV_CONFIG \ + "create,log=(enabled,file_max=10M,remove=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 757e29878c3..8b0f8557c3b 100644 --- a/src/third_party/wiredtiger/test/salvage/salvage.c +++ b/src/third_party/wiredtiger/test/salvage/salvage.c @@ -519,8 +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),statistics=(all),statistics_log=(json,on_close,wait=1)", &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")); @@ -703,9 +703,7 @@ process(void) config[0] = '\0'; if (verbose) testutil_check(__wt_snprintf(config, sizeof(config), - "error_prefix=\"%s\",verbose=[salvage,verify],statistics=(all),statistics_log=(json,on_" - "close,wait=1),", - progname)); + "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 56d75dc835e..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,8 +61,7 @@ main(int argc, char *argv[]) (void)argc; (void)argv; fprintf(stderr, SEPARATOR "wiredtiger_open\n"); - if ((ret = wiredtiger_open( - ".", NULL, "create,statistics=(all),statistics_log=(json,on_close,wait=1)", &conn)) != 0) + if ((ret = wiredtiger_open(".", NULL, "create,statistics=(all)", &conn)) != 0) fail(ret); usleep(100); diff --git a/src/third_party/wiredtiger/test/thread/t.c b/src/third_party/wiredtiger/test/thread/t.c index 7c8a9693f8e..ab6d0b3e92c 100644 --- a/src/third_party/wiredtiger/test/thread/t.c +++ b/src/third_party/wiredtiger/test/thread/t.c @@ -180,9 +180,9 @@ wt_connect(char *config_open) testutil_clean_work_dir(home); testutil_make_work_dir(home); - testutil_check(__wt_snprintf(config, sizeof(config), - "create,statistics=(all),statistics_log=(json,on_close,wait=1),error_prefix=\"%s\",%s%s", - progname, config_open == NULL ? "" : ",", config_open == NULL ? "" : config_open)); + testutil_check( + __wt_snprintf(config, sizeof(config), "create,statistics=(all),error_prefix=\"%s\",%s%s", + progname, config_open == NULL ? "" : ",", config_open == NULL ? "" : config_open)); testutil_check(wiredtiger_open(home, &event_handler, config, &conn)); } |