Merge pull request #7397 from taosdata/feature/TD-5838

Feature/td 5838

src/kit/shell/src/shellLinux.c

@@ -48,7 +48,7 @@ static struct argp_option options[] = {
   {"check",      'k', "CHECK",      0,                   "Check tables."},
   {"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|sync."},
+  {"netrole",    'n', "NETROLE",    0,                   "Net role when network connectivity test, default is startup, options: client|server|rpc|startup|sync|speen|fqdn."},
   {"pktlen",     'l', "PKTLEN",     0,                   "Packet length used for net test, default is 1000 bytes."},
   {"pktnum",     'N', "PKTNUM",     0,                   "Packet numbers used for net test, default is 100."},
   {"pkttype",    'S', "PKTTYPE",    0,                   "Packet type used for net test, default is TCP."},

src/kit/shell/src/shellWindows.c

@@ -55,7 +55,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|sync.");
+  printf("%s%s%s\n", indent, indent, "Net role when network connectivity test, default is startup, options: client|server|rpc|startup|sync|speed|fqdn.");
   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, "-N");

src/util/src/tnettest.c

@@ -639,17 +639,6 @@ static void taosNetCheckSpeed(char *host, int32_t port, int32_t pkgLen,
   return;
 }
 
-static void taosNetTestSpeed(char *host, int32_t port, int32_t pkgLen,
-                             int32_t pkgNum, char *pkgType) {
-  if (0 == strcmp("fqdn", pkgType)){
-    taosNetTestFqdn(host);
-    return;
-  }
-
-  taosNetCheckSpeed(host, port, pkgLen, pkgNum, pkgType);
-  return;
-}
-
 void taosNetTest(char *role, char *host, int32_t port, int32_t pkgLen,
                  int32_t pkgNum, char *pkgType) {
   tscEmbedded = 1;
@@ -679,7 +668,9 @@ void taosNetTest(char *role, char *host, int32_t port, int32_t pkgLen,
   } else if (0 == strcmp("speed", role)) {
     tscEmbedded = 0;
     char type[10] = {0};
-    taosNetTestSpeed(host, port, pkgLen, pkgNum, strtolower(type, pkgType));
+    taosNetCheckSpeed(host, port, pkgLen, pkgNum, strtolower(type, pkgType));
+  }else if (0 == strcmp("fqdn", role)) {
+    taosNetTestFqdn(host);
   }else {
     taosNetTestStartup(host, port);
   }

tests/nettest/fqdn.sh

+#!/bin/bash
+
+taos -n fqdn

tests/nettest/tcpudp.sh

+#!/bin/bash
+
+
+for N in -1 0 1 10000 10001
+do
+	for l in 1023 1024 1073741824 1073741825 
+	do
+		for S in udp tcp 
+			do
+				taos -n speed -h BCC-2 -P 6030 -N $N -l $l -S $S 2>&1 | tee -a result.txt
+			done
+	done
+done