if (inode->change_time == 0)
inode->change_time = now;
+#if 0
if (bluesky_options.writethrough_cache)
bluesky_file_flush(inode, NULL);
+#endif
g_mutex_lock(inode->fs->lock);
- 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->unlogged_list, inode->unlogged_list);
+ inode->unlogged_list = bluesky_list_prepend(&inode->fs->unlogged_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_fs_key_equal_func);
fs->next_inum = BLUESKY_ROOT_INUM + 1;
fs->store = bluesky_store_new("file");
+ fs->flushd_lock = g_mutex_new();
+ 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("");
return fs;
}
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;
- 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;
+ fs->log = bluesky_log_new("journal");
+ fs->log->fs = fs;
BlueSkyInode *root = bluesky_new_inode(BLUESKY_ROOT_INUM, fs,
BLUESKY_DIRECTORY);
bluesky_insert_inode(fs, root);
bluesky_inode_update_ctime(root, TRUE);
- bluesky_inode_flush(fs, root);
- bluesky_superblock_flush(fs);
+ bluesky_replay(fs);
+
+ bluesky_inode_do_sync(root);
return fs;
}
g_atomic_int_inc(&inode->refcount);
}
-void bluesky_inode_unref(BlueSkyInode *inode)
+/* 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)
{
- if (g_atomic_int_dec_and_test(&inode->refcount)) {
- g_print("Reference count for inode %"PRIu64" dropped to zero.\n",
- inode->inum);
-
- /* Sanity check: Is the inode clean? */
- if (inode->change_commit < inode->change_count
- || inode->dirty_list != NULL) {
- g_warning("Dropping inode which is not clean (commit %"PRIi64" < change %"PRIi64"; dirty_list = %p)\n", inode->change_commit, inode->change_count, inode->dirty_list);
- }
-
- g_mutex_lock(inode->fs->lock);
- bluesky_list_unlink(&inode->fs->accessed_list, inode->accessed_list);
- bluesky_list_unlink(&inode->fs->dirty_list, inode->dirty_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:
+ 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!");
}
- g_free(b->ref);
- bluesky_string_unref(b->data);
+ bluesky_cloudlog_unref(b->ref);
+ bluesky_string_unref(b->dirty);
}
g_array_unref(inode->blocks);
- break;
+ inode->blocks = NULL;
+ }
+ break;
- case BLUESKY_DIRECTORY:
+ 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);
- break;
+ inode->dirents = NULL;
+ break;
+
+ case BLUESKY_SYMLINK:
+ g_free(inode->symlink_contents);
+ inode->symlink_contents = NULL;
+ break;
+
+ default:
+ break;
+ }
+}
- case BLUESKY_SYMLINK:
- g_free(inode->symlink_contents);
- break;
+void bluesky_inode_unref(BlueSkyInode *inode)
+{
+ if (g_atomic_int_dec_and_test(&inode->refcount)) {
+ if (bluesky_verbose) {
+ g_log("bluesky/inode", G_LOG_LEVEL_DEBUG,
+ "Reference count for inode %"PRIu64" dropped to zero.",
+ inode->inum);
+ }
- default:
- break;
+ /* Sanity check: Is the inode clean? */
+ if (inode->change_commit < inode->change_count
+ || inode->accessed_list != NULL
+ || inode->unlogged_list != NULL
+ || inode->dirty_list != NULL) {
+ g_warning("Dropping inode which is not clean (commit %"PRIi64" < change %"PRIi64"; accessed_list = %p; dirty_list = %p)\n", inode->change_commit, inode->change_count, inode->accessed_list, inode->dirty_list);
}
- g_mutex_free(inode->lock);
+ /* These shouldn't be needed, but in case the above warning fires and
+ * we delete the inode anyway, we ought to be sure the inode is not on
+ * any LRU list. */
+ g_mutex_lock(inode->fs->lock);
+ bluesky_list_unlink(&inode->fs->accessed_list, inode->accessed_list);
+ bluesky_list_unlink(&inode->fs->dirty_list, inode->dirty_list);
+ bluesky_list_unlink(&inode->fs->unlogged_list, inode->unlogged_list);
+ g_mutex_unlock(inode->fs->lock);
+ bluesky_inode_free_resources(inode);
+
+ g_mutex_free(inode->lock);
g_free(inode);
}
}
inum = fs->next_inum;
fs->next_inum++;
- bluesky_superblock_flush(fs);
-
return inum;
}
g_hash_table_insert(fs->inodes, &inode->inum, inode);
}
-/* Deprecated: Synchronize an inode to stable storage. */
-void bluesky_inode_flush(BlueSkyFS *fs, BlueSkyInode *inode)
+/* Start writeback of an inode and all associated data. */
+void bluesky_inode_start_sync(BlueSkyInode *inode)
{
- GString *buf = g_string_new("");
- bluesky_serialize_inode(buf, inode);
- BlueSkyRCStr *data = bluesky_string_new_from_gstring(buf);
+ GList *log_items = NULL;
- char key[64];
- sprintf(key, "inode-%016"PRIx64, inode->inum);
+ if (inode->type == BLUESKY_REGULAR)
+ bluesky_file_flush(inode, &log_items);
- BlueSkyStoreAsync *async = bluesky_store_async_new(fs->store);
- async->op = STORE_OP_PUT;
- async->key = g_strdup(key);
- async->data = data;
- bluesky_store_async_submit(async);
- bluesky_store_async_unref(async);
-}
+ BlueSkyCloudLog *cloudlog = bluesky_serialize_inode(inode);
-/* Start writeback of an inode and all associated data. */
-void bluesky_inode_start_sync(BlueSkyInode *inode, BlueSkyStoreAsync *barrier)
-{
- BlueSkyFS *fs = inode->fs;
+ bluesky_cloudlog_unref(inode->committed_item);
+ inode->committed_item = cloudlog;
- if (inode->type == BLUESKY_REGULAR)
- bluesky_file_flush(inode, barrier);
+ bluesky_cloudlog_sync(cloudlog);
+ bluesky_cloudlog_ref(cloudlog);
+ log_items = g_list_prepend(log_items, cloudlog);
- GString *buf = g_string_new("");
- bluesky_serialize_inode(buf, inode);
- BlueSkyRCStr *data = bluesky_string_new_from_gstring(buf);
+ /* Wait for all log items to be committed to disk. */
+ bluesky_log_finish_all(log_items);
- char key[64];
- sprintf(key, "inode-%016"PRIx64, inode->inum);
+ /* Mark the inode as clean */
+ inode->change_commit = inode->change_count;
+ inode->change_time = 0;
+ g_mutex_lock(inode->fs->lock);
+ bluesky_list_unlink(&inode->fs->unlogged_list, inode->unlogged_list);
+ inode->unlogged_list = NULL;
- BlueSkyStoreAsync *async = bluesky_store_async_new(fs->store);
- async->op = STORE_OP_PUT;
- async->key = g_strdup(key);
- async->data = data;
- bluesky_store_async_submit(async);
- if (barrier != NULL)
- bluesky_store_add_barrier(barrier, async);
- bluesky_store_async_unref(async);
+ /* 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);
}
/* Write back an inode and all associated data and wait for completion. Inode
* should already be locked. */
void bluesky_inode_do_sync(BlueSkyInode *inode)
{
- BlueSkyStoreAsync *barrier = bluesky_store_async_new(inode->fs->store);
- barrier->op = STORE_OP_BARRIER;
-
- g_log("bluesky/inode", G_LOG_LEVEL_DEBUG,
- "Synchronous writeback for inode %"PRIu64"...", inode->inum);
- bluesky_inode_start_sync(inode, barrier);
- bluesky_store_async_submit(barrier);
- bluesky_store_async_wait(barrier);
- bluesky_store_async_unref(barrier);
- g_log("bluesky/inode", G_LOG_LEVEL_DEBUG,
- "Writeback for inode %"PRIu64" complete", inode->inum);
+ if (bluesky_verbose) {
+ g_log("bluesky/inode", G_LOG_LEVEL_DEBUG,
+ "Synchronous writeback for inode %"PRIu64"...", inode->inum);
+ }
+ bluesky_inode_start_sync(inode);
+ if (bluesky_verbose) {
+ g_log("bluesky/inode", G_LOG_LEVEL_DEBUG,
+ "Writeback for inode %"PRIu64" complete", inode->inum);
+ }
}
static void complete_inode_fetch(BlueSkyStoreAsync *async, BlueSkyInode *inode)
{
- g_print("Completing fetch of inode %"PRIu64"...\n", inode->inum);
+ if (bluesky_verbose) {
+ g_log("bluesky/inode", G_LOG_LEVEL_DEBUG,
+ "Completing fetch of inode %"PRIu64"...", inode->inum);
+ }
- if (async->result != 0
- || !bluesky_deserialize_inode(inode, async->data->data))
+ if (async->result != 0 || FALSE)
{
- g_print(" failed to load inode, cleaning up\n");
+ if (bluesky_verbose) {
+ g_log("bluesky/inode", G_LOG_LEVEL_DEBUG,
+ " failed to load inode, cleaning up");
+ }
g_mutex_lock(inode->fs->lock);
g_hash_table_remove(inode->fs->inodes, &inode->inum);
+ bluesky_list_unlink(&inode->fs->accessed_list, inode->accessed_list);
+ inode->accessed_list = NULL;
g_mutex_unlock(inode->fs->lock);
bluesky_inode_unref(inode);
}
inode->access_time = bluesky_get_current_time();
g_mutex_lock(inode->fs->lock);
+ 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);
sprintf(key, "inode-%016"PRIx64, inum);
BlueSkyInode *inode = bluesky_new_inode(inum, fs, BLUESKY_PENDING);
+ inode->change_count = 0;
bluesky_inode_ref(inode); // Extra ref held by fetching process
g_mutex_lock(inode->lock);
bluesky_insert_inode(fs, inode);
bluesky_store_async_unref(async);
}
-
-/* Synchronize filesystem superblock to stable storage. */
-void bluesky_superblock_flush(BlueSkyFS *fs)
-{
- 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);
-}
projects / bluesky.git / blobdiff