Fixes for journal replay, and drop the "superblock" cloud item.
[bluesky.git] / bluesky / inode.c
index d284479..00e1142 100644 (file)
@@ -50,14 +50,9 @@ void bluesky_inode_update_ctime(BlueSkyInode *inode, gboolean update_mtime)
     g_mutex_lock(inode->fs->lock);
     bluesky_list_unlink(&inode->fs->unlogged_list, inode->unlogged_list);
     inode->unlogged_list = bluesky_list_prepend(&inode->fs->unlogged_list, inode);
-    bluesky_list_unlink(&inode->fs->dirty_list, inode->dirty_list);
-    inode->dirty_list = bluesky_list_prepend(&inode->fs->dirty_list, inode);
     bluesky_list_unlink(&inode->fs->accessed_list, inode->accessed_list);
     inode->accessed_list = bluesky_list_prepend(&inode->fs->accessed_list, inode);
     g_mutex_unlock(inode->fs->lock);
-
-    bluesky_cloudlog_unref(inode->committed_item);
-    inode->committed_item = NULL;
 }
 
 /* Unfortunately a glib hash table is only guaranteed to be able to store
@@ -94,6 +89,7 @@ BlueSkyFS *bluesky_new_fs(gchar *name)
     fs->flushd_cond = g_cond_new();
     fs->locations = g_hash_table_new(bluesky_cloudlog_hash,
                                      bluesky_cloudlog_equal);
+    fs->inode_map = g_sequence_new(NULL);
 
     fs->log_state = g_new0(BlueSkyCloudLogState, 1);
     fs->log_state->data = g_string_new("");
@@ -103,21 +99,6 @@ BlueSkyFS *bluesky_new_fs(gchar *name)
 
 BlueSkyFS *bluesky_init_fs(gchar *name, BlueSkyStore *store)
 {
-    BlueSkyRCStr *data = bluesky_store_get(store, "superblock");
-    if (data != NULL) {
-        BlueSkyFS *fs = bluesky_deserialize_superblock(data->data);
-        if (fs != NULL) {
-            fs->store = store;
-            fs->log = bluesky_log_new("journal");
-            fs->log->fs = fs;
-            g_print("Loaded filesystem superblock\n");
-            g_free(fs->name);
-            fs->name = g_strdup(name);
-            return fs;
-        }
-        bluesky_string_unref(data);
-    }
-
     g_print("Initializing fresh filesystem\n");
     BlueSkyFS *fs = bluesky_new_fs(name);
     fs->store = store;
@@ -131,8 +112,9 @@ BlueSkyFS *bluesky_init_fs(gchar *name, BlueSkyStore *store)
     bluesky_insert_inode(fs, root);
     bluesky_inode_update_ctime(root, TRUE);
 
+    bluesky_replay(fs);
+
     bluesky_inode_do_sync(root);
-    bluesky_superblock_flush(fs);
 
     return fs;
 }
@@ -143,6 +125,50 @@ void bluesky_inode_ref(BlueSkyInode *inode)
     g_atomic_int_inc(&inode->refcount);
 }
 
+/* Free most of the resources used by an inode structure, but do not free the
+ * inode itself.  Can be used if the inode data will be reloaded from
+ * serialized form to clear out old information first. */
+void bluesky_inode_free_resources(BlueSkyInode *inode)
+{
+    switch (inode->type) {
+    case BLUESKY_REGULAR:
+        if (inode->blocks != NULL) {
+            for (int i = 0; i < inode->blocks->len; i++) {
+                BlueSkyBlock *b = &g_array_index(inode->blocks,
+                                                 BlueSkyBlock, i);
+                if (b->type == BLUESKY_BLOCK_DIRTY) {
+                    g_error("Deleting an inode with dirty file data!");
+                }
+                bluesky_cloudlog_unref(b->ref);
+                bluesky_string_unref(b->dirty);
+            }
+            g_array_unref(inode->blocks);
+            inode->blocks = NULL;
+        }
+        break;
+
+    case BLUESKY_DIRECTORY:
+        if (inode->dirhash != NULL)
+            g_hash_table_destroy(inode->dirhash);
+        inode->dirhash = NULL;
+        if (inode->dirhash_folded != NULL)
+            g_hash_table_destroy(inode->dirhash_folded);
+        inode->dirhash_folded = NULL;
+        if (inode->dirents != NULL)
+            g_sequence_free(inode->dirents);
+        inode->dirents = NULL;
+        break;
+
+    case BLUESKY_SYMLINK:
+        g_free(inode->symlink_contents);
+        inode->symlink_contents = NULL;
+        break;
+
+    default:
+        break;
+    }
+}
+
 void bluesky_inode_unref(BlueSkyInode *inode)
 {
     if (g_atomic_int_dec_and_test(&inode->refcount)) {
@@ -169,38 +195,9 @@ void bluesky_inode_unref(BlueSkyInode *inode)
         bluesky_list_unlink(&inode->fs->unlogged_list, inode->unlogged_list);
         g_mutex_unlock(inode->fs->lock);
 
-        /* Free file type specific data.  It should be an error for there to be
-         * dirty data to commit when the reference count has reaches zero. */
-        switch (inode->type) {
-        case BLUESKY_REGULAR:
-            for (int i = 0; i < inode->blocks->len; i++) {
-                BlueSkyBlock *b = &g_array_index(inode->blocks,
-                                                 BlueSkyBlock, i);
-                if (b->type == BLUESKY_BLOCK_DIRTY) {
-                    g_error("Deleting an inode with dirty file data!");
-                }
-                bluesky_cloudlog_unref(b->ref);
-                bluesky_string_unref(b->dirty);
-            }
-            g_array_unref(inode->blocks);
-            break;
-
-        case BLUESKY_DIRECTORY:
-            g_hash_table_destroy(inode->dirhash);
-            g_hash_table_destroy(inode->dirhash_folded);
-            g_sequence_free(inode->dirents);
-            break;
-
-        case BLUESKY_SYMLINK:
-            g_free(inode->symlink_contents);
-            break;
-
-        default:
-            break;
-        }
+        bluesky_inode_free_resources(inode);
 
         g_mutex_free(inode->lock);
-
         g_free(inode);
     }
 }
