[fix]curvefs/client: diskcahce may deadlock

Signed-off-by: Cyber-SiKu <[email protected]>
opencurve · Nov 10, 2023 · fd66669 · fd66669
1 parent 80a9716
commit fd66669
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/curvefs/src/client/s3/disk_cache_manager.cpp b/curvefs/src/client/s3/disk_cache_manager.cpp
@@ -419,14 +419,14 @@ void DiskCacheManager::TrimCache() {
     while (true) {
         UpdateDiskFsUsedRatio();
         waitIntervalSec_.WaitForNextExcution();
-        if (!isRunning_) {
-            LOG(INFO) << "trim thread end.";
-            return;
-        }
         VLOG(9) << "trim thread wake up.";
         InitQosParam();
         if (!IsDiskCacheSafe(kRatioLevel)) {
             while (!IsDiskCacheSafe(FLAGS_diskTrimRatio)) {
+                if (!isRunning_) {
+                    LOG(INFO) << "trim thread end.";
+                    return;
+                }
                 UpdateDiskFsUsedRatio();
                 if (!cachedObjName_->GetBack(&cacheKey)) {
                     VLOG_EVERY_N(9, 1000) << "obj is empty";