Merge pull request #23189 from taosdata/fix/TD-26426-3.0

fix: alter active code for different server

include/common/tgrant.h

@@ -52,7 +52,11 @@ typedef enum {
 
 int32_t grantCheck(EGrantType grant);
 #ifdef TD_ENTERPRISE
+#ifndef TD_GRANT_OPTIMIZE
 int32_t grantAlterActiveCode(const char* old, const char* new, char* out, int8_t type);
+#else
+int32_t grantAlterActiveCode(int32_t did, const char* old, const char* new, char* out, int8_t type);
+#endif
 #endif
 
 #ifndef GRANTS_CFG

source/dnode/mgmt/mgmt_dnode/src/dmInt.c

@@ -21,7 +21,7 @@ static int32_t dmStartMgmt(SDnodeMgmt *pMgmt) {
   if (dmStartStatusThread(pMgmt) != 0) {
     return -1;
   }
-#if defined(TD_ENTERPRISE) && !defined(_TD_DARWIN_64)
+#if defined(TD_ENTERPRISE)
   if (dmStartNotifyThread(pMgmt) != 0) {
     return -1;
   }
@@ -39,7 +39,9 @@ static void dmStopMgmt(SDnodeMgmt *pMgmt) {
   pMgmt->pData->stopped = true;
   dmStopMonitorThread(pMgmt);
   dmStopStatusThread(pMgmt);
+#if defined(TD_ENTERPRISE)
   dmStopNotifyThread(pMgmt);
+#endif
   dmStopCrashReportThread(pMgmt);
 }
 

source/dnode/mnode/impl/src/mndDnode.c

@@ -720,8 +720,8 @@ static int32_t mndProcessNotifyReq(SRpcMsg *pReq) {
       mndReleaseVgroup(pMnode, pVgroup);
     }
   }
-_OVER:
     mndUpdClusterInfo(pReq);
+_OVER:
   tFreeSNotifyReq(&notifyReq);
   return code;
 }
