diff --git a/src/common/src/tglobal.c b/src/common/src/tglobal.c index 9528d3705c4ed8bf269bdf106e08a6abd111d2ee..c3dc078428cfa66298444d29ff669fc05e7f65fc 100644 --- a/src/common/src/tglobal.c +++ b/src/common/src/tglobal.c @@ -40,7 +40,7 @@ uint16_t tsSyncPort = 6040; int32_t tsStatusInterval = 1; // second int32_t tsNumOfMnodes = 3; int32_t tsEnableVnodeBak = 1; -int32_t tsEnableTelemetryReporting = 0; +int32_t tsEnableTelemetryReporting = 1; // common int32_t tsRpcTimer = 1000; diff --git a/src/dnode/src/dnodeTelemetry.c b/src/dnode/src/dnodeTelemetry.c index 356aebd654f27d7e9c51e7bca0e2ba34205ea4eb..60277a275a331c3ecc9d8e17189e989112d0ebc1 100644 --- a/src/dnode/src/dnodeTelemetry.c +++ b/src/dnode/src/dnodeTelemetry.c @@ -174,7 +174,6 @@ static void addVersionInfo(SBufferWriter* bw) { } static void addRuntimeInfo(SBufferWriter* bw) { - addStringField(bw, "clusterId", mnodeGetClusterId()); // addIntField(&bw, "numOfDnode", 1); // addIntField(&bw, "numOfVnode", 1); // addIntField(&bw, "numOfStable", 1); @@ -189,17 +188,18 @@ static void sendTelemetryReport() { char buf[128]; uint32_t ip = taosGetIpFromFqdn(TELEMETRY_SERVER); if (ip == 0xffffffff) { - dError("failed to get IP address of " TELEMETRY_SERVER ", reason:%s", strerror(errno)); + dTrace("failed to get IP address of " TELEMETRY_SERVER ", reason:%s", strerror(errno)); return; } int fd = taosOpenTcpClientSocket(ip, TELEMETRY_PORT, 0); if (fd < 0) { - dError("failed to create socket for telemetry, reason:%s", strerror(errno)); + dTrace("failed to create socket for telemetry, reason:%s", strerror(errno)); return; } SBufferWriter bw = tbufInitWriter(NULL, false); beginObject(&bw); + addStringField(&bw, "instanceId", mnodeGetClusterId()); addIntField(&bw, "reportVersion", 1); addOsInfo(&bw); addCpuInfo(&bw); @@ -254,7 +254,7 @@ int32_t dnodeInitTelemetry() { if (sem_init(&tsExitSem, 0, 0) == -1) { // just log the error, it is ok for telemetry to fail - dError("failed to create semaphore for telemetry, reason:%s", strerror(errno)); + dTrace("failed to create semaphore for telemetry, reason:%s", strerror(errno)); return 0; } @@ -265,7 +265,7 @@ int32_t dnodeInitTelemetry() { int32_t code = pthread_create(&tsTelemetryThread, &attr, telemetryThread, NULL); pthread_attr_destroy(&attr); if (code != 0) { - dError("failed to create telemetry thread, reason:%s", strerror(errno)); + dTrace("failed to create telemetry thread, reason:%s", strerror(errno)); } return 0; diff --git a/src/os/src/detail/osSysinfo.c b/src/os/src/detail/osSysinfo.c index 9703d26ec4fb9fcf4231a049b05d7d3a4965e9c7..7c01239490e7764c5bd9d045cc8a7ccc29d3dfad 100644 --- a/src/os/src/detail/osSysinfo.c +++ b/src/os/src/detail/osSysinfo.c @@ -651,7 +651,11 @@ bool taosGetSystemUid(char *uid) { close(fd); } - return len > 0; + if (len >= 36) { + uid[36] = 0; + return true; + } + return false; } #endif \ No newline at end of file diff --git a/tests/pytest/util/dnodes.py b/tests/pytest/util/dnodes.py index 2e7732ea4f8946ccd02314b67a4cadf50a258893..1ac492bb3ad2733c7b2ebb46560edbb7204e8951 100644 --- a/tests/pytest/util/dnodes.py +++ b/tests/pytest/util/dnodes.py @@ -39,6 +39,7 @@ class TDSimClient: "udebugFlag": "135", "jnidebugFlag": "135", "qdebugFlag": "135", + "telemetryReporting": "0", } def init(self, path): self.__init__() diff --git a/tests/script/sh/deploy.sh b/tests/script/sh/deploy.sh index 1a0d667f88ba3ec06ed5f0e4d0a60e6dedad6d68..841dfcce95bb8aa4dc16201cbcc9f5ffd9040eb7 100755 --- a/tests/script/sh/deploy.sh +++ b/tests/script/sh/deploy.sh @@ -147,6 +147,6 @@ echo "asyncLog 0" >> $TAOS_CFG echo "numOfMnodes 1" >> $TAOS_CFG echo "locale en_US.UTF-8" >> $TAOS_CFG echo "fsync 0" >> $TAOS_CFG -echo "tsEnableTelemetryReporting 0" >> $TAOS_CFG +echo "telemetryReporting 0" >> $TAOS_CFG echo " " >> $TAOS_CFG