From be4fd9831a4c653af46ec67a26763210c229ad6e Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Wed, 27 Jan 2021 11:51:27 +0000
Subject: [PATCH] [TD-2785]<enhance>: Allow to judge the status of sync and
 arbitrator ports

---
 src/kit/shell/src/shellLinux.c   | 2 +-
 src/kit/shell/src/shellWindows.c | 2 +-
 src/sync/src/syncArbitrator.c    | 6 ++++++
 src/sync/src/syncMain.c          | 2 +-
 src/util/src/tnettest.c          | 5 ++++-
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/kit/shell/src/shellLinux.c b/src/kit/shell/src/shellLinux.c
index 9eb30ccdcc..a8f457377d 100644
--- a/src/kit/shell/src/shellLinux.c
+++ b/src/kit/shell/src/shellLinux.c
@@ -47,7 +47,7 @@ static struct argp_option options[] = {
   {"thread",     'T', "THREADNUM",  0,                   "Number of threads when using multi-thread to import data."},
   {"database",   'd', "DATABASE",   0,                   "Database to use when connecting to the server."},
   {"timezone",   't', "TIMEZONE",   0,                   "Time zone of the shell, default is local."},
-  {"netrole",    'n', "NETROLE",    0,                   "Net role when network connectivity test, default is startup, options: client|server|rpc|startup."},
+  {"netrole",    'n', "NETROLE",    0,                   "Net role when network connectivity test, default is startup, options: client|server|rpc|startup|sync."},
   {"pktlen",     'l', "PKTLEN",     0,                   "Packet length used for net test, default is 1000 bytes."},
   {0}};
 
diff --git a/src/kit/shell/src/shellWindows.c b/src/kit/shell/src/shellWindows.c
index 73216f9ca3..56021d9c34 100644
--- a/src/kit/shell/src/shellWindows.c
+++ b/src/kit/shell/src/shellWindows.c
@@ -52,7 +52,7 @@ void printHelp() {
   printf("%s%s\n", indent, "-t");
   printf("%s%s%s\n", indent, indent, "Time zone of the shell, default is local.");
   printf("%s%s\n", indent, "-n");
-  printf("%s%s%s\n", indent, indent, "Net role when network connectivity test, default is startup, options: client|server|rpc|startup.");
+  printf("%s%s%s\n", indent, indent, "Net role when network connectivity test, default is startup, options: client|server|rpc|startup|sync.");
   printf("%s%s\n", indent, "-l");
   printf("%s%s%s\n", indent, indent, "Packet length used for net test, default is 1000 bytes.");
   printf("%s%s\n", indent, "-V");
diff --git a/src/sync/src/syncArbitrator.c b/src/sync/src/syncArbitrator.c
index 9fb6b0ddb7..fdbef4c9f8 100644
--- a/src/sync/src/syncArbitrator.c
+++ b/src/sync/src/syncArbitrator.c
@@ -27,6 +27,7 @@
 #include "syncInt.h"
 #include "syncTcp.h"
 
+extern void    syncProcessTestMsg(SSyncMsg *pMsg, SOCKET connFd);
 static void    arbSignalHandler(int32_t signum, void *sigInfo, void *context);
 static void    arbProcessIncommingConnection(SOCKET connFd, uint32_t sourceIp);
 static void    arbProcessBrokenLink(int64_t rid);
@@ -118,6 +119,11 @@ static void arbProcessIncommingConnection(SOCKET connFd, uint32_t sourceIp) {
     return;
   }
 
+  if (msg.head.type == TAOS_SMSG_TEST) {
+    syncProcessTestMsg(&msg, connFd);
+    return;
+  }
+
   SNodeConn *pNode = calloc(sizeof(SNodeConn), 1);
   if (pNode == NULL) {
     sError("failed to allocate memory since %s", strerror(errno));
diff --git a/src/sync/src/syncMain.c b/src/sync/src/syncMain.c
index 6e87039612..8dac89544b 100644
--- a/src/sync/src/syncMain.c
+++ b/src/sync/src/syncMain.c
@@ -1179,7 +1179,7 @@ static void syncCreateRestoreDataThread(SSyncPeer *pPeer) {
   }
 }
 
-static void syncProcessTestMsg(SSyncMsg *pMsg, SOCKET connFd) {
+void syncProcessTestMsg(SSyncMsg *pMsg, SOCKET connFd) {
   sInfo("recv sync test msg");
 
   SSyncMsg rsp;
diff --git a/src/util/src/tnettest.c b/src/util/src/tnettest.c
index 7e39715cd9..28abad356c 100644
--- a/src/util/src/tnettest.c
+++ b/src/util/src/tnettest.c
@@ -483,7 +483,8 @@ static void taosNetTestRpc(char *host, int32_t startPort, int32_t pkgLen) {
     }
   }
 
-  taosNetCheckSync(host, endPort);
+  taosNetCheckSync(host, startPort + TSDB_PORT_SYNC);
+  taosNetCheckSync(host, startPort + TSDB_PORT_ARBITRATOR);
 }
 
 static void taosNetTestClient(char *host, int32_t startPort, int32_t pkgLen) {
@@ -550,6 +551,8 @@ void taosNetTest(char *role, char *host, int32_t port, int32_t pkgLen) {
     taosNetTestServer(host, port, pkgLen);
   } else if (0 == strcmp("rpc", role)) {
     taosNetTestRpc(host, port, pkgLen);
+  } else if (0 == strcmp("sync", role)) {
+    taosNetCheckSync(host, port);
   } else if (0 == strcmp("startup", role)) {
     taosNetTestStartup(host, port);
   } else {
-- 
GitLab