@@ -781,10 +781,11 @@ static int32_t mndConfigDnode(SMnode *pMnode, SRpcMsg *pReq, SMCfgDnodeReq *pCfg
 
     SDnodeObj tmpDnode = *pDnode;
     if (action == DND_ACTIVE_CODE) {
-#ifndef TD_CHECK_ACTIVE
+#ifndef TD_GRANT_OPTIMIZE
-      strncpy(tmpDnode.active, pCfgReq->value, TSDB_ACTIVE_KEY_LEN);
-#else
       if (grantAlterActiveCode(pDnode->active, pCfgReq->value, tmpDnode.active, 0) != 0) {
+#else
+      if (grantAlterActiveCode(pDnode->id, pDnode->active, pCfgReq->value, tmpDnode.active, 0) != 0) {
+#endif
         if (TSDB_CODE_DUP_KEY != terrno) {
           mError("dnode:%d, config dnode:%d, app:%p config:%s value:%s failed since %s", pDnode->id, pCfgReq->dnodeId,
                  pReq->info.ahandle, pCfgReq->config, pCfgReq->value, terrstr());
@@ -799,12 +800,12 @@ static int32_t mndConfigDnode(SMnode *pMnode, SRpcMsg *pReq, SMCfgDnodeReq *pCfg
         if (cfgAll) continue;
         goto _OVER;
       }
-#endif
     } else if (action == DND_CONN_ACTIVE_CODE) {
-#ifndef TD_CHECK_ACTIVE
+#ifndef TD_GRANT_OPTIMIZE
-      strncpy(tmpDnode.connActive, pCfgReq->value, TSDB_CONN_ACTIVE_KEY_LEN);
-#else
       if (grantAlterActiveCode(pDnode->connActive, pCfgReq->value, tmpDnode.connActive, 1) != 0) {
+#else
+      if (grantAlterActiveCode(pDnode->id, pDnode->connActive, pCfgReq->value, tmpDnode.connActive, 1) != 0) {
+#endif
         if (TSDB_CODE_DUP_KEY != terrno) {
           mError("dnode:%d, config dnode:%d, app:%p config:%s value:%s failed since %s", pDnode->id, pCfgReq->dnodeId,
                  pReq->info.ahandle, pCfgReq->config, pCfgReq->value, terrstr());
@@ -819,7 +820,6 @@ static int32_t mndConfigDnode(SMnode *pMnode, SRpcMsg *pReq, SMCfgDnodeReq *pCfg
         if (cfgAll) continue;
         goto _OVER;
       }
-#endif
     } else {
       terrno = TSDB_CODE_INVALID_CFG;
       goto _OVER;

source/dnode/mnode/impl/src/mndGrant.c

@@ -131,7 +131,13 @@ void    grantAdd(EGrantType grant, uint64_t value) {}
 void    grantRestore(EGrantType grant, uint64_t value) {}
 int32_t dmProcessGrantReq(void *pInfo, SRpcMsg *pMsg) { return TSDB_CODE_SUCCESS; }
 int32_t dmProcessGrantNotify(void *pInfo, SRpcMsg *pMsg) { return TSDB_CODE_SUCCESS; }
+#ifndef TD_GRANT_OPTIMIZE
 int32_t grantAlterActiveCode(const char *old, const char *new, char *out, int8_t type) { return TSDB_CODE_SUCCESS; }
+#else
+int32_t grantAlterActiveCode(int32_t did, const char *old, const char *new, char *out, int8_t type) {
+  return TSDB_CODE_SUCCESS;
+}
+#endif
 
 #endif
 

source/dnode/vnode/src/meta/metaTable.c

@@ -195,7 +195,7 @@ int metaDelJsonVarFromIdx(SMeta *pMeta, const SMetaEntry *pCtbEntry, const SSche
 }
 
 static inline void metaTimeSeriesNotifyCheck(SMeta *pMeta) {
-#if defined(TD_ENTERPRISE) && !defined(_TD_DARWIN_64)
+#if defined(TD_ENTERPRISE)
   int64_t nTimeSeries = metaGetTimeSeriesNum(pMeta, 0);
   int64_t deltaTS = nTimeSeries - pMeta->pVnode->config.vndStats.numOfReportedTimeSeries;
   if (deltaTS > tsTimeSeriesThreshold) {

tests/system-test/0-others/information_schema.py

@@ -242,7 +242,7 @@ class TDTestCase:
         self.str510 = self.str255 + self.str255
         tdSql.error('alter dnode 1 "activeCode" "a"')
         tdSql.error('alter dnode 1 "activeCode" "' + self.str107 + '"')
-        # tdSql.error('alter all dnodes "activeCode" "' + self.str108 + '"')
+        tdSql.error('alter all dnodes "activeCode" "' + self.str108 + '"')
         tdSql.error('alter dnode 1 "activeCode" "' + self.str109 + '"')
         tdSql.error('alter all dnodes "activeCode" "' + self.str510 + '"')
         tdSql.query(f'select * from information_schema.ins_dnodes')
@@ -257,12 +257,12 @@ class TDTestCase:
         tdSql.error('alter all dnodes "cActiveCode" "' + self.str255 + '"')
         tdSql.error('alter all dnodes "cActiveCode" "' + self.str256 + '"')
         tdSql.error('alter all dnodes "cActiveCode" "' + self.str257 + '"')
-        # tdSql.error('alter all dnodes "cActiveCode" "' + self.str254 + '"')
+        tdSql.error('alter all dnodes "cActiveCode" "' + self.str254 + '"')
         tdSql.error('alter dnode 1 "cActiveCode" "' + self.str510 + '"')
         tdSql.query(f'select active_code,c_active_code from information_schema.ins_dnodes')
         tdSql.checkEqual(tdSql.queryResult[0][0],"")
         tdSql.checkEqual(tdSql.queryResult[0][1],"")
-        # tdSql.error('alter dnode 1 "cActiveCode" "' + self.str109 + '"')
+        tdSql.error('alter dnode 1 "cActiveCode" "' + self.str109 + '"')
         tdSql.query(f'show dnodes')
         tdSql.checkEqual(tdSql.queryResult[0][9],"")
         tdSql.execute('alter all dnodes "cActiveCode" ""')