[TD-10430] move telem from dnode to mnode

source/server/dnode/src/dnodeCheck.c

@@ -14,8 +14,6 @@
  */
 
 #define _DEFAULT_SOURCE
-#include "os.h"
-#include "tglobal.h"
 #include "dnodeCheck.h"
 
 #define MIN_AVAIL_MEMORY_MB 32

source/server/dnode/src/dnodeInt.c

@@ -28,7 +28,6 @@
 #include "dnodeMain.h"
 #include "dnodeMnodeEps.h"
 #include "dnodeStatus.h"
-#include "dnodeTelem.h"
 #include "dnodeTrans.h"
 #include "mnode.h"
 #include "vnode.h"
@@ -73,7 +72,6 @@ int32_t dnodeInit() {
   taosStepAdd(tsSteps, "dnode-mnode", dnodeInitMnodeModule, mnodeCleanup);
   taosStepAdd(tsSteps, "dnode-trans", dnodeInitTrans, dnodeCleanupTrans);
   taosStepAdd(tsSteps, "dnode-status", dnodeInitStatus, dnodeCleanupStatus);
-  taosStepAdd(tsSteps, "dnode-telem", dnodeInitTelem, dnodeCleanupTelem);
   //taosStepAdd(tsSteps, "dnode-script",scriptEnvPoolInit, scriptEnvPoolCleanup);
 
   taosStepExec(tsSteps);

source/server/mnode/inc/mnodeDef.h

@@ -16,6 +16,7 @@
 #ifndef _TD_MNODE_DEF_H_
 #define _TD_MNODE_DEF_H_
 
+#include "os.h"
 #include "taosmsg.h"
 #include "tlog.h"
 #include "trpc.h"

source/server/dnode/inc/dnodeTelem.h → source/server/mnode/inc/mnodeTelem.h

@@ -13,19 +13,19 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _TD_DNODE_TELEMETRY_H_
-#define _TD_DNODE_TELEMETRY_H_
+#ifndef _TD_MNODE_TELEMETRY_H_
+#define _TD_MNODE_TELEMETRY_H_
 
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "dnodeInt.h"
+#include "mnodeInt.h"
 
-int32_t dnodeInitTelem();
-void    dnodeCleanupTelem();
+int32_t mnodeInitTelem();
+void    mnodeCleanupTelem();
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /*_TD_DNODE_TELEMETRY_H_*/
+#endif /*_TD_MNODE_TELEMETRY_H_*/

source/server/dnode/src/dnodeTelem.c → source/server/mnode/src/mnodeTelem.c

@@ -14,12 +14,9 @@
  */
 
 #define _DEFAULT_SOURCE
-#include "os.h"
+#include "mnodeTelem.h"
 #include "tbuffer.h"
 #include "tglobal.h"
-#include "dnodeCfg.h"
-#include "dnodeTelem.h"
-#include "mnode.h"
 
 #define TELEMETRY_SERVER "telemetry.taosdata.com"
 #define TELEMETRY_PORT 80
@@ -38,9 +35,9 @@ static struct {
   char             email[TSDB_FQDN_LEN];
 } tsTelem;
 
-static void dnodeBeginObject(SBufferWriter* bw) { tbufWriteChar(bw, '{'); }
+static void mnodeBeginObject(SBufferWriter* bw) { tbufWriteChar(bw, '{'); }
 
-static void dnodeCloseObject(SBufferWriter* bw) {
+static void mnodeCloseObject(SBufferWriter* bw) {
   size_t len = tbufTell(bw);
   if (tbufGetData(bw, false)[len - 1] == ',') {
     tbufWriteCharAt(bw, len - 1, '}');
@@ -66,14 +63,14 @@ static void closeArray(SBufferWriter* bw) {
 }
 #endif
 
-static void dnodeWriteString(SBufferWriter* bw, const char* str) {
+static void mnodeWriteString(SBufferWriter* bw, const char* str) {
   tbufWriteChar(bw, '"');
   tbufWrite(bw, str, strlen(str));
   tbufWriteChar(bw, '"');
 }
 
-static void dnodeAddIntField(SBufferWriter* bw, const char* k, int64_t v) {
-  dnodeWriteString(bw, k);
+static void mnodeAddIntField(SBufferWriter* bw, const char* k, int64_t v) {
+  mnodeWriteString(bw, k);
   tbufWriteChar(bw, ':');
   char buf[32];
   sprintf(buf, "%" PRId64, v);
@@ -81,14 +78,14 @@ static void dnodeAddIntField(SBufferWriter* bw, const char* k, int64_t v) {
   tbufWriteChar(bw, ',');
 }
 
-static void dnodeAddStringField(SBufferWriter* bw, const char* k, const char* v) {
-  dnodeWriteString(bw, k);
+static void mnodeAddStringField(SBufferWriter* bw, const char* k, const char* v) {
+  mnodeWriteString(bw, k);
   tbufWriteChar(bw, ':');
-  dnodeWriteString(bw, v);
+  mnodeWriteString(bw, v);
   tbufWriteChar(bw, ',');
 }
 
-static void dnodeAddCpuInfo(SBufferWriter* bw) {
+static void mnodeAddCpuInfo(SBufferWriter* bw) {
   char*   line = NULL;
   size_t  size = 0;
   int32_t done = 0;
@@ -102,11 +99,11 @@ static void dnodeAddCpuInfo(SBufferWriter* bw) {
     line[size - 1] = '\0';
     if (((done & 1) == 0) && strncmp(line, "model name", 10) == 0) {
       const char* v = strchr(line, ':') + 2;
-      dnodeAddStringField(bw, "cpuModel", v);
+      mnodeAddStringField(bw, "cpuModel", v);
       done |= 1;
     } else if (((done & 2) == 0) && strncmp(line, "cpu cores", 9) == 0) {
       const char* v = strchr(line, ':') + 2;
-      dnodeWriteString(bw, "numOfCpu");
+      mnodeWriteString(bw, "numOfCpu");
       tbufWriteChar(bw, ':');
       tbufWrite(bw, v, strlen(v));
       tbufWriteChar(bw, ',');
@@ -118,7 +115,7 @@ static void dnodeAddCpuInfo(SBufferWriter* bw) {
   fclose(fp);
 }
 
-static void dnodeAddOsInfo(SBufferWriter* bw) {
+static void mnodeAddOsInfo(SBufferWriter* bw) {
   char*  line = NULL;
   size_t size = 0;
 
@@ -135,7 +132,7 @@ static void dnodeAddOsInfo(SBufferWriter* bw) {
         p++;
         line[size - 2] = 0;
       }
-      dnodeAddStringField(bw, "os", p);
+      mnodeAddStringField(bw, "os", p);
       break;
     }
   }
@@ -144,7 +141,7 @@ static void dnodeAddOsInfo(SBufferWriter* bw) {
   fclose(fp);
 }
 
-static void dnodeAddMemoryInfo(SBufferWriter* bw) {
+static void mnodeAddMemoryInfo(SBufferWriter* bw) {
   char*  line = NULL;
   size_t size = 0;
 
@@ -158,7 +155,7 @@ static void dnodeAddMemoryInfo(SBufferWriter* bw) {
     if (strncmp(line, "MemTotal", 8) == 0) {
       const char* p = strchr(line, ':') + 1;
       while (*p == ' ') p++;
-      dnodeAddStringField(bw, "memory", p);
+      mnodeAddStringField(bw, "memory", p);
       break;
     }
   }
@@ -167,57 +164,57 @@ static void dnodeAddMemoryInfo(SBufferWriter* bw) {
   fclose(fp);
 }
 
-static void dnodeAddVersionInfo(SBufferWriter* bw) {
-  dnodeAddStringField(bw, "version", version);
-  dnodeAddStringField(bw, "buildInfo", buildinfo);
-  dnodeAddStringField(bw, "gitInfo", gitinfo);
-  dnodeAddStringField(bw, "email", tsTelem.email);
+static void mnodeAddVersionInfo(SBufferWriter* bw) {
+  mnodeAddStringField(bw, "version", version);
+  mnodeAddStringField(bw, "buildInfo", buildinfo);
+  mnodeAddStringField(bw, "gitInfo", gitinfo);
+  mnodeAddStringField(bw, "email", tsTelem.email);
 }
 
-static void dnodeAddRuntimeInfo(SBufferWriter* bw) {
+static void mnodeAddRuntimeInfo(SBufferWriter* bw) {
   SMnodeStat stat = {0};
   if (mnodeGetStatistics(&stat) != 0) {
     return;
   }
 
-  dnodeAddIntField(bw, "numOfDnode", stat.numOfDnode);
-  dnodeAddIntField(bw, "numOfMnode", stat.numOfMnode);
-  dnodeAddIntField(bw, "numOfVgroup", stat.numOfVgroup);
-  dnodeAddIntField(bw, "numOfDatabase", stat.numOfDatabase);
-  dnodeAddIntField(bw, "numOfSuperTable", stat.numOfSuperTable);
-  dnodeAddIntField(bw, "numOfChildTable", stat.numOfChildTable);
-  dnodeAddIntField(bw, "numOfColumn", stat.numOfColumn);
-  dnodeAddIntField(bw, "numOfPoint", stat.totalPoints);
-  dnodeAddIntField(bw, "totalStorage", stat.totalStorage);
-  dnodeAddIntField(bw, "compStorage", stat.compStorage);
+  mnodeAddIntField(bw, "numOfDnode", stat.numOfDnode);
+  mnodeAddIntField(bw, "numOfMnode", stat.numOfMnode);
+  mnodeAddIntField(bw, "numOfVgroup", stat.numOfVgroup);
+  mnodeAddIntField(bw, "numOfDatabase", stat.numOfDatabase);
+  mnodeAddIntField(bw, "numOfSuperTable", stat.numOfSuperTable);
+  mnodeAddIntField(bw, "numOfChildTable", stat.numOfChildTable);
+  mnodeAddIntField(bw, "numOfColumn", stat.numOfColumn);
+  mnodeAddIntField(bw, "numOfPoint", stat.totalPoints);
+  mnodeAddIntField(bw, "totalStorage", stat.totalStorage);
+  mnodeAddIntField(bw, "compStorage", stat.compStorage);
 }
 
-static void dnodeSendTelemetryReport() {
+static void mnodeSendTelemetryReport() {
   char     buf[128] = {0};
   uint32_t ip = taosGetIpv4FromFqdn(TELEMETRY_SERVER);
   if (ip == 0xffffffff) {
-    dTrace("failed to get IP address of " TELEMETRY_SERVER ", reason:%s", strerror(errno));
+    mTrace("failed to get IP address of " TELEMETRY_SERVER ", reason:%s", strerror(errno));
     return;
   }
   SOCKET fd = taosOpenTcpClientSocket(ip, TELEMETRY_PORT, 0);
   if (fd < 0) {
-    dTrace("failed to create socket for telemetry, reason:%s", strerror(errno));
+    mTrace("failed to create socket for telemetry, reason:%s", strerror(errno));
     return;
   }
 
   char clusterId[TSDB_CLUSTER_ID_LEN] = {0};
-  dnodeGetClusterId(clusterId);
+  mnodeGetClusterId(clusterId);
 
   SBufferWriter bw = tbufInitWriter(NULL, false);
-  dnodeBeginObject(&bw);
-  dnodeAddStringField(&bw, "instanceId", clusterId);
-  dnodeAddIntField(&bw, "reportVersion", 1);
-  dnodeAddOsInfo(&bw);
-  dnodeAddCpuInfo(&bw);
-  dnodeAddMemoryInfo(&bw);
-  dnodeAddVersionInfo(&bw);
-  dnodeAddRuntimeInfo(&bw);
-  dnodeCloseObject(&bw);
+  mnodeBeginObject(&bw);
+  mnodeAddStringField(&bw, "instanceId", clusterId);
+  mnodeAddIntField(&bw, "reportVersion", 1);
+  mnodeAddOsInfo(&bw);
+  mnodeAddCpuInfo(&bw);
+  mnodeAddMemoryInfo(&bw);
+  mnodeAddVersionInfo(&bw);
+  mnodeAddRuntimeInfo(&bw);
+  mnodeCloseObject(&bw);
 
   const char* header =
       "POST /report HTTP/1.1\n"
@@ -235,18 +232,18 @@ static void dnodeSendTelemetryReport() {
 
   // read something to avoid nginx error 499
   if (taosReadSocket(fd, buf, 10) < 0) {
-    dTrace("failed to receive response since %s", strerror(errno));
+    mTrace("failed to receive response since %s", strerror(errno));
   }
 
   taosCloseSocket(fd);
 }
 
-static void* dnodeTelemThreadFp(void* param) {
+static void* mnodeTelemThreadFp(void* param) {
   struct timespec end = {0};
   clock_gettime(CLOCK_REALTIME, &end);
   end.tv_sec += 300;  // wait 5 minutes before send first report
 
-  setThreadName("dnode-telem");
+  setThreadName("mnode-telem");
 
   while (!tsTelem.exit) {
     int32_t         r = 0;
@@ -258,7 +255,7 @@ static void* dnodeTelemThreadFp(void* param) {
     if (r != ETIMEDOUT) continue;
 
     if (mnodeGetStatus() == MN_STATUS_READY) {
-      dnodeSendTelemetryReport();
+      mnodeSendTelemetryReport();
     }
     end.tv_sec += REPORT_INTERVAL;
   }
@@ -266,20 +263,20 @@ static void* dnodeTelemThreadFp(void* param) {
   return NULL;
 }
 
-static void dnodeGetEmail(char* filepath) {
+static void mnodeGetEmail(char* filepath) {
   int32_t fd = taosOpenFileRead(filepath);
   if (fd < 0) {
     return;
   }
 
   if (taosReadFile(fd, (void*)tsTelem.email, TSDB_FQDN_LEN) < 0) {
-    dError("failed to read %d bytes from file %s since %s", TSDB_FQDN_LEN, filepath, strerror(errno));
+    mError("failed to read %d bytes from file %s since %s", TSDB_FQDN_LEN, filepath, strerror(errno));
   }
 
   taosCloseFile(fd);
 }
 
-int32_t dnodeInitTelem() {
+int32_t mnodeInitTelem() {
   tsTelem.enable = tsEnableTelemetryReporting;
   if (!tsTelem.enable) return 0;
 
@@ -288,23 +285,23 @@ int32_t dnodeInitTelem() {
   pthread_cond_init(&tsTelem.cond, NULL);
   tsTelem.email[0] = 0;
 
-  dnodeGetEmail("/usr/local/taos/email");
+  mnodeGetEmail("/usr/local/taos/email");
 
   pthread_attr_t attr;
   pthread_attr_init(&attr);
   pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE);
 
-  int32_t code = pthread_create(&tsTelem.thread, &attr, dnodeTelemThreadFp, NULL);
+  int32_t code = pthread_create(&tsTelem.thread, &attr, mnodeTelemThreadFp, NULL);
   pthread_attr_destroy(&attr);
   if (code != 0) {
-    dTrace("failed to create telemetry thread since :%s", strerror(code));
+    mTrace("failed to create telemetry thread since :%s", strerror(code));
   }
 
-  dInfo("dnode telemetry is initialized");
+  mInfo("mnode telemetry is initialized");
   return 0;
 }
 
-void dnodeCleanupTelem() {
+void mnodeCleanupTelem() {
   if (!tsTelem.enable) return;
 
   if (taosCheckPthreadValid(tsTelem.thread)) {

source/server/mnode/src/mondeInt.c

@@ -34,6 +34,7 @@
 #include "mnodeUser.h"
 #include "mnodeVgroup.h"
 #include "mnodeWorker.h"
+#include "mnodeTelem.h"
 
 static struct {
   int32_t  state;
@@ -127,6 +128,7 @@ static int32_t mnodeInitStep2() {
   taosStepAdd(steps, "mnode-show", mnodeInitShow, mnodeCleanUpShow);
   taosStepAdd(steps, "mnode-sync", mnodeInitSync, mnodeCleanUpSync);
   taosStepAdd(steps, "mnode-worker", NULL, mnodeCleanupWorker);
+  taosStepAdd(steps, "mnode-telem", mnodeInitTelem, mnodeCleanupTelem);
   taosStepAdd(steps, "mnode-timer", NULL, mnodeCleanupTimer);
 
   tsMint.steps2 = steps;