Restart journal sequence numbering properly.

[bluesky.git] / bluesky / imap.c

diff --git a/bluesky/imap.c b/bluesky/imap.c
index 0cdf9c5..cc8f1ba 100644 (file)
--- a/bluesky/imap.c
+++ b/bluesky/imap.c
@@ -201,12 +201,13 @@ static void bluesky_inode_map_deserialize(BlueSkyFS *fs, BlueSkyCloudLog *imap)
         for (int j = 0; j < section->links->len; j++) {
             InodeMapEntry *entry;
             entry = bluesky_inode_map_lookup(fs->inode_map, *inum, 1);
-            entry->inum = *inum;
+            entry->inum = GUINT64_FROM_LE(*inum);
             entry->item = g_array_index(section->links,
-                                        BlueSkyCloudLog *, i);
+                                        BlueSkyCloudLog *, j);
             bluesky_cloudlog_ref(entry->item);
             entry->id = entry->item->id;
             entry->location = entry->item->location;
+            fs->next_inum = MAX(fs->next_inum, entry->inum + 1);
             inum++;
         }
         g_mutex_unlock(section->lock);
@@ -225,6 +226,7 @@ gboolean bluesky_checkpoint_load(BlueSkyFS *fs)
 
     g_print("Last cloud log segment: %s\n", last_segment);
     int seq = atoi(last_segment + 13);
+    fs->log_state->location.sequence = seq + 1;
 
     BlueSkyRCStr *last = bluesky_store_get(fs->store, last_segment);
     g_free(last_segment);
@@ -280,7 +282,7 @@ gboolean bluesky_checkpoint_load(BlueSkyFS *fs)
     g_mutex_unlock(commit->lock);
 
     bluesky_inode_map_deserialize(fs, commit);
-    bluesky_cloudlog_unref(commit);
+    //bluesky_cloudlog_unref(commit);
 
     return TRUE;
 }