Commit 960452ee authored by Leif Walsh's avatar Leif Walsh Committed by Yoni Fogel

make scan_op check run_test periodically so it doesn't cause the test to

take forever under valgrind
refs #5157


git-svn-id: file:///svn/toku/tokudb@45013 c7de825b-a66e-492c-adef-691d508d4ae1
parent 09a7c183
...@@ -639,6 +639,12 @@ static int scan_op_and_maybe_check_sum( ...@@ -639,6 +639,12 @@ static int scan_op_and_maybe_check_sum(
r = cursor->c_getf_prev(cursor, 0, scan_cb, &e); r = cursor->c_getf_prev(cursor, 0, scan_cb, &e);
} }
assert(r==0 || r==DB_NOTFOUND); assert(r==0 || r==DB_NOTFOUND);
if (!run_test) {
// terminate early because this op takes a while under drd.
// don't check the sum if we do this.
check_sum = false;
break;
}
} }
{ int chk_r = cursor->c_close(cursor); CKERR(chk_r); } { int chk_r = cursor->c_close(cursor); CKERR(chk_r); }
if (r == DB_NOTFOUND) { if (r == DB_NOTFOUND) {
...@@ -874,7 +880,7 @@ static int UU() verify_op(DB_TXN* UU(txn), ARG UU(arg), void* UU(operation_extra ...@@ -874,7 +880,7 @@ static int UU() verify_op(DB_TXN* UU(txn), ARG UU(arg), void* UU(operation_extra
static int UU() scan_op(DB_TXN *txn, ARG UU(arg), void* operation_extra, void *UU(stats_extra)) { static int UU() scan_op(DB_TXN *txn, ARG UU(arg), void* operation_extra, void *UU(stats_extra)) {
struct scan_op_extra* extra = operation_extra; struct scan_op_extra* extra = operation_extra;
for (int i = 0; i < arg->cli->num_DBs; i++) { for (int i = 0; run_test && i < arg->cli->num_DBs; i++) {
int r = scan_op_and_maybe_check_sum(arg->dbp[i], txn, extra, true); int r = scan_op_and_maybe_check_sum(arg->dbp[i], txn, extra, true);
assert_zero(r); assert_zero(r);
} }
...@@ -883,7 +889,7 @@ static int UU() scan_op(DB_TXN *txn, ARG UU(arg), void* operation_extra, void *U ...@@ -883,7 +889,7 @@ static int UU() scan_op(DB_TXN *txn, ARG UU(arg), void* operation_extra, void *U
static int UU() scan_op_no_check(DB_TXN *txn, ARG arg, void* operation_extra, void *UU(stats_extra)) { static int UU() scan_op_no_check(DB_TXN *txn, ARG arg, void* operation_extra, void *UU(stats_extra)) {
struct scan_op_extra* extra = operation_extra; struct scan_op_extra* extra = operation_extra;
for (int i = 0; i < arg->cli->num_DBs; i++) { for (int i = 0; run_test && i < arg->cli->num_DBs; i++) {
int r = scan_op_and_maybe_check_sum(arg->dbp[i], txn, extra, false); int r = scan_op_and_maybe_check_sum(arg->dbp[i], txn, extra, false);
assert_zero(r); assert_zero(r);
} }
...@@ -2109,6 +2115,8 @@ do_warm_cache(DB_ENV *env, DB **dbs, struct cli_args *args) ...@@ -2109,6 +2115,8 @@ do_warm_cache(DB_ENV *env, DB **dbs, struct cli_args *args)
scan_arg.lock_type = STRESS_LOCK_NONE; scan_arg.lock_type = STRESS_LOCK_NONE;
DB_TXN* txn = NULL; DB_TXN* txn = NULL;
int r = env->txn_begin(env, 0, &txn, 0); CKERR(r); int r = env->txn_begin(env, 0, &txn, 0); CKERR(r);
// make sure the scan doesn't terminate early
run_test = true;
scan_op_no_check(txn, &scan_arg, &soe, NULL); scan_op_no_check(txn, &scan_arg, &soe, NULL);
r = txn->commit(txn,0); CKERR(r); r = txn->commit(txn,0); CKERR(r);
} }
...@@ -2171,6 +2179,8 @@ UU() stress_recover(struct cli_args *args) { ...@@ -2171,6 +2179,8 @@ UU() stress_recover(struct cli_args *args) {
soe.fast = TRUE; soe.fast = TRUE;
soe.fwd = TRUE; soe.fwd = TRUE;
soe.prefetch = FALSE; soe.prefetch = FALSE;
// make sure the scan doesn't terminate early
run_test = true;
r = scan_op(txn, &recover_args, &soe, NULL); r = scan_op(txn, &recover_args, &soe, NULL);
CKERR(r); CKERR(r);
{ int chk_r = txn->commit(txn,0); CKERR(chk_r); } { int chk_r = txn->commit(txn,0); CKERR(chk_r); }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment