Commit bf796229 authored by Bradley C. Kuszmaul's avatar Bradley C. Kuszmaul Committed by Yoni Fogel
Browse files

close[t:4442] Add a diagnostic message during recovery for the env directory...

close[t:4442] Add a diagnostic message during recovery for the env directory not existing or not being a directory. Closes #4442.

git-svn-id: file:///svn/toku/tokudb@39223 c7de825b-a66e-492c-adef-691d508d4ae1
parent d111c19d
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -1219,7 +1219,11 @@ static int do_recovery(RECOVER_ENV renv, const char *env_dir, const char *log_di
    {
	toku_struct_stat buf;
	if (toku_stat(env_dir, &buf)!=0) {
	    fprintf(stderr, "%.24s Tokudb recovery error: directory does not exist: %s\n", ctime(&tnow), env_dir);
	    rr = errno; goto errorexit;
	} else if (!S_ISDIR(buf.st_mode)) {
	    fprintf(stderr, "%.24s Tokudb recovery error: this file is supposed to be a directory, but is not: %s\n", ctime(&tnow), env_dir);
	    rr = ENOTDIR; goto errorexit;
	}
    }

+48 −0
Original line number Diff line number Diff line
#ident "$Id$"
// test recovery with no data directory 

#include "test.h"
#include "includes.h"

#define TESTDIR "dir." __FILE__ 
#define TESTFILE "dir.bogus." __FILE__ 

static int 
run_test(void) {
    int r;

    // setup the test dir
    r = system("rm -rf " TESTDIR " " TESTFILE);
    CKERR(r);
    r = toku_os_mkdir(TESTDIR, S_IRWXU); assert(r == 0);

    // create the log
    TOKULOGGER logger;
    r = toku_logger_create(&logger); assert(r == 0);
    r = toku_logger_open(TESTDIR, logger); assert(r == 0);
    BYTESTRING hello  = { strlen("hello"), "hello" };
    r = toku_log_comment(logger, NULL, TRUE, 0, hello);
    r = toku_logger_close(&logger); assert(r == 0);

    // redirect stderr
    int devnul = open(DEV_NULL_FILE, O_WRONLY);
    assert(devnul>=0);
    r = toku_dup2(devnul, fileno(stderr)); 	    assert(r==fileno(stderr));
    r = close(devnul);                      assert(r==0);

    // run recovery
    r = system("touch " TESTFILE); CKERR(r);
    r = tokudb_recover(TESTFILE, TESTDIR, 0, 0, 0, NULL, 0); 
    assert(r != 0);

    r = system("rm -rf " TESTDIR " " TESTFILE); CKERR(r);

    return 0;
}

int
test_main(int UU(argc), const char *UU(argv[])) {
    int r;
    r = run_test();
    return r;
}