Changeset e944e6d871dcff933a8da92b6efd7834bce03e59

Timestamp:

11/24/09 21:34:45 (4 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1259098485 +0000

git-parent:

[53aeed588114b6e346057869dab719cefe3000c9]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1259098485 +0000

Message:

attempt jlog repairs inline

Files:

• src/noit_jlog_listener.c (modified) (2 diffs)

src/noit_jlog_listener.c

@@ -37 +37 @@
-#include "utils/noit_log.h"
-#include "jlog/jlog.h"
+#include "jlog/jlog_private.h"
-#include "noit_jlog_listener.h"
-
@@ -153 +154 @@
-    jlog_get_checkpoint(jcl->jlog, ac->remote_cn, &jcl->chkpt);
-    jcl->count = jlog_ctx_read_interval(jcl->jlog, &jcl->start, &jcl->finish);
+    if(jcl->count < 0) {
+      char idxfile[PATH_MAX];
+      noitL(noit_error, "jlog_ctx_read_interval: %s\n",
+            jlog_ctx_err_string(jcl->jlog));
+      switch (jlog_ctx_err(jcl->jlog)) {
+        case JLOG_ERR_FILE_CORRUPT:
+        case JLOG_ERR_IDX_CORRUPT:
+          jlog_repair_datafile(jcl->jlog, jcl->start.log);
+          jlog_repair_datafile(jcl->jlog, jcl->start.log + 1);
+          noitL(noit_error,
+                "jlog reconstructed, deleting corresponding index.\n");
+          STRSETDATAFILE(jcl->jlog, idxfile, jcl->start.log);
+          strlcat(idxfile, INDEX_EXT, sizeof(idxfile));
+          unlink(idxfile);
+          STRSETDATAFILE(jcl->jlog, idxfile, jcl->start.log + 1);
+          strlcat(idxfile, INDEX_EXT, sizeof(idxfile));
+          unlink(idxfile);
+          goto alldone;
+          break;
+        default:
+          goto alldone;
+      }
+    }
-    if(jcl->count > MAX_ROWS_AT_ONCE) {
-      /* Artificially set down the range to make the batches a bit easier