curve-fuse: skip refresh volume extent when inode has no data

Signed-off-by: Hanqing Wu <[email protected]>
opencurve · Aug 4, 2022 · d7478af · d7478af
1 parent 25081fc
commit d7478af
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/curvefs/src/client/inode_cache_manager.cpp b/curvefs/src/client/inode_cache_manager.cpp
@@ -122,7 +122,10 @@ InodeCacheManagerImpl::GetInode(uint64_t inodeId,
         option_.refreshDataIntervalSec);
 
     // refresh data
-    REFRESH_DATA_REMOTE(out, streaming);
+    {
+        curve::common::UniqueLock lgGuard = out->GetUniqueLock();
+        REFRESH_DATA_REMOTE(out, streaming);
+    }
 
     // put to cache
     PUT_INODE_CACHE(inodeId, out);
@@ -483,11 +486,14 @@ InodeCacheManagerImpl::RefreshData(std::shared_ptr<InodeWrapper> &inode,
         }
         break;
 
-    case FsFileType::TYPE_FILE:
-        rc = inode->RefreshVolumeExtent();
-        LOG_IF(ERROR, rc != CURVEFS_ERROR::OK)
-            << "RefreshVolumeExtent failed, error: " << rc;
+    case FsFileType::TYPE_FILE: {
+        if (inode->GetLengthLocked() > 0) {
+            rc = inode->RefreshVolumeExtent();
+            LOG_IF(ERROR, rc != CURVEFS_ERROR::OK)
+                << "RefreshVolumeExtent failed, error: " << rc;
+        }
         break;
+    }
 
     default:
         rc = CURVEFS_ERROR::OK;

diff --git a/curvefs/src/client/inode_wrapper.h b/curvefs/src/client/inode_wrapper.h
@@ -164,6 +164,12 @@ class InodeWrapper : public std::enable_shared_from_this<InodeWrapper> {
         return inode_.length();
     }
 
+    // Get inode's length.
+    // REQUIRES: |mtx_| is held
+    uint64_t GetLengthLocked() const {
+        return inode_.length();
+    }
+
     void SetUid(uint32_t uid) {
         inode_.set_uid(uid);
         dirty_ = true;

diff --git a/curvefs/test/client/test_inode_cache_manager.cpp b/curvefs/test/client/test_inode_cache_manager.cpp
@@ -214,6 +214,7 @@ TEST_F(TestInodeCacheManager, RefreshInode) {
     inodefile.set_inodeid(inodefileid);
     inodefile.set_fsid(fsId_);
     inodefile.set_type(FsFileType::TYPE_FILE);
+    inodefile.set_length(1);
     EXPECT_CALL(*metaClient_, GetInode(fsId_, inodefileid, _, _))
         .WillOnce(DoAll(SetArgPointee<2>(inodefile), SetArgPointee<3>(false),
                         Return(MetaStatusCode::OK)));