Merge pull request #9343 from taosdata/fix/TS-976

[TS-976]<fix>: allow roll upgrade in a cluster

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;

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;

tests/pytest/util/dnodes.py

@@ -112,7 +112,7 @@ class TDSimClient:
         
         # update extra client config
         clientCfgkeys = ["clientMerge"]
-        if updatecfgDict[0] and updatecfgDict[0][0]:
+        if bool(updatecfgDict) and updatecfgDict[0] and updatecfgDict[0][0]:
             for key, value in updatecfgDict[0][0].items():                
                 if key in clientCfgkeys:
                     self.cfg(key, value)