[feat][mdsv2] Add txn conflict bvar PerSecondEx.

Author: rock-git

src/client/vfs_wrapper/global_log.h

@@ -15,6 +15,7 @@
  */
 
 #include "fmt/format.h"
+#include "glog/logging.h"
 #include "options/common/dynamic_vlog.h"
 #include "utils/configuration.h"
 #include "utils/gflags_helper.h"
@@ -39,7 +40,10 @@ static int InitLog(const char* argv0, const std::string& conf_path) {
   dummy.Load(&conf, "v", "client.loglevel", &FLAGS_v);
   dingofs::common::FLAGS_vlog_level = FLAGS_v;
 
-  FLAGS_logbufsecs = 4;
+  FLAGS_logbufsecs = 10;
+  FLAGS_minloglevel = google::GLOG_ERROR;
+  FLAGS_logbuflevel = google::GLOG_INFO;
+
   // initialize logging module
   google::InitGoogleLogging(argv0);
 

src/mdsv2/common/logging.cc

@@ -23,8 +23,8 @@ namespace dingofs {
 namespace mdsv2 {
 
 void DingoLogger::InitLogger(const std::string& log_dir, const std::string& role, const LogLevel& level) {
-  FLAGS_logbufsecs = 0;
-  FLAGS_max_log_size = 80;
+  FLAGS_logbufsecs = 10;
+  FLAGS_max_log_size = 256;
   FLAGS_stop_logging_if_full_disk = true;
   FLAGS_minloglevel = google::GLOG_INFO;
   FLAGS_logbuflevel = google::GLOG_INFO;

src/mdsv2/filesystem/store_operation.cc

@@ -2454,8 +2454,7 @@ Status OperationProcessor::RunAlone(Operation* operation) {
 
     status = operation->Run(txn);
     if (!status.ok()) {
-      if (status.error_code() == pb::error::ESTORE_TXN_LOCK_CONFLICT ||
-          status.error_code() == pb::error::ESTORE_TXN_MEM_LOCK_CONFLICT) {
+      if (status.error_code() == pb::error::ESTORE_MAYBE_RETRY) {
         DINGO_LOG(WARNING) << fmt::format(
             "[operation.{}.{}][{}][{}us] alone run {} lock conflict, retry({}) status({}).", fs_id, ino, txn_id,
             once_duration.ElapsedUs(), operation->OpName(), retry, status.error_str());
@@ -2657,8 +2656,7 @@ void OperationProcessor::ExecuteBatchOperation(BatchOperation& batch_operation)
     std::vector<KeyValue> prefetch_kvs;
     status = txn->BatchGet(keys, prefetch_kvs);
     if (!status.ok()) {
-      if (status.error_code() == pb::error::ESTORE_TXN_LOCK_CONFLICT ||
-          status.error_code() == pb::error::ESTORE_TXN_MEM_LOCK_CONFLICT) {
+      if (status.error_code() == pb::error::ESTORE_MAYBE_RETRY) {
         DINGO_LOG(WARNING) << fmt::format(
             "[operation.{}.{}][{}][{}us] batch run {} lock conflict, retry({}) status({}).", fs_id, ino, txn_id,
             once_duration.ElapsedUs(), op_names, retry, status.error_str());

src/mdsv2/storage/dingodb_storage.cc

@@ -38,6 +38,11 @@ DECLARE_uint32(mds_txn_max_retry_times);
 
 const uint32_t kTxnKeepAliveMs = 10 * 1000;
 
+static bvar::PerSecondEx<bvar::Adder<uint32_t>, 60> g_txn_write_conflict_per_second("txn_write_conflict_sum");
+static bvar::PerSecondEx<bvar::Adder<uint32_t>, 60> g_txn_lock_conflict_per_second("txn_lock_conflict_sum");
+static bvar::PerSecondEx<bvar::Adder<uint32_t>, 60> g_txn_memlock_conflict_per_second("txn_memlock_conflict_sum");
+static bvar::PerSecondEx<bvar::Adder<uint32_t>, 60> g_txn_total_conflict_per_second("txn_total_conflict_sum");
+
 static void KvPairsToKeyValues(const std::vector<dingodb::sdk::KVPair>& kv_pairs, std::vector<KeyValue>& kvs) {
   kvs.reserve(kv_pairs.size());
   for (const auto& kv_pair : kv_pairs) {
@@ -231,11 +236,20 @@ static inline Status TransformStatus(const dingodb::sdk::Status& status) {
   if (status.IsNotFound()) {
     return Status(pb::error::ENOT_FOUND, status.ToString());
 
+  } else if (status.IsTxnWriteConflict()) {
+    g_txn_total_conflict_per_second << 1;
+    g_txn_write_conflict_per_second << 1;
+    return Status(pb::error::ESTORE_MAYBE_RETRY, status.ToString());
+
   } else if (status.IsTxnLockConflict()) {
-    return Status(pb::error::ESTORE_TXN_LOCK_CONFLICT, status.ToString());
+    g_txn_total_conflict_per_second << 1;
+    g_txn_lock_conflict_per_second << 1;
+    return Status(pb::error::ESTORE_MAYBE_RETRY, status.ToString());
 
   } else if (status.IsTxnMemLockConflict()) {
-    return Status(pb::error::ESTORE_TXN_MEM_LOCK_CONFLICT, status.ToString());
+    g_txn_total_conflict_per_second << 1;
+    g_txn_memlock_conflict_per_second << 1;
+    return Status(pb::error::ESTORE_MAYBE_RETRY, status.ToString());
 
   } else {
     return Status(pb::error::EBACKEND_STORE, status.ToString());
@@ -465,10 +479,37 @@ Status DingodbTxn::Scan(const Range& range, ScanHandlerType handler) {
   return status;
 }
 
+Status DingodbTxn::TransformStatus(const dingodb::sdk::Status& status) {
+  if (status.IsNotFound()) {
+    return Status(pb::error::ENOT_FOUND, status.ToString());
+
+  } else if (status.IsTxnWriteConflict()) {
+    g_txn_total_conflict_per_second << 1;
+    g_txn_write_conflict_per_second << 1;
+    txn_trace_.is_conflict = true;
+    return Status(pb::error::ESTORE_MAYBE_RETRY, status.ToString());
+
+  } else if (status.IsTxnLockConflict()) {
+    g_txn_total_conflict_per_second << 1;
+    g_txn_lock_conflict_per_second << 1;
+    txn_trace_.is_conflict = true;
+    return Status(pb::error::ESTORE_MAYBE_RETRY, status.ToString());
+
+  } else if (status.IsTxnMemLockConflict()) {
+    g_txn_total_conflict_per_second << 1;
+    g_txn_memlock_conflict_per_second << 1;
+    txn_trace_.is_conflict = true;
+    return Status(pb::error::ESTORE_MAYBE_RETRY, status.ToString());
+
+  } else {
+    return Status(pb::error::EBACKEND_STORE, status.ToString());
+  }
+}
+
 void DingodbTxn::Rollback() {
   auto status = txn_->Rollback();
   if (!status.ok()) {
-    DINGO_LOG(ERROR) << fmt::format("rollback fail, error: {}", status.ToString());
+    DINGO_LOG(ERROR) << fmt::format("[storage] rollback fail, status({}).", status.ToString());
   }
 }
 
@@ -482,20 +523,12 @@ Status DingodbTxn::Commit() {
   auto status = txn_->PreCommit();
   if (!status.ok()) {
     Rollback();
-    if (status.IsTxnWriteConflict()) {
-      txn_trace_.is_conflict = true;
-      return Status(pb::error::ESTORE_MAYBE_RETRY, status.ToString());
-    }
     return TransformStatus(status);
   }
 
   status = txn_->Commit();
   if (!status.ok()) {
     Rollback();
-    if (status.IsTxnWriteConflict()) {
-      txn_trace_.is_conflict = true;
-      return Status(pb::error::ESTORE_MAYBE_RETRY, status.ToString());
-    }
     return TransformStatus(status);
   }
 

src/mdsv2/storage/dingodb_storage.h

@@ -88,6 +88,8 @@ class DingodbTxn : public Txn {
  private:
   using TxnUPtr = std::unique_ptr<dingodb::sdk::Transaction>;
 
+  Status TransformStatus(const dingodb::sdk::Status& status);
+
   void Rollback();
 
   SdkTxnUPtr txn_;