recovery checks for logcursor errors refs[t:2443]

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

recovery checks for logcursor errors refs[t:2443]
git-svn-id: file:///svn/toku/tokudb@18343 c7de825b-a66e-492c-adef-691d508d4ae1
9cf0c76e · Rich Prohaska · Yoni Fogel · 9faf3006 · 9cf0c76e
Commit 9cf0c76e authored Mar 11, 2010 by Rich Prohaska Committed by Yoni Fogel Apr 16, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 9 deletions

newbrt/recover.c newbrt/recover.c +10 -9

No files found.
--- a/newbrt/recover.c
+++ b/newbrt/recover.c
@@ -1174,10 +1174,10 @@ static int do_recovery(RECOVER_ENV renv, const char *env_dir, const char *log_di
        if (tokudb_recovery_trace) 
            recover_trace_le(__FUNCTION__, __LINE__, r, le);
        if (r != 0) {
-            if (r == DB_RUNRECOVERY) {
-                rr = DB_RUNRECOVERY; goto errorexit;
-            }
-            break;
+            if (r == DB_NOTFOUND)
+                break;
+            rr = DB_RUNRECOVERY; 
+            goto errorexit;
        }

        // trace progress
@@ -1238,7 +1238,8 @@ static int do_recovery(RECOVER_ENV renv, const char *env_dir, const char *log_di
        if (r != 0) {
            if (tokudb_recovery_trace) 
                fprintf(stderr, "DB_RUNRECOVERY: %s:%d r=%d\n", __FUNCTION__, __LINE__, r);
-            rr = DB_RUNRECOVERY; goto errorexit;
+            rr = DB_RUNRECOVERY; 
+            goto errorexit;
        }

        // get the next log entry
@@ -1247,10 +1248,10 @@ static int do_recovery(RECOVER_ENV renv, const char *env_dir, const char *log_di
        if (tokudb_recovery_trace) 
            recover_trace_le(__FUNCTION__, __LINE__, r, le);
        if (r != 0) {
-            if (r == DB_RUNRECOVERY) {
-                rr = DB_RUNRECOVERY; goto errorexit;
-            }
-            break;
+            if (r == DB_NOTFOUND)
+                break;
+            rr = DB_RUNRECOVERY; 
+            goto errorexit;
        }        
    }