diff options
Diffstat (limited to 'src/third_party/wiredtiger/test/checkpoint')
4 files changed, 37 insertions, 28 deletions
diff --git a/src/third_party/wiredtiger/test/checkpoint/checkpointer.c b/src/third_party/wiredtiger/test/checkpoint/checkpointer.c index 3bb80e94156..b7e7a9a952b 100644 --- a/src/third_party/wiredtiger/test/checkpoint/checkpointer.c +++ b/src/third_party/wiredtiger/test/checkpoint/checkpointer.c @@ -82,7 +82,6 @@ clock_thread(void *arg) testutil_check(g.conn->open_session(g.conn, NULL, NULL, &wt_session)); session = (WT_SESSION_IMPL *)wt_session; - g.ts_stable = 0; while (g.running) { __wt_writelock(session, &g.clock_lock); ++g.ts_stable; diff --git a/src/third_party/wiredtiger/test/checkpoint/smoke.sh b/src/third_party/wiredtiger/test/checkpoint/smoke.sh index 83f1b1f6cef..962b1893305 100755 --- a/src/third_party/wiredtiger/test/checkpoint/smoke.sh +++ b/src/third_party/wiredtiger/test/checkpoint/smoke.sh @@ -5,22 +5,34 @@ set -e # Bypass this test for valgrind test "$TESTUTIL_BYPASS_VALGRIND" = "1" && exit 0 -# Temporarily disabled # Smoke-test checkpoints as part of running "make check". -#echo "checkpoint: 3 mixed tables" -#$TEST_WRAPPER ./t -T 3 -t m -# Temporarily disabled -#echo "checkpoint: 6 column-store tables" -#$TEST_WRAPPER ./t -T 6 -t c +echo "checkpoint: 3 mixed tables" +$TEST_WRAPPER ./t -T 3 -t m -# Temporarily disabled -#echo "checkpoint: 6 LSM tables" -#$TEST_WRAPPER ./t -T 6 -t l +echo "checkpoint: 6 column-store tables" +$TEST_WRAPPER ./t -T 6 -t c -# Temporarily disabled -#echo "checkpoint: 6 mixed tables" -#$TEST_WRAPPER ./t -T 6 -t m +echo "checkpoint: 6 column-store tables, named checkpoint" +$TEST_WRAPPER ./t -c 'TeSt' -T 6 -t c + +echo "checkpoint: 6 column-store tables with prepare" +$TEST_WRAPPER ./t -T 6 -t c -p + +echo "checkpoint: 6 column-store tables, named checkpoint with prepare" +$TEST_WRAPPER ./t -c 'TeSt' -T 6 -t c -p + +echo "checkpoint: column-store tables, stress history store. Sweep and timestamps" +$TEST_WRAPPER ./t -t c -W 3 -r 2 -D -s -x -n 100000 -k 100000 -C cache_size=100MB + +echo "checkpoint: column-store tables, Sweep and timestamps" +$TEST_WRAPPER ./t -t c -W 3 -r 2 -s -x -n 100000 -k 100000 -C cache_size=100MB + +echo "checkpoint: 6 LSM tables" +$TEST_WRAPPER ./t -T 6 -t l + +echo "checkpoint: 6 mixed tables" +$TEST_WRAPPER ./t -T 6 -t m echo "checkpoint: 6 row-store tables" $TEST_WRAPPER ./t -T 6 -t r @@ -34,18 +46,14 @@ $TEST_WRAPPER ./t -T 6 -t r -p echo "checkpoint: 6 row-store tables, named checkpoint with prepare" $TEST_WRAPPER ./t -c 'TeSt' -T 6 -t r -p -# Temporarily disabled -#echo "checkpoint: row-store tables, stress history store. Sweep and timestamps" -#$TEST_WRAPPER ./t -t r -W 3 -r 2 -D -s -x -n 100000 -k 100000 -C cache_size=100MB +echo "checkpoint: row-store tables, stress history store. Sweep and timestamps" +$TEST_WRAPPER ./t -t r -W 3 -r 2 -D -s -x -n 100000 -k 100000 -C cache_size=100MB -# Temporarily disabled -#echo "checkpoint: row-store tables, Sweep and timestamps" -#$TEST_WRAPPER ./t -t r -W 3 -r 2 -s -x -n 100000 -k 100000 -C cache_size=100MB +echo "checkpoint: row-store tables, Sweep and timestamps" +$TEST_WRAPPER ./t -t r -W 3 -r 2 -s -x -n 100000 -k 100000 -C cache_size=100MB -# Temporarily disabled -#echo "checkpoint: 3 mixed tables, with sweep" -#$TEST_WRAPPER ./t -T 3 -t m -W 3 -r 2 -s -n 100000 -k 100000 +echo "checkpoint: 3 mixed tables, with sweep" +$TEST_WRAPPER ./t -T 3 -t m -W 3 -r 2 -s -n 100000 -k 100000 -# Temporarily disabled -#echo "checkpoint: 3 mixed tables, with timestamps" -#$TEST_WRAPPER ./t -T 3 -t m -W 3 -r 2 -x -n 100000 -k 100000 +echo "checkpoint: 3 mixed tables, with timestamps" +$TEST_WRAPPER ./t -T 3 -t m -W 3 -r 2 -x -n 100000 -k 100000 diff --git a/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.c b/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.c index b236cb14308..90378cc0de9 100644 --- a/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.c +++ b/src/third_party/wiredtiger/test/checkpoint/test_checkpoint.c @@ -140,6 +140,8 @@ main(int argc, char *argv[]) testutil_work_dir_from_path(g.home, 512, working_dir); + g.ts_stable = 0; + printf("%s: process %" PRIu64 "\n", progname, (uint64_t)getpid()); for (cnt = 1; (runs == 0 || cnt <= runs) && g.status == 0; ++cnt) { cleanup(cnt == 1); /* Clean up previous runs */ @@ -171,7 +173,7 @@ main(int argc, char *argv[]) free(g.cookies); g.cookies = NULL; if ((ret = wt_shutdown()) != 0) { - (void)log_print_err("Start workers failed", ret, 1); + (void)log_print_err("Shutdown failed", ret, 1); break; } } @@ -250,7 +252,6 @@ cleanup(bool remove_dir) g.running = 0; g.ntables_created = 0; g.ts_oldest = 0; - g.ts_stable = 0; if (remove_dir) testutil_make_work_dir(g.home); diff --git a/src/third_party/wiredtiger/test/checkpoint/workers.c b/src/third_party/wiredtiger/test/checkpoint/workers.c index 2cd947fbd79..05b9a83b75b 100644 --- a/src/third_party/wiredtiger/test/checkpoint/workers.c +++ b/src/third_party/wiredtiger/test/checkpoint/workers.c @@ -280,11 +280,12 @@ real_worker(void) } else testutil_check(__wt_snprintf( buf, sizeof(buf), "commit_timestamp=%x", g.ts_stable + 1)); - __wt_readunlock((WT_SESSION_IMPL *)session, &g.clock_lock); if ((ret = session->commit_transaction(session, buf)) != 0) { + __wt_readunlock((WT_SESSION_IMPL *)session, &g.clock_lock); (void)log_print_err("real_worker:commit_transaction", ret, 1); goto err; } + __wt_readunlock((WT_SESSION_IMPL *)session, &g.clock_lock); start_txn = true; /* Occasionally reopen cursors after committing. */ if (next_rnd % 13 == 0) { |