X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Fcache.c;h=8cd2fb3a67fb4fc36c5a91b2ba60f90a79e67b2f;hb=7c753dc524614a26784edd7b00fc8fcbe9768d74;hp=b20960c1a7c4b5d0ee741c0dfebb79eb94646226;hpb=b52abd849493636b81dda8c752a60834f1a6b91f;p=bluesky.git diff --git a/bluesky/cache.c b/bluesky/cache.c index b20960c..8cd2fb3 100644 --- a/bluesky/cache.c +++ b/bluesky/cache.c @@ -433,27 +433,32 @@ static int compute_pressure(BlueSkyFS *fs) if (g_atomic_int_get(&fs->cache_dirty) + g_atomic_int_get(&fs->cache_log_dirty) > bluesky_watermark_high_dirty) + { + g_print("pressure: too much dirty data (2)\n"); return 2; + } /* Too much uncommitted data in the journal on disk, not yet flushed to the * cloud? */ - printf("Dirty journals: %d to %d\n", - fs->log->journal_watermark, fs->log->seq_num); + /*printf("Dirty journals: %d to %d\n", + fs->log->journal_watermark, fs->log->seq_num);*/ int dirty_limit; 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) (2)\n", dirty_journals, dirty_limit); 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; }