Merge pull request #17688 from taosdata/feature/sync2-merge

refactor(sync): check pSyncTimer NULL

include/libs/sync/sync.h

@@ -38,7 +38,7 @@ extern bool gRaftDetailLog;
 #define SYNC_DEL_WAL_MS              (1000 * 60)
 #define SYNC_ADD_QUORUM_COUNT        3
 #define SYNC_MNODE_LOG_RETENTION     10000
-#define SYNC_VNODE_LOG_RETENTION     500
+#define SYNC_VNODE_LOG_RETENTION     100
 
 #define SYNC_APPEND_ENTRIES_TIMEOUT_MS 10000
 

include/util/tdef.h

@@ -370,13 +370,13 @@ typedef enum ELogicConditionType {
 
 #define TSDB_DB_MIN_WAL_RETENTION_PERIOD -1
 #define TSDB_REP_DEF_DB_WAL_RET_PERIOD   0
-#define TSDB_REPS_DEF_DB_WAL_RET_PERIOD  (24 * 60 * 60 * 4)
+#define TSDB_REPS_DEF_DB_WAL_RET_PERIOD  0
 #define TSDB_DB_MIN_WAL_RETENTION_SIZE   -1
 #define TSDB_REP_DEF_DB_WAL_RET_SIZE     0
-#define TSDB_REPS_DEF_DB_WAL_RET_SIZE    -1
+#define TSDB_REPS_DEF_DB_WAL_RET_SIZE    0
 #define TSDB_DB_MIN_WAL_ROLL_PERIOD      0
 #define TSDB_REP_DEF_DB_WAL_ROLL_PERIOD  0
-#define TSDB_REPS_DEF_DB_WAL_ROLL_PERIOD (24 * 60 * 60 * 1)
+#define TSDB_REPS_DEF_DB_WAL_ROLL_PERIOD 0
 #define TSDB_DB_MIN_WAL_SEGMENT_SIZE     0
 #define TSDB_DEFAULT_DB_WAL_SEGMENT_SIZE 0
 

source/libs/sync/src/syncMain.c

@@ -1645,8 +1645,10 @@ int32_t syncNodeStartHeartbeatTimer(SSyncNode* pSyncNode) {
 
   for (int i = 0; i < pSyncNode->peersNum; ++i) {
     SSyncTimer* pSyncTimer = syncNodeGetHbTimer(pSyncNode, &(pSyncNode->peersId[i]));
+    if (pSyncTimer != NULL) {
       syncHbTimerStart(pSyncNode, pSyncTimer);
     }
+  }
 
   return ret;
 }
@@ -1662,8 +1664,10 @@ int32_t syncNodeStopHeartbeatTimer(SSyncNode* pSyncNode) {
 
   for (int i = 0; i < pSyncNode->peersNum; ++i) {
     SSyncTimer* pSyncTimer = syncNodeGetHbTimer(pSyncNode, &(pSyncNode->peersId[i]));
+    if (pSyncTimer != NULL) {
       syncHbTimerStop(pSyncNode, pSyncTimer);
     }
+  }
 
   return ret;
 }

tests/script/tsim/db/alter_option.sim

@@ -111,13 +111,13 @@ endi
 if $data21_db != 1000 then  # wal_level fsyncperiod
   return -1
 endi
-if $data22_db != 345600 then  # wal_retention_period
+if $data22_db != 0 then  # wal_retention_period
   return -1
 endi
-if $data23_db != -1 then  # wal_retention_size
+if $data23_db != 0 then  # wal_retention_size
   return -1
 endi
-if $data24_db != 86400 then  # wal_roll_period
+if $data24_db != 0 then  # wal_roll_period
   return -1
 endi
 if $data25_db != 0 then  # wal_segment_size