From 9c7fb6b00faf26250b94d1f32f8bc60a71feee59 Mon Sep 17 00:00:00 2001
From: slguan <slguan@taosdata.com>
Date: Sat, 16 Nov 2019 11:29:19 +0800
Subject: [PATCH] [TBASE-1161]

---
 src/inc/sdb.h             | 6 +++---
 src/inc/trpc.h            | 3 +--
 src/util/src/tglobalcfg.c | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/inc/sdb.h b/src/inc/sdb.h
index 4a1969b700..f645039441 100644
--- a/src/inc/sdb.h
+++ b/src/inc/sdb.h
@@ -23,10 +23,10 @@ extern "C" {
 #include "taosmsg.h"
 #include "tsdb.h"
 
-extern short    sdbPeerPort;
-extern short    sdbSyncPort;
+extern short    tsMgmtMgmtPort;
+extern short    tsMgmtSyncPort;
 extern int      sdbMaxNodes;
-extern int      sdbHbTimer;  // seconds
+extern int      tsMgmtPeerHBTimer;  // seconds
 extern char     sdbZone[];
 extern char     sdbMasterIp[];
 extern char     sdbPrivateIp[];
diff --git a/src/inc/trpc.h b/src/inc/trpc.h
index 3ae6e9ea97..ef86e672d1 100644
--- a/src/inc/trpc.h
+++ b/src/inc/trpc.h
@@ -25,7 +25,6 @@ extern "C" {
 
 #define TAOS_CONN_UDPS     0
 #define TAOS_CONN_UDPC     1
-#define TAOS_CONN_UDP      1
 #define TAOS_CONN_TCPS     2
 #define TAOS_CONN_TCPC     3
 #define TAOS_CONN_HTTPS    4
@@ -39,7 +38,7 @@ extern "C" {
 #define TAOS_ID_REALLOCATE 2
 
 #define TAOS_CONN_SOCKET_TYPE_S()  ((strcasecmp(tsSocketType, TAOS_SOCKET_TYPE_NAME_UDP) == 0)? TAOS_CONN_UDPS:TAOS_CONN_TCPS)
-#define TAOS_CONN_SOCKET_TYPE_C()  ((strcasecmp(tsSocketType, TAOS_SOCKET_TYPE_NAME_UDP) == 0)? TAOS_CONN_UDP:TAOS_CONN_TCPC)
+#define TAOS_CONN_SOCKET_TYPE_C()  ((strcasecmp(tsSocketType, TAOS_SOCKET_TYPE_NAME_UDP) == 0)? TAOS_CONN_UDPC:TAOS_CONN_TCPC)
 
 #define taosSendMsgToPeer(x, y, z) taosSendMsgToPeerH(x, y, z, NULL)
 #define taosOpenRpcChann(x, y, z) taosOpenRpcChannWithQ(x,y,z,NULL)
diff --git a/src/util/src/tglobalcfg.c b/src/util/src/tglobalcfg.c
index bac89db7e2..407761cff0 100644
--- a/src/util/src/tglobalcfg.c
+++ b/src/util/src/tglobalcfg.c
@@ -62,8 +62,8 @@ short tsMgmtShellPort = 6030;   // udp[6030-6034] tcp[6030]
 short tsVnodeShellPort = 6035;  // udp[6035-6039] tcp[6035]
 short tsMgmtVnodePort = 6040;   // udp[6040-6044] tcp[6040]
 short tsVnodeVnodePort = 6045;  // tcp[6045]
-short tsMgmtMgmtPort = 6050;    // sdbPeerPort only udp, numOfVnodes fixed to 1, range udp[6050]
-short tsMgmtSyncPort = 6050;    // sdbSyncPort only tcp, range tcp[6050]
+short tsMgmtMgmtPort = 6050;    // udp, numOfVnodes fixed to 1, range udp[6050]
+short tsMgmtSyncPort = 6050;    // tcp, range tcp[6050]
 
 int tsStatusInterval = 1;         // second
 int tsShellActivityTimer = 3;     // second