[fix][mdsv2] Fixup setattr issues.

Author: rock-git

proto

@@ -619,6 +619,8 @@ Status MDSClient::SetAttr(Ino ino, const Attr& attr, int to_set,
 
   out_attr = ToAttr(response.inode());
 
+  parent_memo_->UpsertVersion(ino, response.inode().version());
+
   return Status::OK();
 }
 
@@ -669,6 +671,8 @@ Status MDSClient::SetXAttr(Ino ino, const std::string& name,
     return status;
   }
 
+  parent_memo_->UpsertVersion(ino, response.inode_version());
+
   return Status::OK();
 }
 

src/client/vfs/meta/v2/mds_client.cpp

@@ -36,6 +36,7 @@
 #include "mdsv2/common/logging.h"
 #include "mdsv2/common/status.h"
 #include "mdsv2/common/tracing.h"
+#include "mdsv2/common/type.h"
 #include "mdsv2/filesystem/dentry.h"
 #include "mdsv2/filesystem/file_session.h"
 #include "mdsv2/filesystem/fs_info.h"
@@ -1309,10 +1310,15 @@ Status FileSystem::SetAttr(Context& ctx, Ino ino, const SetAttrParam& param, Ent
   auto& result = operation.GetResult();
   auto& attr = result.attr;
 
-  // update cache
-  inode->UpdateIf(attr);
+  entry_out.attr = attr;
 
-  entry_out.attr = std::move(attr);
+  // update cache
+  if (IsDir(ino) && IsParentHashPartition()) {
+    inode->UpdateIf(attr);
+    NotifyBuddyRefreshInode(std::move(attr));
+  } else {
+    inode->UpdateIf(std::move(attr));
+  }
 
   return Status::OK();
 }
@@ -1353,7 +1359,7 @@ Status FileSystem::GetXAttr(Context& ctx, Ino ino, const std::string& name, std:
   return Status::OK();
 }
 
