diff --git a/include/common/tmsg.h b/include/common/tmsg.h
index 698ab8fac3..eddd2e65f8 100644
--- a/include/common/tmsg.h
+++ b/include/common/tmsg.h
@@ -70,7 +70,7 @@ typedef uint16_t tmsg_t;
 
 static inline bool tmsgIsValid(tmsg_t type) {
   // static int8_t sz = sizeof(tMsgRangeDict) / sizeof(tMsgRangeDict[0]);
-  int8_t maxSegIdx = TMSG_SEG_CODE(TDMT_MAX_MSG);
+  int8_t maxSegIdx = TMSG_SEG_CODE(TDMT_MAX_MSG_MIN);
   int    segIdx = TMSG_SEG_CODE(type);
   if (segIdx >= 0 && segIdx < maxSegIdx) {
     return type < tMsgRangeDict[segIdx];
diff --git a/include/common/tmsgdef.h b/include/common/tmsgdef.h
index b59dae379a..ad2c593f4e 100644
--- a/include/common/tmsgdef.h
+++ b/include/common/tmsgdef.h
@@ -41,7 +41,7 @@
   #undef TD_CLOSE_MSG_SEG
   #define TD_NEW_MSG_SEG(TYPE)
   #define TD_DEF_MSG_TYPE(TYPE, MSG, REQ, RSP)
-  #define TD_CLOSE_MSG_SEG(TYPE) TYPE,
+  #define TD_CLOSE_MSG_SEG(TYPE) TYPE##_MAX,
   int32_t tMsgRangeDict[] = {
 
 #elif defined(TD_MSG_NUMBER_)
@@ -49,7 +49,7 @@
   #undef TD_NEW_MSG_SEG
   #undef TD_DEF_MSG_TYPE
   #undef TD_CLOSE_MSG_SEG
-  #define TD_NEW_MSG_SEG(TYPE) TYPE##_NUM,
+  #define TD_NEW_MSG_SEG(TYPE) TYPE##_NUM_MIN,
   #define TD_DEF_MSG_TYPE(TYPE, MSG, REQ, RSP) TYPE##_NUM, TYPE##_RSP_NUM,
   #define TD_CLOSE_MSG_SEG(TYPE)
 
@@ -60,7 +60,7 @@
   #undef TD_NEW_MSG_SEG
   #undef TD_DEF_MSG_TYPE
   #undef TD_CLOSE_MSG_SEG
-  #define TD_NEW_MSG_SEG(TYPE) TYPE##_NUM,
+  #define TD_NEW_MSG_SEG(TYPE) TYPE##_NUM_MIN,
   #define TD_DEF_MSG_TYPE(TYPE, MSG, REQ, RSP)
   #define TD_CLOSE_MSG_SEG(type)
 
@@ -99,9 +99,9 @@
   #undef TD_NEW_MSG_SEG
   #undef TD_DEF_MSG_TYPE
   #undef TD_CLOSE_MSG_SEG
-  #define TD_NEW_MSG_SEG(TYPE) TYPE = ((TYPE##_SEG_CODE) << 8),
+  #define TD_NEW_MSG_SEG(TYPE) TYPE##_MIN = ((TYPE##_SEG_CODE) << 8),
   #define TD_DEF_MSG_TYPE(TYPE, MSG, REQ, RSP) TYPE, TYPE##_RSP,
-  #define TD_CLOSE_MSG_SEG(TYPE) TYPE,
+  #define TD_CLOSE_MSG_SEG(TYPE) TYPE##_MAX,
 
   enum { // WARN: new msg should be appended to segment tail
 #endif
@@ -125,8 +125,7 @@
   TD_DEF_MSG_TYPE(TDMT_DND_ALTER_VNODE_TYPE, "dnode-alter-vnode-type", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_DND_CHECK_VNODE_LEARNER_CATCHUP, "dnode-check-vnode-learner-catchup", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_DND_CREATE_ENCRYPT_KEY, "create-encrypt-key", NULL, NULL)
-  TD_DEF_MSG_TYPE(TDMT_DND_MAX_MSG, "dnd-max", NULL, NULL)
-  TD_CLOSE_MSG_SEG(TDMT_END_DND_MSG)
+  TD_CLOSE_MSG_SEG(TDMT_DND_MSG)
 
   TD_NEW_MSG_SEG(TDMT_MND_MSG)  // 1<<8
   TD_DEF_MSG_TYPE(TDMT_MND_CONNECT, "connect", NULL, NULL)
@@ -251,8 +250,7 @@
   TD_DEF_MSG_TYPE(TDMT_MND_DROP_TB_WITH_TSMA, "drop-tb-with-tsma", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_MND_STREAM_UPDATE_CHKPT_EVT, "stream-update-chkpt-evt", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_MND_STREAM_CHKPT_REPORT, "stream-chkpt-report", NULL, NULL)
-  TD_DEF_MSG_TYPE(TDMT_MND_MAX_MSG, "mnd-max", NULL, NULL)
-  TD_CLOSE_MSG_SEG(TDMT_END_MND_MSG)
+  TD_CLOSE_MSG_SEG(TDMT_MND_MSG)
 
   TD_NEW_MSG_SEG(TDMT_VND_MSG)  // 2<<8
   TD_DEF_MSG_TYPE(TDMT_VND_SUBMIT, "submit", SSubmitReq, SSubmitRsp)
@@ -307,8 +305,7 @@
   TD_DEF_MSG_TYPE(TDMT_VND_ARB_HEARTBEAT, "vnode-arb-hb", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_VND_ARB_CHECK_SYNC, "vnode-arb-check-sync", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_VND_FETCH_TTL_EXPIRED_TBS, "vnode-fetch-ttl-expired-tbs", NULL, NULL)
-  TD_DEF_MSG_TYPE(TDMT_VND_MAX_MSG, "vnd-max", NULL, NULL)
-  TD_CLOSE_MSG_SEG(TDMT_END_VND_MSG)
+  TD_CLOSE_MSG_SEG(TDMT_VND_MSG)
 
   TD_NEW_MSG_SEG(TDMT_SCH_MSG)  // 3<<8
   TD_DEF_MSG_TYPE(TDMT_SCH_QUERY, "query", NULL, NULL)
@@ -322,8 +319,7 @@
   TD_DEF_MSG_TYPE(TDMT_SCH_EXPLAIN, "explain", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_SCH_LINK_BROKEN, "link-broken", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_SCH_TASK_NOTIFY, "task-notify", NULL, NULL)
-  TD_DEF_MSG_TYPE(TDMT_SCH_MAX_MSG, "sch-max", NULL, NULL)
-  TD_CLOSE_MSG_SEG(TDMT_END_SCH_MSG)
+  TD_CLOSE_MSG_SEG(TDMT_SCH_MSG)
 
 
   TD_NEW_MSG_SEG(TDMT_STREAM_MSG)   //4 << 8
@@ -343,12 +339,10 @@
   TD_DEF_MSG_TYPE(TDMT_STREAM_CREATE, "stream-create", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_STREAM_DROP, "stream-drop", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_STREAM_RETRIEVE_TRIGGER, "stream-retri-trigger", NULL, NULL)
-  TD_DEF_MSG_TYPE(TDMT_STREAM_MAX_MSG, "stream-max", NULL, NULL)
-  TD_CLOSE_MSG_SEG(TDMT_END_STREAM_MSG)
+  TD_CLOSE_MSG_SEG(TDMT_STREAM_MSG)
 
   TD_NEW_MSG_SEG(TDMT_MON_MSG)  //5 << 8
-  TD_DEF_MSG_TYPE(TDMT_MON_MAX_MSG, "monitor-max", NULL, NULL)
-  TD_CLOSE_MSG_SEG(TDMT_END_MON_MSG)
+  TD_CLOSE_MSG_SEG(TDMT_MON_MSG)
 
   TD_NEW_MSG_SEG(TDMT_SYNC_MSG) //6 << 8
   TD_DEF_MSG_TYPE(TDMT_SYNC_TIMEOUT, "sync-timer", NULL, NULL)
@@ -381,8 +375,7 @@
   TD_DEF_MSG_TYPE(TDMT_SYNC_UNUSED_CODE, "sync-unused", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_SYNC_FORCE_FOLLOWER, "sync-force-become-follower", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_SYNC_SET_ASSIGNED_LEADER, "sync-set-assigned-leader", NULL, NULL)
-  TD_DEF_MSG_TYPE(TDMT_SYNC_MAX_MSG, "sync-max", NULL, NULL)
-  TD_CLOSE_MSG_SEG(TDMT_END_SYNC_MSG)
+  TD_CLOSE_MSG_SEG(TDMT_SYNC_MSG)
 
   TD_NEW_MSG_SEG(TDMT_VND_STREAM_MSG) //7 << 8
   TD_DEF_MSG_TYPE(TDMT_VND_STREAM_SCAN_HISTORY, "vnode-stream-scan-history", NULL, NULL)
@@ -392,8 +385,7 @@
   TD_DEF_MSG_TYPE(TDMT_VND_STREAM_TASK_CHECK, "vnode-stream-task-check", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_VND_STREAM_UNUSED, "vnd-stream-unused", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_VND_GET_STREAM_PROGRESS, "vnd-stream-progress", NULL, NULL)
-  TD_DEF_MSG_TYPE(TDMT_VND_STREAM_MAX_MSG, "vnd-stream-max", NULL, NULL)
-  TD_CLOSE_MSG_SEG(TDMT_END_VND_STREAM_MSG)
+  TD_CLOSE_MSG_SEG(TDMT_VND_STREAM_MSG)
 
   TD_NEW_MSG_SEG(TDMT_VND_TMQ_MSG)  //8 << 8
   TD_DEF_MSG_TYPE(TDMT_VND_TMQ_SUBSCRIBE, "vnode-tmq-subscribe", SMqRebVgReq, SMqRebVgRsp)
@@ -406,19 +398,17 @@
   TD_DEF_MSG_TYPE(TDMT_VND_TMQ_CONSUME_PUSH, "vnode-tmq-consume-push", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_VND_TMQ_VG_WALINFO, "vnode-tmq-vg-walinfo", SMqPollReq, SMqDataBlkRsp)
   TD_DEF_MSG_TYPE(TDMT_VND_TMQ_VG_COMMITTEDINFO, "vnode-tmq-committedinfo", NULL, NULL)
-  TD_DEF_MSG_TYPE(TDMT_VND_TMQ_MAX_MSG, "vnd-tmq-max", NULL, NULL)
-  TD_CLOSE_MSG_SEG(TDMT_END_TMQ_MSG)
+  TD_CLOSE_MSG_SEG(TDMT_VND_TMQ_MSG)
 
   TD_NEW_MSG_SEG(TDMT_MND_ARB_MSG)  //9 << 8
   TD_DEF_MSG_TYPE(TDMT_MND_ARB_HEARTBEAT_TIMER, "mnd-arb-hb-tmr", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_MND_ARB_CHECK_SYNC_TIMER, "mnd-arb-check-sync-tmr", NULL, NULL)
   TD_DEF_MSG_TYPE(TDMT_MND_ARB_UPDATE_GROUP, "mnd-arb-update-group", NULL, NULL) // no longer used
   TD_DEF_MSG_TYPE(TDMT_MND_ARB_UPDATE_GROUP_BATCH, "mnd-arb-update-group-batch", NULL, NULL)
-  TD_DEF_MSG_TYPE(TDMT_MND_ARB_MAX_MSG, "mnd-arb-max", NULL, NULL)
-  TD_CLOSE_MSG_SEG(TDMT_END_ARB_MSG)
+  TD_CLOSE_MSG_SEG(TDMT_MND_ARB_MSG)
 
   TD_NEW_MSG_SEG(TDMT_MAX_MSG)  // msg end mark
-  TD_CLOSE_MSG_SEG(TDMT_END_MAX_MSG)
+  TD_CLOSE_MSG_SEG(TDMT_MAX_MSG)
 
   #if defined(TD_MSG_NUMBER_)
     TDMT_MAX
diff --git a/source/common/test/msgTypeTable.ini b/source/common/test/msgTypeTable.ini
index e352c4e8e5..6e5721075c 100644
--- a/source/common/test/msgTypeTable.ini
+++ b/source/common/test/msgTypeTable.ini
@@ -36,8 +36,6 @@ TDMT_DND_CHECK_VNODE_LEARNER_CATCHUP        = 35
 TDMT_DND_CHECK_VNODE_LEARNER_CATCHUP_RSP    = 36
 TDMT_DND_CREATE_ENCRYPT_KEY                 = 37
 TDMT_DND_CREATE_ENCRYPT_KEY_RSP             = 38
-TDMT_DND_MAX_MSG                            = 39
-TDMT_DND_MAX_MSG_RSP                        = 40
 TDMT_MND_CONNECT                            = 257
 TDMT_MND_CONNECT_RSP                        = 258
 TDMT_MND_CREATE_ACCT                        = 259
@@ -280,8 +278,6 @@ TDMT_MND_STREAM_UPDATE_CHKPT_EVT            = 495
 TDMT_MND_STREAM_UPDATE_CHKPT_EVT_RSP        = 496
 TDMT_MND_STREAM_CHKPT_REPORT                = 497
 TDMT_MND_STREAM_CHKPT_REPORT_RSP            = 498
-TDMT_MND_MAX_MSG                            = 499
-TDMT_MND_MAX_MSG_RSP                        = 500
 TDMT_VND_SUBMIT                             = 513
 TDMT_VND_SUBMIT_RSP                         = 514
 TDMT_VND_CREATE_TABLE                       = 515
@@ -386,8 +382,6 @@ TDMT_VND_ARB_CHECK_SYNC                     = 613
 TDMT_VND_ARB_CHECK_SYNC_RSP                 = 614
 TDMT_VND_FETCH_TTL_EXPIRED_TBS              = 615
 TDMT_VND_FETCH_TTL_EXPIRED_TBS_RSP          = 616
-TDMT_VND_MAX_MSG                            = 617
-TDMT_VND_MAX_MSG_RSP                        = 618
 TDMT_SCH_QUERY                              = 769
 TDMT_SCH_QUERY_RSP                          = 770
 TDMT_SCH_MERGE_QUERY                        = 771
@@ -410,8 +404,6 @@ TDMT_SCH_LINK_BROKEN                        = 787
 TDMT_SCH_LINK_BROKEN_RSP                    = 788
 TDMT_SCH_TASK_NOTIFY                        = 789
 TDMT_SCH_TASK_NOTIFY_RSP                    = 790
-TDMT_SCH_MAX_MSG                            = 791
-TDMT_SCH_MAX_MSG_RSP                        = 792
 TDMT_STREAM_TASK_DEPLOY                     = 1025
 TDMT_STREAM_TASK_DEPLOY_RSP                 = 1026
 TDMT_STREAM_TASK_DROP                       = 1027
@@ -444,10 +436,6 @@ TDMT_STREAM_DROP                            = 1053
 TDMT_STREAM_DROP_RSP                        = 1054
 TDMT_STREAM_RETRIEVE_TRIGGER                = 1055
 TDMT_STREAM_RETRIEVE_TRIGGER_RSP            = 1056
-TDMT_STREAM_MAX_MSG                         = 1057
-TDMT_STREAM_MAX_MSG_RSP                     = 1058
-TDMT_MON_MAX_MSG                            = 1281
-TDMT_MON_MAX_MSG_RSP                        = 1282
 TDMT_SYNC_TIMEOUT                           = 1537
 TDMT_SYNC_TIMEOUT_RSP                       = 1538
 TDMT_SYNC_TIMEOUT_ELECTION                  = 1539
@@ -508,8 +496,6 @@ TDMT_SYNC_FORCE_FOLLOWER                    = 1593
 TDMT_SYNC_FORCE_FOLLOWER_RSP                = 1594
 TDMT_SYNC_SET_ASSIGNED_LEADER               = 1595
 TDMT_SYNC_SET_ASSIGNED_LEADER_RSP           = 1596
-TDMT_SYNC_MAX_MSG                           = 1597
-TDMT_SYNC_MAX_MSG_RSP                       = 1598
 TDMT_VND_STREAM_SCAN_HISTORY                = 1793
 TDMT_VND_STREAM_SCAN_HISTORY_RSP            = 1794
 TDMT_VND_STREAM_CHECK_POINT_SOURCE          = 1795
@@ -524,8 +510,6 @@ TDMT_VND_STREAM_UNUSED                      = 1803
 TDMT_VND_STREAM_UNUSED_RSP                  = 1804
 TDMT_VND_GET_STREAM_PROGRESS                = 1805
 TDMT_VND_GET_STREAM_PROGRESS_RSP            = 1806
-TDMT_VND_STREAM_MAX_MSG                     = 1807
-TDMT_VND_STREAM_MAX_MSG_RSP                 = 1808
 TDMT_VND_TMQ_SUBSCRIBE                      = 2049
 TDMT_VND_TMQ_SUBSCRIBE_RSP                  = 2050
 TDMT_VND_TMQ_DELETE_SUB                     = 2051
@@ -546,8 +530,6 @@ TDMT_VND_TMQ_VG_WALINFO                     = 2065
 TDMT_VND_TMQ_VG_WALINFO_RSP                 = 2066
 TDMT_VND_TMQ_VG_COMMITTEDINFO               = 2067
 TDMT_VND_TMQ_VG_COMMITTEDINFO_RSP           = 2068
-TDMT_VND_TMQ_MAX_MSG                        = 2069
-TDMT_VND_TMQ_MAX_MSG_RSP                    = 2070
 TDMT_MND_ARB_HEARTBEAT_TIMER                = 2305
 TDMT_MND_ARB_HEARTBEAT_TIMER_RSP            = 2306
 TDMT_MND_ARB_CHECK_SYNC_TIMER               = 2307
@@ -556,5 +538,3 @@ TDMT_MND_ARB_UPDATE_GROUP                   = 2309
 TDMT_MND_ARB_UPDATE_GROUP_RSP               = 2310
 TDMT_MND_ARB_UPDATE_GROUP_BATCH             = 2311
 TDMT_MND_ARB_UPDATE_GROUP_BATCH_RSP         = 2312
-TDMT_MND_ARB_MAX_MSG                        = 2313
-TDMT_MND_ARB_MAX_MSG_RSP                    = 2314
diff --git a/source/dnode/mgmt/node_mgmt/src/dmTransport.c b/source/dnode/mgmt/node_mgmt/src/dmTransport.c
index a2355ddd22..6649d164a5 100644
--- a/source/dnode/mgmt/node_mgmt/src/dmTransport.c
+++ b/source/dnode/mgmt/node_mgmt/src/dmTransport.c
@@ -58,8 +58,8 @@ static void dmConvertErrCode(tmsg_t msgType) {
   if (terrno != TSDB_CODE_APP_IS_STOPPING) {
     return;
   }
-  if ((msgType > TDMT_VND_MSG && msgType < TDMT_VND_MAX_MSG) ||
-      (msgType > TDMT_SCH_MSG && msgType < TDMT_SCH_MAX_MSG)) {
+  if ((msgType > TDMT_VND_MSG_MIN && msgType < TDMT_VND_MSG_MAX) ||
+      (msgType > TDMT_SCH_MSG_MIN && msgType < TDMT_SCH_MSG_MAX)) {
     terrno = TSDB_CODE_VND_STOPPED;
   }
 }
@@ -279,7 +279,7 @@ int32_t dmInitMsgHandle(SDnode *pDnode) {
 
 static inline int32_t dmSendReq(const SEpSet *pEpSet, SRpcMsg *pMsg) {
   SDnode *pDnode = dmInstance();
-  if (pDnode->status != DND_STAT_RUNNING && pMsg->msgType < TDMT_SYNC_MSG) {
+  if (pDnode->status != DND_STAT_RUNNING && pMsg->msgType < TDMT_SYNC_MSG_MIN) {
     rpcFreeCont(pMsg->pCont);
     pMsg->pCont = NULL;
     if (pDnode->status == DND_STAT_INIT) {
@@ -296,7 +296,7 @@ static inline int32_t dmSendReq(const SEpSet *pEpSet, SRpcMsg *pMsg) {
 }
 static inline int32_t dmSendSyncReq(const SEpSet *pEpSet, SRpcMsg *pMsg) {
   SDnode *pDnode = dmInstance();
-  if (pDnode->status != DND_STAT_RUNNING && pMsg->msgType < TDMT_SYNC_MSG) {
+  if (pDnode->status != DND_STAT_RUNNING && pMsg->msgType < TDMT_SYNC_MSG_MIN) {
     rpcFreeCont(pMsg->pCont);
     pMsg->pCont = NULL;
     if (pDnode->status == DND_STAT_INIT) {