X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Fcleaner.c;h=a892e723473b7d1fd816e65f7745db347c8a1c65;hb=2dc3639e4e8d1efee451d1e29b51a09b9c3bdc91;hp=ec2b5dd99eff09a8b2de80ec9730f50a8223529f;hpb=77511ae98a27a2db081b6e8b5374c4bf955b655f;p=bluesky.git

diff --git a/bluesky/cleaner.c b/bluesky/cleaner.c
index ec2b5dd..a892e72 100644
--- a/bluesky/cleaner.c
+++ b/bluesky/cleaner.c
@@ -115,7 +115,8 @@ static BlueSkyCleanerItem *bluesky_cleaner_find_checkpoint(BlueSkyFS *fs)
     if (last_segment == NULL)
         return NULL;
 
-    g_print("Last cloud log segment: %s\n", last_segment);
+    g_print("Last cloud log segment: %s (processed up to %d)\n",
+            last_segment, fs->log_state->latest_cleaner_seq_seen);
     int seq = atoi(last_segment + 13);
     g_free(last_segment);
 
@@ -142,8 +143,11 @@ static BlueSkyCleanerItem *bluesky_cleaner_find_checkpoint(BlueSkyFS *fs)
         length = item->length;
     }
 
-    if (length == 0)
+    if (length == 0) {
+        bluesky_cachefile_unref(cachefile);
+        g_mutex_unlock(cachefile->lock);
         return NULL;
+    }
 
     g_print("Found a cleaner checkpoint record.\n");
 
@@ -152,6 +156,8 @@ static BlueSkyCleanerItem *bluesky_cleaner_find_checkpoint(BlueSkyFS *fs)
     g_mutex_unlock(cachefile->lock);
 
     BlueSkyCleanerItem *checkpoint = bluesky_cleaner_deserialize(data);
+    checkpoint->location.directory = BLUESKY_CLOUD_DIR_CLEANER;
+    checkpoint->location.sequence = seq;
     bluesky_string_unref(data);
 
     return checkpoint;
@@ -197,6 +203,29 @@ gboolean needs_merging(BlueSkyFS *fs, BlueSkyCloudPointer location)
     return TRUE;
 }
 
+/* For an inode which has been modified by the cleaner and must be flushed out
+ * to cloud storage, mark it as appropriately dirty.  We will bypass writingt
+ * the inode to the journal if possible--but if there have ben other
+ * uncommitted changes besides what the cleaner did then we will force a
+ * journal write as well since the cloud shouldn't contain newer data than the
+ * journal.  Inode must be locked. */
+static void cleaner_flush_inode(BlueSkyInode *inode)
+{
+    // if (inode->change_commit != inode->change_count) {
+    if (TRUE) {
+        /* bluesky_inode_start_sync schedules a flush to the cloud so we're all
+         * done. */
+        bluesky_inode_start_sync(inode);
+        return;
+    }
+
+    g_assert(inode->unlogged_list == NULL);
+
+    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;
+}
+
 static void merge_inode(BlueSkyFS *fs, BlueSkyCleanerItem *cleaner_inode)
 {
     /* There are two versions we are concerned with: cleaner_ is for the data
@@ -216,8 +245,8 @@ static void merge_inode(BlueSkyFS *fs, BlueSkyCleanerItem *cleaner_inode)
 
     BlueSkyCloudLog *proxy_item = entry->item;
     g_mutex_lock(proxy_item->lock);
-    BlueSkyCloudPointer proxy_location = entry->item->location;
-    BlueSkyCloudID proxy_id = entry->item->id;
+    //BlueSkyCloudPointer proxy_location = entry->item->location;
+    //BlueSkyCloudID proxy_id = entry->item->id;
     g_mutex_unlock(proxy_item->lock);
     g_mutex_unlock(fs->lock);
 
@@ -251,6 +280,7 @@ static void merge_inode(BlueSkyFS *fs, BlueSkyCleanerItem *cleaner_inode)
             b->ref->location = cb->location;
         }
     }
+    cleaner_flush_inode(proxy_inode);
     g_mutex_unlock(proxy_inode->lock);
 
     /* Mark the inode as modified so it will get written back to the cloud.  We
@@ -273,6 +303,12 @@ void bluesky_cleaner_merge(BlueSkyFS *fs)
         return;
     }
 
+    if (checkpoint->type != LOGTYPE_CHECKPOINT) {
+        g_warning("Last cleaner object not a checkpoint; cleaning probably in progress.");
+        bluesky_cleaner_item_free(checkpoint);
+        return;
+    }
+
     /* Iterate over each of the inode map sections in the checkpoint */
     for (int i = 0; i < checkpoint->links->len; i++) {
         BlueSkyCleanerLink *link = &g_array_index(checkpoint->links,
@@ -302,5 +338,25 @@ void bluesky_cleaner_merge(BlueSkyFS *fs)
         bluesky_cleaner_item_free(imap);
     }
 
+    fs->log_state->latest_cleaner_seq_seen = checkpoint->location.sequence;
     bluesky_cleaner_item_free(checkpoint);
 }
+
+/* Run the cleaner as a background task. */
+static gpointer cleaner_thread(BlueSkyFS *fs)
+{
+    while (TRUE) {
+        struct timespec delay;
+        delay.tv_sec = 30;
+        delay.tv_nsec = 0;
+        nanosleep(&delay, NULL);
+        bluesky_cleaner_merge(fs);
+    }
+
+    return NULL;
+}
+
+void bluesky_cleaner_thread_launch(BlueSkyFS *fs)
+{
+    g_thread_create((GThreadFunc)cleaner_thread, fs, FALSE, NULL);
+}