curvefs: enable async read for FileCacheManager::ReadKVRequest

Signed-off-by: Ziy1-Tan <ajb459684460@gmail.com>
opencurve · May 8, 2023 · 1edc384 · 1edc384
1 parent 5f4acca
commit 1edc384
Show file tree

Hide file tree

Showing 14 changed files with 238 additions and 172 deletions.
diff --git a/curvefs/conf/client.conf b/curvefs/conf/client.conf
@@ -153,6 +153,8 @@ s3.threadScheduleInterval=3
 s3.cacheFlushIntervalSec=5
 s3.writeCacheMaxByte=838860800
 s3.readCacheMaxByte=209715200
+# file cache read thread num
+s3.readCacheThreads=5
 # http = 0, https = 1
 s3.http_scheme=0
 s3.verify_SSL=False

diff --git a/curvefs/src/client/BUILD b/curvefs/src/client/BUILD
@@ -73,6 +73,7 @@ cc_library(
         "//curvefs/src/common:dynamic_vlog",
         "@com_google_absl//absl/memory",
         "@com_google_absl//absl/strings",
+        "@com_google_absl//absl/synchronization",
         "@com_google_absl//absl/meta:type_traits",
         "@com_google_absl//absl/types:optional",
         "@com_google_googletest//:gtest_prod",

diff --git a/curvefs/src/client/common/config.cpp b/curvefs/src/client/common/config.cpp
@@ -175,6 +175,8 @@ void InitS3Option(Configuration *conf, S3Option *s3Opt) {
                               &s3Opt->s3ClientAdaptorOpt.writeCacheMaxByte);
     conf->GetValueFatalIfFail("s3.readCacheMaxByte",
                               &s3Opt->s3ClientAdaptorOpt.readCacheMaxByte);
+    conf->GetValueFatalIfFail("s3.readCacheThreads",
+                              &s3Opt->s3ClientAdaptorOpt.readCacheThreads);
     conf->GetValueFatalIfFail("s3.nearfullRatio",
                               &s3Opt->s3ClientAdaptorOpt.nearfullRatio);
     conf->GetValueFatalIfFail("s3.baseSleepUs",

diff --git a/curvefs/src/client/common/config.h b/curvefs/src/client/common/config.h
@@ -131,6 +131,7 @@ struct S3ClientAdaptorOption {
     uint32_t flushIntervalSec;
     uint64_t writeCacheMaxByte;
     uint64_t readCacheMaxByte;
+    uint32_t readCacheThreads;
     uint32_t nearfullRatio;
     uint32_t baseSleepUs;
     uint32_t maxReadRetryIntervalMs;

diff --git a/curvefs/src/client/fuse_s3_client.cpp b/curvefs/src/client/fuse_s3_client.cpp
@@ -70,7 +70,9 @@ CURVEFS_ERROR FuseS3Client::Init(const FuseClientOption &option) {
     auto fsCacheManager = std::make_shared<FsCacheManager>(
         dynamic_cast<S3ClientAdaptorImpl *>(s3Adaptor_.get()),
         opt.s3Opt.s3ClientAdaptorOpt.readCacheMaxByte,
-        opt.s3Opt.s3ClientAdaptorOpt.writeCacheMaxByte, kvClientManager_);
+        opt.s3Opt.s3ClientAdaptorOpt.writeCacheMaxByte,
+        opt.s3Opt.s3ClientAdaptorOpt.readCacheThreads,
+        kvClientManager_);
     if (opt.s3Opt.s3ClientAdaptorOpt.diskCacheOpt.diskCacheType !=
         DiskCacheType::Disable) {
         auto s3DiskCacheClient = std::make_shared<S3ClientImpl>();

diff --git a/curvefs/src/client/s3/client_s3_adaptor.cpp b/curvefs/src/client/s3/client_s3_adaptor.cpp
@@ -100,6 +100,7 @@ S3ClientAdaptorImpl::Init(
               << ", flushIntervalSec: " << option.flushIntervalSec
               << ", writeCacheMaxByte: " << option.writeCacheMaxByte
               << ", readCacheMaxByte: " << option.readCacheMaxByte
+              << ", readCacheThreads: " << option.readCacheThreads
               << ", nearfullRatio: " << option.nearfullRatio
               << ", baseSleepUs: " << option.baseSleepUs;
     // start chunk flush threads