未验证 提交 c6e8c34e 编写于 作者: W wade zhang 提交者: GitHub

Merge pull request #14489 from taosdata/FIX/TD-17007-2

fix: masters number in log.dnodes_info
...@@ -637,7 +637,7 @@ static int32_t monBuildMasterUptimeSql(char *sql) { ...@@ -637,7 +637,7 @@ static int32_t monBuildMasterUptimeSql(char *sql) {
for (int i = 0; i < num_fields; ++i) { for (int i = 0; i < num_fields; ++i) {
if (strcmp(fields[i].name, "role") == 0) { if (strcmp(fields[i].name, "role") == 0) {
int32_t charLen = monGetRowElemCharLen(fields[i], (char *)row[i]); int32_t charLen = monGetRowElemCharLen(fields[i], (char *)row[i]);
if (strncmp((char *)row[i], "master", charLen) == 0) { if (strncmp((char *)row[i], "leader", charLen) == 0) {
if (strcmp(fields[i + 1].name, "role_time") == 0) { if (strcmp(fields[i + 1].name, "role_time") == 0) {
int64_t now = taosGetTimestamp(TSDB_TIME_PRECISION_MILLI); int64_t now = taosGetTimestamp(TSDB_TIME_PRECISION_MILLI);
//master uptime in seconds //master uptime in seconds
...@@ -957,7 +957,7 @@ static int32_t monBuildDnodeVnodesSql(char *sql) { ...@@ -957,7 +957,7 @@ static int32_t monBuildDnodeVnodesSql(char *sql) {
for (int i = 0; i < num_fields; ++i) { for (int i = 0; i < num_fields; ++i) {
if (strcmp(fields[i].name, "status") == 0) { if (strcmp(fields[i].name, "status") == 0) {
int32_t charLen = monGetRowElemCharLen(fields[i], (char *)row[i]); int32_t charLen = monGetRowElemCharLen(fields[i], (char *)row[i]);
if (strncmp((char *)row[i], "master", charLen) == 0) { if (strncmp((char *)row[i], "leader", charLen) == 0) {
masterNum += 1; masterNum += 1;
} }
} }
...@@ -992,7 +992,7 @@ static int32_t monBuildDnodeMnodeSql(char *sql) { ...@@ -992,7 +992,7 @@ static int32_t monBuildDnodeMnodeSql(char *sql) {
} }
} else if (strcmp(fields[i].name, "role") == 0) { } else if (strcmp(fields[i].name, "role") == 0) {
charLen = monGetRowElemCharLen(fields[i], (char *)row[i]); charLen = monGetRowElemCharLen(fields[i], (char *)row[i]);
if (strncmp((char *)row[i], "master", charLen) == 0) { if (strncmp((char *)row[i], "leader", charLen) == 0) {
if (has_mnode_row) { if (has_mnode_row) {
monHasMnodeMaster = true; monHasMnodeMaster = true;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册