Increase UFS removal rate to 300/s

... by request of testers who report 250+ as better for current high
performance traffic needs.

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 0c9b0ce791f8d4c5b2d1738f773c01cae974dea7..53e61cb82f06069f49496917be396c9bc8cb3440 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -4015,7 +4015,7 @@ DOC_START
        by cache_swap_high object eviction becomes more agressive.
 
        The value difference in percentages between low- and high-water
-       marks represent an eviction rate of 200 objects per second and
+       marks represent an eviction rate of 300 objects per second and
        the rate continues to scale in agressiveness by multiples of
        this above the high-water mark.
 
@@ -4043,7 +4043,7 @@ DOC_START
        eviction becomes more agressive.
 
        The value difference in percentages between low- and high-water
-       marks represent an eviction rate of 200 objects per second and
+       marks represent an eviction rate of 300 objects per second and
        the rate continues to scale in agressiveness by multiples of
        this above the high-water mark.
 

diff --git a/src/fs/ufs/UFSSwapDir.cc b/src/fs/ufs/UFSSwapDir.cc
index 552bb6e2862580dcae62a8ed732391564442a032..29845e444a1687279970433acb37a5593b113b48 100644 (file)
--- a/src/fs/ufs/UFSSwapDir.cc
+++ b/src/fs/ufs/UFSSwapDir.cc
@@ -473,7 +473,7 @@ Fs::Ufs::UFSSwapDir::maintain()
     int max_scan = (int) (f * 400.0 + 100.0);
 
     // try to purge only this many objects this cycle.
-    int max_remove = (int) (f * 200.0 + 20.0);
+    int max_remove = (int) (f * 300.0 + 20.0);
 
     /*
      * This is kinda cheap, but so we need this priority hack?