curvefs/client: fix RefreshInode do not refresh when inode exist

Signed-off-by: ilixiaocui <ilixiaocui@163.com>
opencurve · Aug 10, 2022 · c585e47 · c585e47
1 parent 207f26b
commit c585e47
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/curvefs/src/client/inode_cache_manager.cpp b/curvefs/src/client/inode_cache_manager.cpp
@@ -153,6 +153,7 @@ InodeCacheManagerImpl::RefreshInode(uint64_t inodeId) {
             option_.maxDataSize, option_.refreshDataIntervalSec);
     } else {
         lgGuard = out->GetUniqueLock();
+        streaming = true;
     }
 
     // refresh data

diff --git a/curvefs/src/client/inode_wrapper.cpp b/curvefs/src/client/inode_wrapper.cpp
@@ -524,7 +524,7 @@ void InodeWrapper::AsyncS3(MetaServerClientDone *done, bool internal) {
         LockSyncingS3ChunkInfo();
         DataIndices indices;
         if (!s3ChunkInfoAdd_.empty()) {
-            indices.s3ChunkInfoMap = std::move(s3ChunkInfoAdd_);
+            indices.s3ChunkInfoMap = s3ChunkInfoAdd_;
         }
         metaClient_->UpdateInodeWithOutNlinkAsync(
             inode_, new UpdateInodeAsyncS3Done{shared_from_this(), done},

diff --git a/curvefs/test/client/test_inode_cache_manager.cpp b/curvefs/test/client/test_inode_cache_manager.cpp
@@ -208,6 +208,15 @@ TEST_F(TestInodeCacheManager, RefreshInode) {
               iCacheManager_->GetInode(inodeId, inodeWrapper));
     ASSERT_EQ(inodenew.length(), inodeWrapper->GetLength());
 
+    // cache hit, refresh s3-inode from metaserver, need streaming
+    EXPECT_CALL(*metaClient_, GetInode(fsId_, inodeId, _, _))
+        .WillOnce(DoAll(SetArgPointee<2>(inodenew), SetArgPointee<3>(true),
+                        Return(MetaStatusCode::OK)));
+    EXPECT_CALL(*metaClient_,
+                GetOrModifyS3ChunkInfo(fsId_, inodeId, _, true, _, _))
+        .WillOnce(Return(MetaStatusCode::OK));
+    ASSERT_EQ(CURVEFS_ERROR::OK, iCacheManager_->RefreshInode(inodeId));
+
     // cache miss, get file-inode from metaserver
     Inode inodefile;
     uint64_t inodefileid = 300;