Commit 7309ee35 authored by Barry Perlman's avatar Barry Perlman Committed by Yoni Fogel

[t:2499] Verify no temp files before loader is run, print data_dir listing only if verbose

git-svn-id: file:///svn/toku/tokudb@19901 c7de825b-a66e-492c-adef-691d508d4ae1
parent 13ffe7b0
...@@ -303,6 +303,9 @@ static void test_loader(DB **dbs) ...@@ -303,6 +303,9 @@ static void test_loader(DB **dbs)
} }
uint32_t loader_flags = USE_PUTS; // set with -p option uint32_t loader_flags = USE_PUTS; // set with -p option
int n = count_temp(env->i->real_data_dir);
assert(n == 0); // Must be no temp files before loader is run
if (verbose) printf("old inames:\n"); if (verbose) printf("old inames:\n");
get_inames(old_inames, dbs); get_inames(old_inames, dbs);
...@@ -335,12 +338,13 @@ static void test_loader(DB **dbs) ...@@ -335,12 +338,13 @@ static void test_loader(DB **dbs)
if( CHECK_RESULTS || verbose ) {printf("\n"); fflush(stdout);} if( CHECK_RESULTS || verbose ) {printf("\n"); fflush(stdout);}
printf("Data dir is %s\n", env->i->real_data_dir); printf("Data dir is %s\n", env->i->real_data_dir);
int n = count_temp(env->i->real_data_dir); n = count_temp(env->i->real_data_dir);
printf("Num temp files = %d\n", n); printf("Num temp files = %d\n", n);
assert(n); // test is useless unless at least one temp file is created assert(n); // test is useless unless at least one temp file is created
if (verbose) {
printf("Contents of data dir:\n"); printf("Contents of data dir:\n");
print_dir(env->i->real_data_dir); print_dir(env->i->real_data_dir);
}
printf("closing, will crash\n"); fflush(stdout); printf("closing, will crash\n"); fflush(stdout);
r = loader->close(loader); r = loader->close(loader);
printf("Should never return from loader->close()\n"); fflush(stdout); printf("Should never return from loader->close()\n"); fflush(stdout);
...@@ -405,7 +409,8 @@ static void run_recover (void) { ...@@ -405,7 +409,8 @@ static void run_recover (void) {
r = env->open(env, ENVDIR, envflags + DB_RECOVER, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r); r = env->open(env, ENVDIR, envflags + DB_RECOVER, S_IRWXU+S_IRWXG+S_IRWXO); CKERR(r);
// now verify contents of data_dir, should be no temp files, no loader-created iname files // now verify contents of data_dir, should be no temp files, no loader-created iname files
print_dir(env->i->real_data_dir); if (verbose)
print_dir(env->i->real_data_dir);
int n = count_temp(env->i->real_data_dir); int n = count_temp(env->i->real_data_dir);
printf("Num temp files = %d\n", n); printf("Num temp files = %d\n", n);
......
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