X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Fcache.c;h=cdd5c65e30f65975b6bfe3c1991b19ae1952b98e;hb=7f01069131555a0e9ab332e578a9eb2815e1e12d;hp=f3307d40f899b3c52ee329fc8b37c09a13b24e26;hpb=e9bcb507c4e2ea94f38a9a947b620654d57bd6d0;p=bluesky.git

diff --git a/bluesky/cache.c b/bluesky/cache.c
index f3307d4..cdd5c65 100644
--- a/bluesky/cache.c
+++ b/bluesky/cache.c
@@ -424,16 +424,20 @@ void bluesky_flushd_invoke(BlueSkyFS *fs)
 /* How urgent is flushing out data?  Returns one of several values:
  *   0 - memory state is fine
  *   1 - should launch flushd if not already running
- *   2 - should block writers until memory frees up
+ *   2 - should delay writers while memory frees up
+ *   3 - should block writers until memory frees up
  */
 static int compute_pressure(BlueSkyFS *fs)
 {
-    /* LEVEL 2 */
+    /* LEVEL 3 */
     /* Too much dirty data in memory? */
     if (g_atomic_int_get(&fs->cache_dirty)
                 + g_atomic_int_get(&fs->cache_log_dirty)
            > bluesky_watermark_high_dirty)
-        return 2;
+    {
+        g_print("pressure: too much dirty data (3)\n");
+        return 3;
+    }
 
     /* Too much uncommitted data in the journal on disk, not yet flushed to the
      * cloud? */
@@ -443,17 +447,31 @@ static int compute_pressure(BlueSkyFS *fs)
     dirty_limit = bluesky_options.cache_size / (LOG_SEGMENT_SIZE / 1024) / 2;
     int dirty_journals = fs->log->seq_num - fs->log->journal_watermark + 1;
     if (dirty_journals > 1 && dirty_journals >= dirty_limit) {
-        printf("Too many dirty journals (%d >= %d)\n",
+        printf("pressure: too many dirty journals (%d >= %d) (3)\n",
                dirty_journals, dirty_limit);
+        return 3;
+    }
+
+    /* LEVEL 2 */
+    if (g_atomic_int_get(&fs->cache_dirty) > bluesky_watermark_med2_dirty) {
+        g_print("pressure: too much dirty data (2)\n");
+        return 2;
+    }
+
+    if (dirty_journals > 1 && dirty_journals > dirty_limit * 3 / 4) {
+        printf("pressure: many dirty journals (%d), should start writeback (2)\n",
+               dirty_journals);
         return 2;
     }
 
     /* LEVEL 1 */
-    if (g_atomic_int_get(&fs->cache_dirty) < bluesky_watermark_medium_dirty)
+    if (g_atomic_int_get(&fs->cache_dirty) > bluesky_watermark_medium_dirty) {
+        g_print("pressure: too much dirty data (1)\n");
         return 1;
+    }
 
     if (dirty_journals > 1 && dirty_journals > dirty_limit / 2) {
-        printf("Many dirty journals (%d), should start writeback\n",
+        printf("pressure: many dirty journals (%d), should start writeback (1)\n",
                dirty_journals);
         return 1;
     }
@@ -484,10 +502,19 @@ void bluesky_flushd_invoke_conditional(BlueSkyFS *fs)
               g_atomic_int_get(&fs->cache_log_dirty));
         g_mutex_lock(fs->lock);
         pressure = compute_pressure(fs);
-        if (pressure > 1)
+        if (pressure > 2) {
             g_cond_wait(fs->flushd_cond, fs->lock);
+        } else if (pressure > 1) {
+            /* Wait for up to 10 seconds. */
+            GTimeVal timeout;
+            g_get_current_time(&timeout);
+            g_time_val_add(&timeout, 10 * 1000 * 1000);
+            g_cond_timed_wait(fs->flushd_cond, fs->lock, &timeout);
+        }
         g_mutex_unlock(fs->lock);
         pressure = compute_pressure(fs);
+        if (pressure == 1)
+            break;  /* Do not loop indefinitely for a pressure of 1 */
     }
 }