@@ -214,8 +211,6 @@ uint64_t bluesky_fs_alloc_inode(BlueSkyFS *fs)
     inum = fs->next_inum;
     fs->next_inum++;
 
-    bluesky_superblock_flush(fs);
-
     return inum;
 }
 
@@ -320,6 +315,13 @@ void bluesky_inode_start_sync(BlueSkyInode *inode)
     g_mutex_lock(inode->fs->lock);
     bluesky_list_unlink(&inode->fs->unlogged_list, inode->unlogged_list);
     inode->unlogged_list = NULL;
+
+    /* Since a new version of the inode has been written to the log, also
+     * schedule a future flush of the new data to cloud storage. */
+    bluesky_list_unlink(&inode->fs->dirty_list, inode->dirty_list);
+    inode->dirty_list = bluesky_list_prepend(&inode->fs->dirty_list, inode);
+    inode->change_cloud = inode->change_count;
+
     g_mutex_unlock(inode->fs->lock);
 }
 
@@ -345,8 +347,7 @@ static void complete_inode_fetch(BlueSkyStoreAsync *async, BlueSkyInode *inode)
               "Completing fetch of inode %"PRIu64"...", inode->inum);
     }
 
-    if (async->result != 0
-        || !bluesky_deserialize_inode(inode, async->data->data))
+    if (async->result != 0 || FALSE)
     {
         if (bluesky_verbose) {
             g_log("bluesky/inode", G_LOG_LEVEL_DEBUG,
@@ -399,22 +400,3 @@ void bluesky_inode_fetch(BlueSkyFS *fs, uint64_t inum)
 
     bluesky_store_async_unref(async);
 }
-
-/* Synchronize filesystem superblock to stable storage. */
-void bluesky_superblock_flush(BlueSkyFS *fs)
-{
-#if 0
-    GString *buf = g_string_new("");
-    bluesky_serialize_superblock(buf, fs);
-    BlueSkyRCStr *data = bluesky_string_new_from_gstring(buf);
-
-    BlueSkyStoreAsync *async = bluesky_store_async_new(fs->store);
-    async->op = STORE_OP_PUT;
-    async->key = g_strdup("superblock");
-    async->data = data;
-    bluesky_store_async_submit(async);
-    bluesky_store_async_unref(async);
-
-    //bluesky_store_sync(fs->store);
-#endif
-}