From 30aeeb411b1040eabf7ed22f5af75e024366b47a Mon Sep 17 00:00:00 2001
From: yiyiyi920 <568398422@qq.com>
Date: Tue, 17 Dec 2024 19:04:50 +0800
Subject: [PATCH] push commit

---
 src/gausskernel/ddes/ddes_commit_id |  4 ++--
 src/include/ddes/dms/dms_api.h      | 25 ++++++++++++++++++++++---
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/gausskernel/ddes/ddes_commit_id b/src/gausskernel/ddes/ddes_commit_id
index c3612f9451..27f5615abc 100644
--- a/src/gausskernel/ddes/ddes_commit_id
+++ b/src/gausskernel/ddes/ddes_commit_id
@@ -1,3 +1,3 @@
-dms_commit_id=7ff15dbe47af8d1a0e0dbb3b16e5fff43934e003
+dms_commit_id=077d0f0d98251930a277a8e361dc9267bec9c1e9
 dss_commit_id=488bd0a3d6d7f3632804c737924ff3723ed3aced
-cbb_commit_id=3575f7a668ef8b03d7991aba481ae76bfddd81c8
\ No newline at end of file
+cbb_commit_id=97ad9a72d0c4ff89f0a8e2ccdbd77e7d0bef604f
\ No newline at end of file
diff --git a/src/include/ddes/dms/dms_api.h b/src/include/ddes/dms/dms_api.h
index 33feb6447c..ddca4e530d 100644
--- a/src/include/ddes/dms/dms_api.h
+++ b/src/include/ddes/dms/dms_api.h
@@ -36,7 +36,7 @@ extern "C" {
 #define DMS_LOCAL_MINOR_VER_WEIGHT  1000
 #define DMS_LOCAL_MAJOR_VERSION     0
 #define DMS_LOCAL_MINOR_VERSION     0
-#define DMS_LOCAL_VERSION           174
+#define DMS_LOCAL_VERSION           175
 
 #define DMS_SUCCESS 0
 #define DMS_ERROR (-1)
@@ -444,6 +444,7 @@ typedef union st_dms_buf_ctrl
         unsigned long long edp_map;             // records edp instance
         long long last_ckpt_time; // last time when local edp page is added to group.
         volatile unsigned int lock_ss_read; // concurrency control for rebuild/confirm and ss_buf_try_remote
+        volatile unsigned int lock_ss_ckpt_copy; // concurrency control for rebuild/ckpt_copy_item
         unsigned long long seq; // for dms page swap message-sequence
         void *buf_ctrl;
     #ifdef OPENGAUSS
@@ -1307,9 +1308,9 @@ typedef struct st_drc_local_lock_res_result {
 } drc_local_lock_res_result_t;
 
 typedef enum en_reform_callback_stat {
-    REFORM_CALLBACK_STAT_CKPT_LATCH = 0,
-    REFORM_CALLBACK_STAT_BUCKET_LOCK,
+    REFORM_CALLBACK_STAT_BUCKET_LOCK = 0,
     REFORM_CALLBACK_STAT_SS_READ_LOCK,
+    REFORM_CALLBACK_STAT_SS_CKPT_COPY_LOCK,
     REFORM_CALLBACK_STAT_REBUILD_TLOCK_REMOTE,
     REFORM_CALLBACK_STAT_GET_DISK_LSN,
     REFORM_CALLBACK_STAT_DRC_EXIST,
@@ -1405,6 +1406,24 @@ typedef struct st_mem_info_stat {
     double used_percentage;
 } mem_info_stat_t;
 
+typedef enum en_dms_param_index {
+    DMS_PARAM_SS_INTERCONNECT_URL = 0,
+    DMS_PARAM_SS_ELAPSED_SWITCH,
+#if defined(_DEBUG) || defined(DEBUG) || defined(DB_DEBUG_VERSION)
+    DMS_PARAM_SS_FI_PACKET_LOSS_ENTRIES,
+    DMS_PARAM_SS_FI_NET_LATENCY_ENTRIES,
+    DMS_PARAM_SS_FI_CPU_LATENCY_ENTRIES,
+    DMS_PARAM_SS_FI_PROCESS_FAULT_ENTRIES,
+    DMS_PARAM_SS_FI_CUSTOM_FAULT_ENTRIES,
+    DMS_PARAM_SS_FI_PACKET_LOSS_PROB,
+    DMS_PARAM_SS_FI_NET_LATENCY_MS,
+    DMS_PARAM_SS_FI_CPU_LATENCY_MS,
+    DMS_PARAM_SS_FI_PROCESS_FAULT_PROB,
+    DMS_PARAM_SS_FI_CUSTOM_FAULT_PARAM,
+#endif
+    DMS_PARAM_SS_COUNT,
+} dms_param_index;
+
 #ifdef __cplusplus
 }
 #endif
-- 
Gitee