-Status FileSystem::SetXAttr(Context& ctx, Ino ino, const Inode::XAttrMap& xattrs) {
+Status FileSystem::SetXAttr(Context& ctx, Ino ino, const Inode::XAttrMap& xattrs, uint64_t& version) {
   DINGO_LOG(DEBUG) << fmt::format("[fs.{}] setxattr ino({}).", fs_id_, ino);
 
   if (!CanServe()) {
@@ -1385,8 +1391,15 @@ Status FileSystem::SetXAttr(Context& ctx, Ino ino, const Inode::XAttrMap& xattrs
   auto& result = operation.GetResult();
   auto& attr = result.attr;
 
+  version = attr.version();
+
   // update cache
-  inode->UpdateIf(std::move(attr));
+  if (IsDir(ino) && IsParentHashPartition()) {
+    inode->UpdateIf(attr);
+    NotifyBuddyRefreshInode(std::move(attr));
+  } else {
+    inode->UpdateIf(std::move(attr));
+  }
 
   return Status::OK();
 }

src/mdsv2/filesystem/filesystem.cc

@@ -160,7 +160,7 @@ class FileSystem : public std::enable_shared_from_this<FileSystem> {
   // xattr
   Status GetXAttr(Context& ctx, Ino ino, Inode::XAttrMap& xattr);
   Status GetXAttr(Context& ctx, Ino ino, const std::string& name, std::string& value);
-  Status SetXAttr(Context& ctx, Ino ino, const Inode::XAttrMap& xattrs);
+  Status SetXAttr(Context& ctx, Ino ino, const Inode::XAttrMap& xattrs, uint64_t& version);
 
   // rename
   struct RenameParam {

src/mdsv2/filesystem/filesystem.h

@@ -1292,6 +1292,11 @@ Status OperationProcessor::RunAlone(Operation* operation) {
       break;
     }
 
+    DINGO_LOG(WARNING) << fmt::format("[operation.{}.{}][{}][{}us] alone run {} fail, onepc({}) retry({}) status({}).",
+                                      operation->GetFsId(), operation->GetIno(), txn_id,
+                                      Helper::TimestampUs() - time_us, operation->OpName(), is_one_pc, retry,
+                                      status.error_str());
+
   } while (++retry < FLAGS_txn_max_retry_times);
 
   trace.RecordElapsedTime("store_operate");
@@ -1459,6 +1464,10 @@ void OperationProcessor::ExecuteBatchOperation(BatchOperation& batch_operation)
       break;
     }
 
+    DINGO_LOG(WARNING) << fmt::format(
+        "[operation.{}.{}][{}][{}us] batch run ({}) fail, count({}) onepc({}) retry({}) status({}).", fs_id, ino,
+        txn_id, Helper::TimestampUs() - time_us, op_names, count, is_one_pc, retry, status.error_str());
+
   } while (++retry < FLAGS_txn_max_retry_times);
 
   SetElapsedTime(batch_operation, "store_operate");

src/mdsv2/filesystem/store_operation.cc

@@ -390,13 +390,19 @@ Status QuotaManager::FlushDirUsage() {
   std::map<uint64_t, UsageEntry> usages;
   for (auto& quota : quotas) {
     auto usage = quota->GetUsage();
+    DINGO_LOG(INFO) << fmt::format("[quota] flush dir usage, ino({}), bytes({}), inodes({}).", quota->GetIno(),
+                                   usage.bytes(), usage.inodes());
     if (usage.bytes() == 0 && usage.inodes() == 0) {
       continue;
     }
 
     usages[quota->GetIno()] = usage;
   }
 
+  if (usages.empty()) {
+    return Status::OK();
+  }
+
   Trace trace;
   FlushDirUsagesOperation operation(trace, fs_id_, usages);
 

src/mdsv2/quota/quota.cc

@@ -1426,12 +1426,14 @@ void MDSServiceImpl::DoSetXAttr(google::protobuf::RpcController* controller, con
   const auto& req_ctx = request->context();
   Context ctx(req_ctx.is_bypass_cache(), req_ctx.inode_version());
 
-  std::string value;
-  status = file_system->SetXAttr(ctx, request->ino(), request->xattrs());
+  uint64_t version;
+  status = file_system->SetXAttr(ctx, request->ino(), request->xattrs(), version);
   ServiceHelper::SetResponseInfo(ctx.GetTrace(), response->mutable_info());
   if (BAIDU_UNLIKELY(!status.ok())) {
     ServiceHelper::SetError(response->mutable_error(), status.error_code(), status.error_str());
   }
+
+  response->set_inode_version(version);
 }
 
 void MDSServiceImpl::SetXAttr(google::protobuf::RpcController* controller, const pb::mdsv2::SetXAttrRequest* request,

src/mdsv2/service/mds_service.cc

@@ -450,7 +450,10 @@ Status DingodbTxn::Commit() {
   return Status::OK();
 }
 
-Trace::Txn DingodbTxn::GetTrace() { return txn_trace_; }
+Trace::Txn DingodbTxn::GetTrace() {
+  txn_trace_.txn_id = ID();
+  return txn_trace_;
+}
 
 }  // namespace mdsv2
 }  // namespace dingofs

src/mdsv2/storage/dingodb_storage.cc

@@ -665,7 +665,8 @@ TEST_F(FileSystemTest, SetXAttr) {
   Inode::XAttrMap xattr;
   xattr.insert({"key3", "value3"});
   xattr.insert({"key4", "value4"});
-  status = fs->SetXAttr(ctx, inode->Ino(), xattr);
+  uint64_t version;
+  status = fs->SetXAttr(ctx, inode->Ino(), xattr, version);
   ASSERT_TRUE(status.ok()) << "set xattr fail, error: " << status.error_str();
 }
 
@@ -695,7 +696,8 @@ TEST_F(FileSystemTest, GetXAttr) {
   Inode::XAttrMap xattr;
   xattr.insert({"key3", "value3"});
   xattr.insert({"key4", "value4"});
-  status = fs->SetXAttr(ctx, inode->Ino(), xattr);
+  uint64_t version;
+  status = fs->SetXAttr(ctx, inode->Ino(), xattr, version);
   ASSERT_TRUE(status.ok()) << "set xattr fail, error: " << status.error_str();
 
   Inode::XAttrMap actual_xattr;