refact dnode

include/common/tglobal.h

@@ -28,10 +28,6 @@ extern char     tsSecond[];
 extern char     tsLocalFqdn[];
 extern char     tsLocalEp[];
 extern uint16_t tsServerPort;
-extern uint16_t tsDnodeShellPort;
-extern uint16_t tsDnodeDnodePort;
-extern uint16_t tsSyncPort;
-extern uint16_t tsArbitratorPort;
 extern int32_t  tsStatusInterval;
 extern int32_t  tsNumOfMnodes;
 extern int8_t   tsEnableVnodeBak;

include/dnode/mnode/mnode.h

@@ -26,7 +26,7 @@ typedef struct SMnode    SMnode;
 typedef struct SMnodeMsg SMnodeMsg;
 typedef void (*SendMsgToDnodeFp)(SDnode *pDnd, struct SEpSet *epSet, struct SRpcMsg *rpcMsg);
 typedef void (*SendMsgToMnodeFp)(SDnode *pDnd, struct SRpcMsg *rpcMsg);
-typedef void (*SendRedirectMsgFp)(SDnode *pDnd, struct SRpcMsg *rpcMsg, bool forShell);
+typedef void (*SendRedirectMsgFp)(SDnode *pDnd, struct SRpcMsg *rpcMsg);
 typedef int32_t (*PutMsgToMnodeQFp)(SDnode *pDnd, SMnodeMsg *pMsg);
 
 typedef struct SMnodeLoad {

include/dnode/vnode/vnode.h

@@ -187,7 +187,7 @@ typedef struct {
 typedef struct SDnode SDnode;
 typedef void (*SendMsgToDnodeFp)(SDnode *pDnd, struct SEpSet *epSet, struct SRpcMsg *rpcMsg);
 typedef void (*SendMsgToMnodeFp)(SDnode *pDnd, struct SRpcMsg *rpcMsg);
-typedef void (*SendRedirectMsgFp)(SDnode *pDnd, struct SRpcMsg *rpcMsg, bool forShell);
+typedef void (*SendRedirectMsgFp)(SDnode *pDnd, struct SRpcMsg *rpcMsg);
 typedef int32_t (*PutMsgToVnodeQFp)(SDnode *pDnd, int32_t vgId, SVnodeMsg *pMsg);
 
 typedef struct {

include/util/tdef.h

@@ -358,12 +358,6 @@ do { \
 #define TSDB_DEFAULT_STABLES_HASH_SIZE         100
 #define TSDB_DEFAULT_CTABLES_HASH_SIZE         20000
 
-#define TSDB_PORT_DNODESHELL                   0
-#define TSDB_PORT_DNODEDNODE                   5
-#define TSDB_PORT_SYNC                         10
-#define TSDB_PORT_HTTP                         11
-#define TSDB_PORT_ARBITRATOR                   12
-
 #define TSDB_MAX_WAL_SIZE    (1024*1024*3)
 
 #define TSDB_ARB_DUMMY_TIME                    4765104000000 // 2121-01-01 00:00:00.000, :P

source/common/src/tglobal.c

@@ -33,10 +33,6 @@ char     tsArbitrator[TSDB_EP_LEN] = {0};
 char     tsLocalFqdn[TSDB_FQDN_LEN] = {0};
 char     tsLocalEp[TSDB_EP_LEN] = {0};  // Local End Point, hostname:port
 uint16_t tsServerPort = 6030;
-uint16_t tsDnodeShellPort = 6030;  // udp[6035-6039] tcp[6035]
-uint16_t tsDnodeDnodePort = 6035;  // udp/tcp
-uint16_t tsSyncPort = 6040;
-uint16_t tsArbitratorPort = 6042;
 int32_t  tsStatusInterval = 1;  // second
 int32_t  tsNumOfMnodes = 1;
 int8_t   tsEnableVnodeBak = 1;
@@ -1726,11 +1722,6 @@ int32_t taosCheckGlobalCfg() {
     }
   }
 
-  tsDnodeShellPort = tsServerPort + TSDB_PORT_DNODESHELL;  // udp[6035-6039] tcp[6035]
-  tsDnodeDnodePort = tsServerPort + TSDB_PORT_DNODEDNODE;   // udp/tcp
-  tsSyncPort = tsServerPort + TSDB_PORT_SYNC;
-  tsHttpPort = tsServerPort + TSDB_PORT_HTTP;
-
   if (tsQueryBufferSize >= 0) {
     tsQueryBufferSizeBytes = tsQueryBufferSize * 1048576UL;
   }

source/dnode/mgmt/impl/inc/dndDnode.h

@@ -30,7 +30,7 @@ int32_t dndGetDnodeId(SDnode *pDnd);
 int64_t dndGetClusterId(SDnode *pDnd);
 void    dndGetDnodeEp(SDnode *pDnd, int32_t dnodeId, char *pEp, char *pFqdn, uint16_t *pPort);
 void    dndGetMnodeEpSet(SDnode *pDnd, SEpSet *pEpSet);
-void    dndSendRedirectMsg(SDnode *pDnd, SRpcMsg *pMsg, bool forShell);
+void    dndSendRedirectMsg(SDnode *pDnd, SRpcMsg *pMsg);
 
 #ifdef __cplusplus
 }

source/dnode/mgmt/impl/inc/dndInt.h

@@ -31,9 +31,10 @@ extern "C" {
 #include "tthread.h"
 #include "ttime.h"
 #include "tworker.h"
+
+#include "dnode.h"
 #include "mnode.h"
 #include "vnode.h"
-#include "dnode.h"
 
 extern int32_t dDebugFlag;
 
@@ -54,17 +55,16 @@ typedef struct {
 } SDnodeDir;
 
 typedef struct {
-  int32_t         dnodeId;
-  uint32_t        rebootTime;
-  int32_t         dropped;
-  int64_t         clusterId;
-  SEpSet          shellEpSet;
-  SEpSet          peerEpSet;
-  char           *file;
-  SHashObj       *dnodeHash;
-  SDnodeEps      *dnodeEps;
-  pthread_t      *threadId;
-  pthread_mutex_t mutex;
+  int32_t    dnodeId;
+  int32_t    dropped;
+  uint32_t   rebootTime;
+  int64_t    clusterId;
+  SEpSet     mnodeEpSet;
+  char      *file;
+  SHashObj  *dnodeHash;
+  SDnodeEps *dnodeEps;
+  pthread_t *threadId;
+  SRWLatch   latch;
 } SDnodeMgmt;
 
 typedef struct {
@@ -108,7 +108,7 @@ typedef struct SDnode {
   EStat       stat;
   SDnodeOpt   opt;
   SDnodeDir   dir;
-  SDnodeMgmt  d;
+  SDnodeMgmt  dmgmt;
   SMnodeMgmt  m;
   SVnodesMgmt vmgmt;
   STransMgmt  t;

source/dnode/mnode/impl/src/mnode.c

@@ -53,7 +53,7 @@ void mnodeSendMsgToMnode(SMnode *pMnode, struct SRpcMsg *rpcMsg) {
 
 void mnodeSendRedirectMsg(SMnode *pMnode, struct SRpcMsg *rpcMsg, bool forShell) {
   assert(pMnode);
-  (*pMnode->sendRedirectMsgFp)(pMnode->pServer, rpcMsg, forShell);
+  (*pMnode->sendRedirectMsgFp)(pMnode->pServer, rpcMsg);
 }
 
 static int32_t mnodeInitTimer() {