[feat]curvefs/client: support change diskcacheConf on fly

Signed-off-by: Cyber-SiKu <Cyber-SiKu@outlook.com>
opencurve · Sep 4, 2023 · b1eb512 · b1eb512
1 parent 069a5f0
commit b1eb512
Show file tree

Hide file tree

Showing 7 changed files with 297 additions and 159 deletions.
diff --git a/curvefs/conf/client.conf b/curvefs/conf/client.conf
@@ -244,10 +244,19 @@ diskCache.forceFlush=true
 diskCache.trimCheckIntervalSec=5
 # the interval of check to trim load file to s3
 diskCache.asyncLoadPeriodMs=5
-# start trim file when disk cache use ratio is Greater than fullRatio,
-# util less than safeRatio
+#        ok           nearfull               full
+#  |------------|-------------------|----------------------|
+#  0     trimRatio*safeRatio    safeRatio               fullRatio
+# 
+#  1. 0<=ok<trimRatio*safeRatio;
+#  2. trimRatio*safeRatio<=nearfull<safeRatio
+#  3. safeRatio<=full<=fullRatio
+#  If the status is ok or ok->nearfull does not clean up
+#  If the status is full or
+#  full->nearfull clean up
 diskCache.fullRatio=90
 diskCache.safeRatio=70
+diskCache.trimRatio=50
 diskCache.threads=5
 # the max size disk cache can use
 diskCache.maxUsableSpaceBytes=107374182400

diff --git a/curvefs/src/client/common/config.cpp b/curvefs/src/client/common/config.cpp
@@ -183,6 +183,8 @@ void InitDiskCacheOption(Configuration *conf,
                               &diskCacheOption->fullRatio);
     conf->GetValueFatalIfFail("diskCache.safeRatio",
                               &diskCacheOption->safeRatio);
+    conf->GetValueFatalIfFail("diskCache.trimRatio",
+                              &diskCacheOption->trimRatio);
     conf->GetValueFatalIfFail("diskCache.maxUsableSpaceBytes",
                               &diskCacheOption->maxUsableSpaceBytes);
     conf->GetValueFatalIfFail("diskCache.maxFileNums",

diff --git a/curvefs/src/client/common/config.h b/curvefs/src/client/common/config.h
@@ -89,9 +89,11 @@ struct DiskCacheOption {
     // async load interval
     uint64_t asyncLoadPeriodMs;
     // trim start if disk usage over fullRatio
-    uint64_t fullRatio;
-    // trim finish until disk usage below safeRatio
-    uint64_t safeRatio;
+    uint32_t fullRatio = 90;
+    // disk usage safeRatio
+    uint32_t safeRatio = 70;
+    // trim finish until disk usage < safeRatio*trimRatio/100
+    uint32_t trimRatio = 50;
     // the max size disk cache can use
     uint64_t maxUsableSpaceBytes;
     // the max file nums can cache