From 4a01bfb1c1f7485cbb7dd04ff7e83860ff64e22a Mon Sep 17 00:00:00 2001 From: Minglei Jin Date: Thu, 23 Dec 2021 19:36:19 +0800 Subject: [PATCH] [TS-976]: allow roll upgrade in a cluster --- src/dnode/src/dnodeVnodes.c | 2 +- src/mnode/src/mnodeDnode.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dnode/src/dnodeVnodes.c b/src/dnode/src/dnodeVnodes.c index a5b0e9fe30..0f2e6cd428 100644 --- a/src/dnode/src/dnodeVnodes.c +++ b/src/dnode/src/dnodeVnodes.c @@ -253,7 +253,7 @@ static void dnodeSendStatusMsg(void *handle, void *tmrId) { dnodeGetCfg(&pStatus->dnodeId, pStatus->clusterId); pStatus->dnodeId = htonl(dnodeGetDnodeId()); - pStatus->version = htonl(tsVersion); + pStatus->version = htonl(tsVersion >> 8); pStatus->lastReboot = htonl(tsRebootTime); pStatus->numOfCores = htons((uint16_t) tsNumOfCores); pStatus->diskAvailable = tsAvailDataDirGB; diff --git a/src/mnode/src/mnodeDnode.c b/src/mnode/src/mnodeDnode.c index 02cf1c782c..5ea6157b6f 100644 --- a/src/mnode/src/mnodeDnode.c +++ b/src/mnode/src/mnodeDnode.c @@ -524,7 +524,7 @@ static int32_t mnodeProcessDnodeStatusMsg(SMnodeMsg *pMsg) { pStatus->numOfCores = htons(pStatus->numOfCores); uint32_t _version = htonl(pStatus->version); - if (_version != tsVersion) { + if (_version != tsVersion >> 8) { pDnode = mnodeGetDnodeByEp(pStatus->dnodeEp); if (pDnode != NULL && pDnode->status != TAOS_DN_STATUS_READY) { pDnode->offlineReason = TAOS_DN_OFF_VERSION_NOT_MATCH; -- GitLab