Back out dirty reference tracking, as the design was flawed.

[bluesky.git] / bluesky / cloudlog.c

diff --git a/bluesky/cloudlog.c b/bluesky/cloudlog.c
index 3809b00..e842fbf 100644 (file)
--- a/bluesky/cloudlog.c
+++ b/bluesky/cloudlog.c
@@ -207,14 +207,19 @@ void bluesky_cloudlog_fetch(BlueSkyCloudLog *log)
         log->data = bluesky_log_map_object(log->fs, -1, log->log_seq,
                                            log->log_offset, log->log_size);
         bluesky_cloudlog_stats_update(log, 1);
-    } else if (log->location_flags & CLOUDLOG_CLOUD) {
+    }
+
+    if (log->data == NULL && (log->location_flags & CLOUDLOG_CLOUD)) {
+        log->location_flags &= ~CLOUDLOG_JOURNAL;
         bluesky_cloudlog_stats_update(log, -1);
         log->data = bluesky_log_map_object(log->fs, log->location.directory,
                                            log->location.sequence,
                                            log->location.offset,
                                            log->location.size);
         bluesky_cloudlog_stats_update(log, 1);
-    } else {
+    }
+
+    if (log->data == NULL) {
         g_error("Unable to fetch cloudlog entry!");
     }
 
@@ -260,8 +265,12 @@ BlueSkyCloudPointer bluesky_cloudlog_serialize(BlueSkyCloudLog *log,
     g_string_append_len(state->data, (const char *)&header, sizeof(header));
     g_string_append_len(state->data, log->data->data, log->data->len);
 
-    log->location_flags |= CLOUDLOG_CLOUD;
+    /* TODO: We should mark the objects as committed on the cloud until the
+     * data is flushed and acknowledged. */
+    log->pending_write |= CLOUDLOG_CLOUD;
     bluesky_cloudlog_stats_update(log, 1);
+    state->writeback_list = g_slist_prepend(state->writeback_list, log);
+    bluesky_cloudlog_ref(log);
     g_mutex_unlock(log->lock);
 
     if (state->data->len > CLOUDLOG_SEGMENT_SIZE)
@@ -270,6 +279,50 @@ BlueSkyCloudPointer bluesky_cloudlog_serialize(BlueSkyCloudLog *log,
     return log->location;
 }
 
+typedef struct {
+    BlueSkyRCStr *data;
+    GSList *items;
+} SerializedRecord;
+
+static void cloudlog_flush_complete(BlueSkyStoreAsync *async,
+                                    SerializedRecord *record)
+{
+    g_print("Write of %s to cloud complete, status = %d\n",
+            async->key, async->result);
+
+    if (async->result >= 0) {
+        while (record->items != NULL) {
+            BlueSkyCloudLog *item = (BlueSkyCloudLog *)record->items->data;
+            g_mutex_lock(item->lock);
+            bluesky_cloudlog_stats_update(item, -1);
+            item->pending_write &= ~CLOUDLOG_CLOUD;
+            item->location_flags |= CLOUDLOG_CLOUD;
+            bluesky_cloudlog_stats_update(item, 1);
+            g_mutex_unlock(item->lock);
+            bluesky_cloudlog_unref(item);
+
+            record->items = g_slist_delete_link(record->items, record->items);
+        }
+
+        bluesky_string_unref(record->data);
+        g_slist_free(record->items);
+        g_free(record);
+    } else {
+        g_print("Write should be resubmitted...\n");
+
+        BlueSkyStoreAsync *async2 = bluesky_store_async_new(async->store);
+        async2->op = STORE_OP_PUT;
+        async2->key = g_strdup(async->key);
+        async2->data = record->data;
+        bluesky_string_ref(record->data);
+        bluesky_store_async_submit(async2);
+        bluesky_store_async_add_notifier(async2,
+                                         (GFunc)cloudlog_flush_complete,
+                                         record);
+        bluesky_store_async_unref(async2);
+    }
+}
+
 /* Finish up a partially-written cloud log segment and flush it to storage. */
 void bluesky_cloudlog_flush(BlueSkyFS *fs)
 {
@@ -280,15 +333,22 @@ void bluesky_cloudlog_flush(BlueSkyFS *fs)
     /* TODO: Append some type of commit record to the log segment? */
 
     g_print("Serializing %zd bytes of data to cloud\n", state->data->len);
+    SerializedRecord *record = g_new0(SerializedRecord, 1);
+    record->data = bluesky_string_new_from_gstring(state->data);
+    record->items = state->writeback_list;
+    state->writeback_list = NULL;
 
     BlueSkyStoreAsync *async = bluesky_store_async_new(fs->store);
     async->op = STORE_OP_PUT;
     async->key = g_strdup_printf("log-%08d-%08d",
                                  state->location.directory,
                                  state->location.sequence);
-    async->data = bluesky_string_new_from_gstring(state->data);
+    async->data = record->data;
+    bluesky_string_ref(record->data);
     bluesky_store_async_submit(async);
-    //bluesky_store_async_wait(async);
+    bluesky_store_async_add_notifier(async,
+                                     (GFunc)cloudlog_flush_complete,
+                                     record);
     bluesky_store_async_unref(async);
 
     state->location.sequence++;