fix review

Signed-off-by: wanghai01 <seanhaizi@163.com>
opencurve · Dec 7, 2023 · 670ddfe · 670ddfe
1 parent 57fbcba
commit 670ddfe
Show file tree

Hide file tree

Showing 44 changed files with 194 additions and 249 deletions.
diff --git a/curvefs/proto/mds.proto b/curvefs/proto/mds.proto
@@ -234,9 +234,7 @@ message CommitTxResponse {
     required FSStatusCode statusCode = 1;
 }
 
-message TsoRequest {
-    required uint32 fsId = 1;
-}
+message TsoRequest {}
 
 message TsoResponse {
     required FSStatusCode statusCode = 1;

diff --git a/curvefs/src/client/client_operator.cpp b/curvefs/src/client/client_operator.cpp
@@ -306,7 +306,7 @@ CURVEFS_ERROR RenameOperator::PrewriteRenameTx(
 
 CURVEFS_ERROR RenameOperator::PrewriteTx() {
     uint64_t timestamp;
-    auto rc = mdsClient_->Tso(srcDentry_.fsid(), &startTs_, &timestamp);
+    auto rc = mdsClient_->Tso(&startTs_, &timestamp);
     if (rc != FSStatusCode::OK) {
         LOG_ERROR("start Tso", rc);
         return CURVEFS_ERROR::INTERNAL;
@@ -362,7 +362,7 @@ CURVEFS_ERROR RenameOperator::PrewriteTx() {
 CURVEFS_ERROR RenameOperator::CommitTxV2() {
     uint64_t commitTs;
     uint64_t timestamp;
-    auto rc = mdsClient_->Tso(srcDentry_.fsid(), &commitTs, &timestamp);
+    auto rc = mdsClient_->Tso(&commitTs, &timestamp);
     if (rc != FSStatusCode::OK) {
         LOG_ERROR("CommitTxV2 Tso", rc);
         return CURVEFS_ERROR::INTERNAL;

diff --git a/curvefs/src/client/client_operator.h b/curvefs/src/client/client_operator.h
@@ -27,8 +27,8 @@
 #include <vector>
 #include <memory>
 
-#include "curvefs/src/client/inode_cache_manager.h"
-#include "curvefs/src/client/dentry_cache_manager.h"
+#include "curvefs/src/client/inode_manager.h"
+#include "curvefs/src/client/dentry_manager.h"
 #include "curvefs/src/client/rpcclient/mds_client.h"
 
 namespace curvefs {

diff --git a/curvefs/src/client/dentry_cache_manager.cpp → curvefs/src/client/dentry_manager.cpp b/curvefs/src/client/dentry_cache_manager.cpp → curvefs/src/client/dentry_manager.cpp
@@ -20,7 +20,7 @@
  * Created Date: Thur May 27 2021
  * Author: xuchaojie
  */
-#include "curvefs/src/client/dentry_cache_manager.h"
+#include "curvefs/src/client/dentry_manager.h"
 
 #include <cstdint>
 #include <string>
@@ -93,7 +93,7 @@ CURVEFS_ERROR DentryCacheManagerImpl::GetDentry(uint64_t parent,
     while (ret == MetaStatusCode::TX_KEY_LOCKED) {
         uint64_t ts = 0;
         uint64_t timestamp = 0;
-        if (mdsClient_->Tso(fsId_, &ts, &timestamp) != FSStatusCode::OK) {
+        if (mdsClient_->Tso(&ts, &timestamp) != FSStatusCode::OK) {
             LOG(ERROR) << "GetDentry Tso failed, parent = " << parent
                        << ", name = " << name;
             return CURVEFS_ERROR::INTERNAL;
@@ -130,7 +130,7 @@ CURVEFS_ERROR DentryCacheManagerImpl::CreateDentry(const Dentry &dentry) {
     while (ret == MetaStatusCode::TX_KEY_LOCKED) {
         uint64_t ts = 0;
         uint64_t timestamp = 0;
-        if (mdsClient_->Tso(fsId_, &ts, &timestamp) != FSStatusCode::OK) {
+        if (mdsClient_->Tso(&ts, &timestamp) != FSStatusCode::OK) {
             LOG(ERROR) << "CreateDentry Tso failed, dentry = "
                        << dentry.ShortDebugString();
             return CURVEFS_ERROR::INTERNAL;
@@ -166,7 +166,7 @@ CURVEFS_ERROR DentryCacheManagerImpl::DeleteDentry(uint64_t parent,
     while (ret == MetaStatusCode::TX_KEY_LOCKED) {
         uint64_t ts = 0;
         uint64_t timestamp = 0;
-        if (mdsClient_->Tso(fsId_, &ts, &timestamp) != FSStatusCode::OK) {
+        if (mdsClient_->Tso(&ts, &timestamp) != FSStatusCode::OK) {
             LOG(ERROR) << "DeleteDentry Tso failed, parent = " << parent
                        << ", name = " << name;
             return CURVEFS_ERROR::INTERNAL;
@@ -222,7 +222,7 @@ CURVEFS_ERROR DentryCacheManagerImpl::ListDentry(uint64_t parent,
         if (ret == MetaStatusCode::TX_KEY_LOCKED) {
             uint64_t ts = 0;
             uint64_t timestamp = 0;
-            if (mdsClient_->Tso(fsId_, &ts, &timestamp) != FSStatusCode::OK) {
+            if (mdsClient_->Tso(&ts, &timestamp) != FSStatusCode::OK) {
                 LOG(ERROR) << "ListDentry Tso failed, parent = " << parent;
                 return CURVEFS_ERROR::INTERNAL;
             }

diff --git a/curvefs/src/client/dentry_cache_manager.h → curvefs/src/client/dentry_manager.h b/curvefs/src/client/dentry_cache_manager.h → curvefs/src/client/dentry_manager.h
@@ -21,8 +21,8 @@
  * Author: xuchaojie
  */
 
-#ifndef CURVEFS_SRC_CLIENT_DENTRY_CACHE_MANAGER_H_
-#define CURVEFS_SRC_CLIENT_DENTRY_CACHE_MANAGER_H_
+#ifndef CURVEFS_SRC_CLIENT_DENTRY_MANAGER_H_
+#define CURVEFS_SRC_CLIENT_DENTRY_MANAGER_H_
 
 #include <cstdint>
 #include <memory>
@@ -130,4 +130,4 @@ class DentryCacheManagerImpl : public DentryCacheManager {
 }  // namespace client
 }  // namespace curvefs
 
-#endif  // CURVEFS_SRC_CLIENT_DENTRY_CACHE_MANAGER_H_
+#endif  // CURVEFS_SRC_CLIENT_DENTRY_MANAGER_H_
diff --git a/curvefs/src/client/filesystem/package.h b/curvefs/src/client/filesystem/package.h
@@ -25,8 +25,8 @@
 
 #include <memory>
 
-#include "curvefs/src/client/dentry_cache_manager.h"
-#include "curvefs/src/client/inode_cache_manager.h"
+#include "curvefs/src/client/dentry_manager.h"
+#include "curvefs/src/client/inode_manager.h"
 #include "curvefs/src/client/xattr_manager.h"
 
 namespace curvefs {

diff --git a/curvefs/src/client/fuse_client.h b/curvefs/src/client/fuse_client.h
@@ -41,13 +41,13 @@
 #include "curvefs/src/client/client_operator.h"
 #include "curvefs/src/client/common/common.h"
 #include "curvefs/src/client/common/config.h"
-#include "curvefs/src/client/dentry_cache_manager.h"
+#include "curvefs/src/client/dentry_manager.h"
 #include "curvefs/src/client/dir_buffer.h"
 #include "curvefs/src/client/filesystem/error.h"
 #include "curvefs/src/client/filesystem/filesystem.h"
 #include "curvefs/src/client/filesystem/meta.h"
 #include "curvefs/src/client/fuse_common.h"
-#include "curvefs/src/client/inode_cache_manager.h"
+#include "curvefs/src/client/inode_manager.h"
 #include "curvefs/src/client/lease/lease_excutor.h"
 #include "curvefs/src/client/metric/client_metric.h"
 #include "curvefs/src/client/rpcclient/mds_client.h"

diff --git a/curvefs/src/client/inode_cache_manager.cpp → curvefs/src/client/inode_manager.cpp b/curvefs/src/client/inode_cache_manager.cpp → curvefs/src/client/inode_manager.cpp
@@ -21,7 +21,7 @@
  * Author: xuchaojie
  */
 
-#include "curvefs/src/client/inode_cache_manager.h"
+#include "curvefs/src/client/inode_manager.h"
 
 #include <glog/logging.h>
 #include <cstdint>

diff --git a/curvefs/src/client/inode_cache_manager.h → curvefs/src/client/inode_manager.h b/curvefs/src/client/inode_cache_manager.h → curvefs/src/client/inode_manager.h
@@ -21,8 +21,8 @@
  * Author: xuchaojie
  */
 
-#ifndef CURVEFS_SRC_CLIENT_INODE_CACHE_MANAGER_H_
-#define CURVEFS_SRC_CLIENT_INODE_CACHE_MANAGER_H_
+#ifndef CURVEFS_SRC_CLIENT_INODE_MANAGER_H_
+#define CURVEFS_SRC_CLIENT_INODE_MANAGER_H_
 
 #include <cstdint>
 #include <memory>
@@ -242,4 +242,4 @@ class BatchGetInodeAttrAsyncDone : public BatchGetInodeAttrDone {
 }  // namespace client
 }  // namespace curvefs
 
-#endif  // CURVEFS_SRC_CLIENT_INODE_CACHE_MANAGER_H_
+#endif  // CURVEFS_SRC_CLIENT_INODE_MANAGER_H_
diff --git a/curvefs/src/client/rpcclient/mds_client.cpp b/curvefs/src/client/rpcclient/mds_client.cpp
@@ -682,31 +682,27 @@ FSStatusCode MdsClientImpl::CommitTxWithLock(
     return CommitTx(request);
 }
 
-FSStatusCode MdsClientImpl::Tso(
-    uint32_t fsId, uint64_t* ts, uint64_t* timestamp) {
+FSStatusCode MdsClientImpl::Tso(uint64_t* ts, uint64_t* timestamp) {
     auto task = RPCTask {
         (void)addrindex;
         (void)rpctimeoutMS;
         mdsClientMetric_.tso.qps.count << 1;
         LatencyUpdater updater(&mdsClientMetric_.tso.latency);
         TsoRequest request;
-        request.set_fsid(fsId);
         TsoResponse response;
         mdsbasecli_->Tso(request, &response, cntl, channel);
         if (cntl->Failed()) {
             mdsClientMetric_.tso.eps.count << 1;
             LOG(WARNING) << "Tso Failed, errorcode = " << cntl->ErrorCode()
                          << ", error content:" << cntl->ErrorText()
-                         << ", fsId = " << fsId
                          << ", log id = " << cntl->log_id();
             return -cntl->ErrorCode();
         }
 
         FSStatusCode ret = response.statuscode();
         if (ret != FSStatusCode::OK) {
             LOG(ERROR) << "Tso: errcode = " << ret
-                       << ", errmsg = " << FSStatusCode_Name(ret)
-                       << ", fsId = " << fsId;
+                       << ", errmsg = " << FSStatusCode_Name(ret);
             return ret;
         } else {
             *ts = response.ts();

diff --git a/curvefs/src/client/rpcclient/mds_client.h b/curvefs/src/client/rpcclient/mds_client.h
@@ -137,8 +137,7 @@ class MdsClient {
                      const std::string& uuid,
                      uint64_t sequence) = 0;
 
-    virtual FSStatusCode Tso(uint32_t fsId, uint64_t* ts,
-        uint64_t* timestamp) = 0;
+    virtual FSStatusCode Tso(uint64_t* ts, uint64_t* timestamp) = 0;
 
     // allocate block group
     virtual SpaceErrCode AllocateVolumeBlockGroup(
@@ -227,7 +226,7 @@ class MdsClientImpl : public MdsClient {
                      const std::string& uuid,
                      uint64_t sequence) override;
 
-    FSStatusCode Tso(uint32_t fsId, uint64_t* ts, uint64_t* timestamp) override;
+    FSStatusCode Tso(uint64_t* ts, uint64_t* timestamp) override;
 
     // allocate block group
     SpaceErrCode AllocateVolumeBlockGroup(

diff --git a/curvefs/src/client/s3/client_s3_adaptor.h b/curvefs/src/client/s3/client_s3_adaptor.h
@@ -34,7 +34,7 @@
 #include "curvefs/src/client/common/common.h"
 #include "curvefs/src/client/common/config.h"
 #include "curvefs/src/client/filesystem/error.h"
-#include "curvefs/src/client/inode_cache_manager.h"
+#include "curvefs/src/client/inode_manager.h"
 #include "curvefs/src/client/rpcclient/mds_client.h"
 #include "curvefs/src/client/s3/client_s3.h"
 #include "curvefs/src/client/s3/client_s3_cache_manager.h"

diff --git a/curvefs/src/client/volume/default_volume_storage.cpp b/curvefs/src/client/volume/default_volume_storage.cpp
@@ -31,7 +31,7 @@
 
 #include "absl/meta/type_traits.h"
 #include "curvefs/src/client/filesystem/error.h"
-#include "curvefs/src/client/inode_cache_manager.h"
+#include "curvefs/src/client/inode_manager.h"
 #include "curvefs/src/client/inode_wrapper.h"
 #include "curvefs/src/client/volume/extent_cache.h"
 #include "curvefs/src/client/volume/utils.h"

diff --git a/curvefs/src/client/warmup/warmup_manager.h b/curvefs/src/client/warmup/warmup_manager.h
@@ -40,9 +40,9 @@
 #include <vector>
 
 #include "curvefs/src/client/common/common.h"
-#include "curvefs/src/client/dentry_cache_manager.h"
+#include "curvefs/src/client/dentry_manager.h"
 #include "curvefs/src/client/fuse_common.h"
-#include "curvefs/src/client/inode_cache_manager.h"
+#include "curvefs/src/client/inode_manager.h"
 #include "curvefs/src/client/kvclient/kvclient_manager.h"
 #include "curvefs/src/client/metric/client_metric.h"
 #include "curvefs/src/client/rpcclient/metaserver_client.h"

diff --git a/curvefs/src/mds/codec/codec.cpp b/curvefs/src/mds/codec/codec.cpp
@@ -79,23 +79,6 @@ std::string EncodeFsUsageKey(const std::string& fsName) {
     return key;
 }
 
-std::string EncodeTsKey(uint32_t fsId) {
-    static const size_t size = COMMON_PREFIX_LENGTH + sizeof(fsId);
-
-    std::string key;
-    key.resize(size);
-
-    memcpy(&key[0], TS_INFO_KEY_PREFIX, COMMON_PREFIX_LENGTH);
-
-    EncodeBigEndian_uint32(&key[COMMON_PREFIX_LENGTH], fsId);
-
-    return key;
-}
-
-uint32_t DecodeTsKey(const std::string& key) {
-    return DecodeBigEndian_uint32(&key[COMMON_PREFIX_LENGTH]);
-}
-
 }  // namespace codec
 }  // namespace mds
 }  // namespace curvefs
diff --git a/curvefs/src/mds/codec/codec.h b/curvefs/src/mds/codec/codec.h
@@ -66,10 +66,6 @@ std::string EncodeBlockGroupKey(uint32_t fsId, uint64_t offset);
 
 std::string EncodeFsUsageKey(const std::string& fsName);
 
-std::string EncodeTsKey(uint32_t fsId);
-
-uint32_t DecodeTsKey(const std::string& key);
-
 }  // namespace codec
 }  // namespace mds
 }  // namespace curvefs

diff --git a/curvefs/src/mds/common/storage_key.h b/curvefs/src/mds/common/storage_key.h
@@ -45,8 +45,7 @@ const char BLOCKGROUP_KEY_PREFIX[] = "fs_04";
 const char BLOCKGROUP_KEY_END[] = "fs_05";
 const char FS_USAGE_KEY_PREFIX[] = "fs_05";
 const char FS_USAGE_KEY_END[] = "fs_06";
-const char TS_INFO_KEY_PREFIX[] = "fs_06";
-const char TS_INFO_KEY_END[] = "fs_07";
+const char TS_INFO_KEY_PREFIX[] = "fs_07";
 
 constexpr uint32_t COMMON_PREFIX_LENGTH = 5;
 

diff --git a/curvefs/src/mds/fs_manager.cpp b/curvefs/src/mds/fs_manager.cpp
@@ -1299,10 +1299,9 @@ bool FsManager::FillVolumeInfo(common::Volume* volume) {
 void FsManager::Tso(const TsoRequest* request, TsoResponse* response) {
     uint64_t ts;
     uint64_t timestamp;
-    auto ret = fsStorage_->Tso(request->fsid(), &ts, &timestamp);
+    auto ret = fsStorage_->Tso(&ts, &timestamp);
     if (ret != FSStatusCode::OK) {
-        LOG(ERROR) << "Tso fail, fsid = " << request->fsid()
-                   << ", ret = " << FSStatusCode_Name(ret);
+        LOG(ERROR) << "Tso fail, ret = " << FSStatusCode_Name(ret);
         response->set_statuscode(ret);
         return;
     }