Merge tokudb.1779 onto mainline. Fixes #1779.

git-svn-id: file:///svn/toku/tokudb@12281 c7de825b-a66e-492c-adef-691d508d4ae1

newbrt/recover.c

@@ -122,8 +122,30 @@ toku_recover_note_cachefile (FILENUM fnum, CACHEFILE cf, BRT brt) {
     return 0;
 }
 
+static int find_cachefile (FILENUM fnum, struct cf_pair **cf_pair) {
+    int i;
+    for (i=0; i<n_cf_pairs; i++) {
+	if (fnum.fileid==cf_pairs[i].filenum.fileid) {
+	    *cf_pair = cf_pairs+i;
+	    return 0;
+	}
+    }
+    return 1;
+}
+
 static void
-internal_toku_recover_fopen_or_fcreate (int flags, int mode, char *fixedfname, FILENUM filenum) {
+internal_toku_recover_fopen_or_fcreate (int flags, int mode, char *fixedfname, FILENUM filenum)
+// Open the file if it is not already open.  If it is already open, then do nothing.
+{
+    {
+	struct cf_pair *pair = NULL;
+	int r = find_cachefile(filenum, &pair);
+	if (0==r) {
+	    toku_free(fixedfname);
+	    return;
+	}
+    }
+
     CACHEFILE cf;
     int fd = open(fixedfname, O_RDWR|O_BINARY|flags, mode);
     if (fd<0) {
@@ -178,17 +200,6 @@ static int toku_recover_backward_fcreate (struct logtype_fcreate *l, struct back
     return 0;
 }
 
-static int find_cachefile (FILENUM fnum, struct cf_pair **cf_pair) {
-    int i;
-    for (i=0; i<n_cf_pairs; i++) {
-	if (fnum.fileid==cf_pairs[i].filenum.fileid) {
-	    *cf_pair = cf_pairs+i;
-	    return 0;
-	}
-    }
-    return 1;
-}
-
 static void toku_recover_fheader (LSN UU(lsn), TXNID UU(txnid),FILENUM filenum, LOGGEDBRTHEADER header) {
     struct cf_pair *pair = NULL;
     int r = find_cachefile(filenum, &pair);
@@ -231,8 +242,10 @@ static void
 toku_recover_enqrootentry (LSN lsn __attribute__((__unused__)), FILENUM filenum, TXNID xid, u_int32_t typ, BYTESTRING key, BYTESTRING val) {
     struct cf_pair *pair = NULL;
     int r = find_cachefile(filenum, &pair);
-    assert(r==0);
-    
+    if (r!=0) {
+	// if we didn't find a cachefile, then we don't have to do anything.
+	return;
+    }    
     struct brt_cmd cmd;
     DBT keydbt, valdbt;
     cmd.type=(enum brt_cmd_type) typ;
@@ -351,14 +364,15 @@ static int toku_recover_backward_end_checkpoint (struct logtype_end_checkpoint *
     abort();
 }
 
-static int toku_recover_fassociate (LSN UU(lsn), FILENUM filenum, BYTESTRING fname) {
-    char *fixedfname = fixup_fname(&fname);
-    toku_free_BYTESTRING(fname);
-    internal_toku_recover_fopen_or_fcreate(0, 0, fixedfname, filenum);
+// going backward we open it, so going forward we don't have to do anything
+static int toku_recover_fassociate (LSN UU(lsn), FILENUM UU(filenum), BYTESTRING UU(fname)) {
     return 0;
 }
 
-static int toku_recover_backward_fassociate (struct logtype_fassociate *UU(l), struct backward_scan_state *UU(bs)) {
+static int toku_recover_backward_fassociate (struct logtype_fassociate *l, struct backward_scan_state *UU(bs)) {
+    char *fixedfname = fixup_fname(&l->fname);
+    toku_free_BYTESTRING(l->fname);
+    internal_toku_recover_fopen_or_fcreate(0, 0, fixedfname, l->filenum);
     return 0;
 }
 
@@ -496,6 +510,8 @@ int tokudb_recover(const char *data_dir, const char *log_dir) {
 	r = fseek(f, 0, SEEK_END); assert(r==0);
 	struct log_entry le;
 	struct backward_scan_state bs = initial_bss;
+	r=chdir(data_wd);
+	assert(r==0);
 	while (1) {
 	    r = toku_log_fread_backward(f, &le);
 	    if (r==-1) break; // Ran out of file

src/tests/x1.c

+/* Transaction consistency:  
+ *  fork a process:
+ *   Open two tables, T1 and T2
+ *   begin transaction
+ *   store A in T1
+ *   checkpoint
+ *   store B in T2
+ *   commit (or abort)
+ *   signal to end the process abruptly
+ *  wait for the process to finish
+ *   open the environment doing recovery
+ *   check to see if both A and B are present (or absent)
+ */
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include "test.h"
+
+const int envflags = DB_INIT_MPOOL|DB_CREATE|DB_THREAD |DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_TXN |DB_RECOVER;
+char *namea="a.db";
+char *nameb="b.db";
+
+
+static void
+do_x1_shutdown (BOOL do_commit)
+{
+    int r;
+    system("rm -rf " ENVDIR);
+    toku_os_mkdir(ENVDIR, S_IRWXU+S_IRWXG+S_IRWXO);
+    DB_ENV *env;
+    DB *dba, *dbb;
+    r = db_env_create(&env, 0);                                                         CKERR(r);
+    r = env->open(env, ENVDIR, envflags, S_IRWXU+S_IRWXG+S_IRWXO);                      CKERR(r);
+    r = db_create(&dba, env, 0);                                                        CKERR(r);
+    r = dba->open(dba, NULL, namea, NULL, DB_BTREE, DB_AUTO_COMMIT|DB_CREATE, 0666);    CKERR(r);
+    r = db_create(&dbb, env, 0);                                                        CKERR(r);
+    r = dbb->open(dbb, NULL, nameb, NULL, DB_BTREE, DB_AUTO_COMMIT|DB_CREATE, 0666);    CKERR(r);
+    DB_TXN *txn;
+    r = env->txn_begin(env, NULL, &txn, 0);                                             CKERR(r);
+    {
+	DBT a={.data="a", .size=2};
+	DBT b={.data="b", .size=2};
+	r = dba->put(dba, txn, &a, &b, 0);                                              CKERR(r);
+	r = env->txn_checkpoint(env, 0, 0, 0);                                          CKERR(r);
+	r = dbb->put(dbb, txn, &b, &a, 0);                                              CKERR(r);
+    }
+    //printf("opened\n");
+    if (do_commit) {
+	r = txn->commit(txn, 0);                                                        CKERR(r);
+    }
+    //printf("shutdown\n");
+    abort();
+}
+
+static void
+do_x1_recover (BOOL did_commit)
+{
+    DB_ENV *env;
+    DB *dba, *dbb;
+    int r;
+    r = db_env_create(&env, 0);                                                             CKERR(r);
+    r = env->open(env, ENVDIR, envflags, S_IRWXU+S_IRWXG+S_IRWXO);                          CKERR(r);
+    r = db_create(&dba, env, 0);                                                            CKERR(r);
+    r = dba->open(dba, NULL, namea, NULL, DB_BTREE, DB_AUTO_COMMIT|DB_CREATE, 0666);        CKERR(r);
+    r = db_create(&dbb, env, 0);                                                            CKERR(r);
+    r = dba->open(dbb, NULL, nameb, NULL, DB_BTREE, DB_AUTO_COMMIT|DB_CREATE, 0666);        CKERR(r);
+    DBT aa={.size=0}, ab={.size=0};
+    DBT ba={.size=0}, bb={.size=0};
+    DB_TXN *txn;
+    DBC *ca,*cb;
+    r = env->txn_begin(env, NULL, &txn, 0);                                                 CKERR(r);
+    r = dba->cursor(dba, txn, &ca, 0);                                                      CKERR(r);
+    r = dbb->cursor(dbb, txn, &cb, 0);                                                      CKERR(r);
+    int ra = ca->c_get(ca, &aa, &ab, DB_FIRST);                                             CKERR(r);
+    int rb = cb->c_get(cb, &ba, &bb, DB_FIRST);                                             CKERR(r);
+    if (did_commit) {
+	assert(ra==0);
+	assert(rb==0);
+	fprintf(stderr, "Both present. Yay!\n");
+    } else {
+	// It wasn't commited (it also wasn't aborted), but a checkpoint happened.
+	assert(ra==DB_NOTFOUND);
+	assert(rb==DB_NOTFOUND);
+	fprintf(stderr, "Neither present. Yay!\n");
+    }
+    r = ca->c_close(ca);                                                                    CKERR(r);
+    r = cb->c_close(cb);                                                                    CKERR(r);
+    r = txn->commit(txn, 0);                                                                CKERR(r);
+    r = dba->close(dba, 0);                                                                 CKERR(r);
+    r = dbb->close(dbb, 0);                                                                 CKERR(r);
+    r = env->close(env, 0);                                                                 CKERR(r);
+    exit(0);
+}
+
+const char *cmd;
+
+static void
+do_test_internal (BOOL commit)
+{
+    pid_t pid;
+    if (0 == (pid=fork())) {
+	int r=execl(cmd, verbose ? "-v" : "-q", commit ? "--commit" : "--abort", NULL);
+	assert(r==-1);
+	printf("execl failed: %d (%s)\n", errno, strerror(errno));
+	assert(0);
+    }
+    {
+	int r;
+	int status;
+	r = waitpid(pid, &status, 0);
+	//printf("signaled=%d sig=%d\n", WIFSIGNALED(status), WTERMSIG(status));
+	assert(WIFSIGNALED(status) && WTERMSIG(status)==SIGABRT);
+    }
+    // Now find out what happend
+    
+    if (0 == (pid = fork())) {
+	int r=execl(cmd, verbose ? "-v" : "-q", commit ? "--recover-commited" : "--recover-aborted", NULL);
+	assert(r==-1);
+	printf("execl failed: %d (%s)\n", errno, strerror(errno));
+	assert(0);
+    }
+    {
+	int r;
+	int status;
+	r = waitpid(pid, &status, 0);
+	//printf("recovery exited=%d\n", WIFEXITED(status));
+	assert(WIFEXITED(status) && WEXITSTATUS(status)==0);
+    }
+}
+
+static void
+do_test (void) {
+    do_test_internal(TRUE);
+    do_test_internal(FALSE);
+}
+
+BOOL do_commit=FALSE, do_abort=FALSE, do_recover_commited=FALSE,  do_recover_aborted=FALSE;
+
+static void
+x1_parse_args (int argc, char *argv[]) {
+    int resultcode;
+    cmd = argv[0];
+    argc--; argv++;
+    while (argc>0) {
+	if (strcmp(argv[0], "-v") == 0) {
+	    verbose++;
+	} else if (strcmp(argv[0],"-q")==0) {
+	    verbose--;
+	    if (verbose<0) verbose=0;
+	} else if (strcmp(argv[0],"--abort")==0) {
+	    do_abort=1;
+	} else if (strcmp(argv[0],"--commit")==0) {
+	    do_commit=1;
+	} else if (strcmp(argv[0],"--recover-commited")==0) {
+	    do_recover_commited=1;
+	} else if (strcmp(argv[0],"--recover-aborted")==0) {
+	    do_recover_aborted=1;
+	} else if (strcmp(argv[0], "-h")==0) {
+	    resultcode=0;
+	do_usage:
+	    fprintf(stderr, "Usage:\n%s [-v|-q]* [-h] {--abort | --commit | --recover-commited | --recover-aborted } \n", cmd);
+	    exit(resultcode);
+	} else {
+	    fprintf(stderr, "Unknown arg: %s\n", argv[0]);
+	    resultcode=1;
+	    goto do_usage;
+	}
+	argc--;
+	argv++;
+    }
+    {
+	int n_specified=0;
+	if (do_commit)            n_specified++;
+	if (do_abort)             n_specified++;
+	if (do_recover_commited)  n_specified++;
+	if (do_recover_aborted)   n_specified++;
+	if (n_specified>1) {
+	    printf("Specify only one of --commit or --abort or --recover-commited or --recover-aborted\n");
+	    resultcode=1;
+	    goto do_usage;
+	}
+    }
+}
+
+int
+test_main (int argc, char *argv[])
+{
+    x1_parse_args(argc, argv);
+    if (do_commit) {
+	do_x1_shutdown (TRUE);
+    } else if (do_abort) {
+	do_x1_shutdown (FALSE);
+    } else if (do_recover_commited) {
+	do_x1_recover(TRUE);
+    } else if (do_recover_aborted) {
+	do_x1_recover(FALSE);
+    } else {
+	do_test();
+    }
+    return 0;
+}