diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2020-08-17 15:56:33 +1000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-08-17 06:16:56 +0000 |
| commit | b2c2c5e28402f113ac52f6ce5e629d59fc09b995 (patch) | |
| tree | f66c98f6fbbc5fae973620de07d2f6e262c0bd44 /src/third_party/wiredtiger/test/checkpoint | |
| parent | 3cc779415f2777223b5549d3dfd1b85eef01842b (diff) | |
| download | mongo-b2c2c5e28402f113ac52f6ce5e629d59fc09b995.tar.gz | |
Import wiredtiger: 1a3371324597a8f124c126c2df11303ded4d8dd9 from branch mongodb-4.6
ref: 1124e23db6..1a33713245
for: 4.5.1
WT-5940 Migrate to Clang Format 10
WT-6000 Enhance incremental backup testing in format to support restart
WT-6471 Avoid the error message for non-existent clang-format binary
WT-6560 Fix usage of global salvage in WT utility
WT-6577 History store dump outputs confusing time window
WT-6586 Tombstone inserted to history store should also be flagged as WT_UPDATE_HS
Diffstat (limited to 'src/third_party/wiredtiger/test/checkpoint')
| -rw-r--r-- | src/third_party/wiredtiger/test/checkpoint/checkpointer.c | 4 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/test/checkpoint/test_checkpoint.c | 19 |
2 files changed, 8 insertions, 15 deletions
diff --git a/src/third_party/wiredtiger/test/checkpoint/checkpointer.c b/src/third_party/wiredtiger/test/checkpoint/checkpointer.c index 5831bb5eee1..b34add5fe51 100644 --- a/src/third_party/wiredtiger/test/checkpoint/checkpointer.c +++ b/src/third_party/wiredtiger/test/checkpoint/checkpointer.c @@ -282,9 +282,7 @@ verify_consistency(WT_SESSION *session, char *stable_timestamp) continue; else if (ret == WT_NOTFOUND || t_ret == WT_NOTFOUND) { (void)log_print_err( - "verify_consistency tables with different" - " amount of data", - EFAULT, 1); + "verify_consistency tables with different amount of data", EFAULT, 1); goto err; } diff --git a/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.c b/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.c index 0166bddb45a..5785494487a 100644 --- a/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.c +++ b/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.c @@ -200,18 +200,15 @@ wt_connect(const char *config_open) */ if (g.sweep_stress) testutil_check(__wt_snprintf(config, sizeof(config), - "create,cache_cursors=false,statistics=(fast)," - "statistics_log=(json,wait=1),error_prefix=\"%s\"," - "file_manager=(close_handle_minimum=1,close_idle_time=1," - "close_scan_interval=1),log=(enabled),cache_size=1GB," - "timing_stress_for_test=(aggressive_sweep)%s%s%s", + "create,cache_cursors=false,statistics=(fast),statistics_log=(json,wait=1),error_prefix=" + "\"%s\",file_manager=(close_handle_minimum=1,close_idle_time=1,close_scan_interval=1)," + "log=(enabled),cache_size=1GB,timing_stress_for_test=(aggressive_sweep)%s%s%s", progname, g.debug_mode ? DEBUG_MODE_CFG : "", config_open == NULL ? "" : ",", config_open == NULL ? "" : config_open)); else testutil_check(__wt_snprintf(config, sizeof(config), - "create,cache_cursors=false,statistics=(fast)," - "statistics_log=(json,wait=1),error_prefix=\"%s\"" - "%s%s%s", + "create,cache_cursors=false,statistics=(fast),statistics_log=(json,wait=1),error_prefix=" + "\"%s\"%s%s%s", progname, g.debug_mode ? DEBUG_MODE_CFG : "", config_open == NULL ? "" : ",", config_open == NULL ? "" : config_open)); @@ -336,10 +333,8 @@ static int usage(void) { fprintf(stderr, - "usage: %s " - "[-C wiredtiger-config] [-c checkpoint] [-h home] [-k keys]\n\t" - "[-l log] [-n ops] [-r runs] [-T table-config] [-t f|r|v]\n\t" - "[-W workers]\n", + "usage: %s [-C wiredtiger-config] [-c checkpoint] [-h home] [-k keys]\n\t[-l log] [-n ops] " + "[-r runs] [-T table-config] [-t f|r|v]\n\t[-W workers]\n", progname); fprintf(stderr, "%s", "\t-C specify wiredtiger_open configuration arguments\n" |