[fix]curvefs/client: warmup process

Fixed a bug where warm-up progress may not be added Signed-off-by: Cyber-SiKu <[email protected]>
opencurve · Nov 10, 2023 · bea74e3 · bea74e3
1 parent 80a9716
commit bea74e3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/curvefs/src/client/warmup/warmup_manager.cpp b/curvefs/src/client/warmup/warmup_manager.cpp
@@ -70,7 +70,8 @@ bool WarmupManagerS3Impl::AddWarmupFilelist(fuse_ino_t key,
         return false;
     }
     // add warmup Progress
-    if (AddWarmupProcess(key, path, type)) {
+    WriteLockGuard lock(inode2ProgressMutex_);
+    if (AddWarmupProcessLocked(key, path, type)) {
         LOG(INFO) << "add warmup list task:" << key;
         WriteLockGuard lock(warmupFilelistDequeMutex_);
         auto iter = FindWarmupFilelistByKeyLocked(key);
@@ -96,7 +97,8 @@ bool WarmupManagerS3Impl::AddWarmupFile(fuse_ino_t key, const std::string& path,
         return false;
     }
     // add warmup Progress
-    if (AddWarmupProcess(key, path, type)) {
+    WriteLockGuard lock(inode2ProgressMutex_);
+    if (AddWarmupProcessLocked(key, path, type)) {
         LOG(INFO) << "add warmup single task:" << key;
         FetchDentryEnqueue(key, path);
     }

diff --git a/curvefs/src/client/warmup/warmup_manager.h b/curvefs/src/client/warmup/warmup_manager.h
@@ -285,9 +285,8 @@ class WarmupManager {
      * @return true
      * @return false warmupProcess has been added
      */
-    virtual bool AddWarmupProcess(fuse_ino_t key, const std::string& path,
-                                  WarmupStorageType type) {
-        WriteLockGuard lock(inode2ProgressMutex_);
+    virtual bool AddWarmupProcessLocked(fuse_ino_t key, const std::string& path,
+                                        WarmupStorageType type) {
         auto retPg = inode2Progress_.emplace(key, WarmupProgress(type, path));
         return retPg.second;
     }