Merge pull request #21937 from taosdata/fix/TS-3551-M

chore: enable sysInfo update

source/client/src/clientHb.c

@@ -74,41 +74,48 @@ static int32_t hbUpdateUserAuthInfo(SAppHbMgr *pAppHbMgr, SUserAuthBatchRsp *bat
       continue;
     }
 
-    SClientHbReq *pReq = NULL;
+    SClientHbReq    *pReq = NULL;
+    SGetUserAuthRsp *pRsp = NULL;
     while ((pReq = taosHashIterate(hbMgr->activeInfo, pReq))) {
       STscObj *pTscObj = (STscObj *)acquireTscObj(pReq->connKey.tscRid);
       if (!pTscObj) {
         continue;
       }
-      for (int32_t j = 0; j < TARRAY_SIZE(batchRsp->pArray); ++j) {
-        SGetUserAuthRsp *rsp = TARRAY_GET_ELEM(batchRsp->pArray, j);
 
-        if (0 == strncmp(rsp->user, pTscObj->user, TSDB_USER_LEN)) {
-          pTscObj->authVer = rsp->version;
-
-#if 0  // make jenkins happy temporarily. After PR pass, enable these lines again.
-          if (pTscObj->sysInfo != rsp->sysInfo) {
-            tscDebug("update sysInfo of user %s from %" PRIi8 " to %" PRIi8 ", tscRid:%" PRIi64, rsp->user,
-                     pTscObj->sysInfo, rsp->sysInfo, pTscObj->id);
-            pTscObj->sysInfo = rsp->sysInfo;
-          }
-#endif
-          if (pTscObj->passInfo.fp) {
-            SPassInfo *passInfo = &pTscObj->passInfo;
-            int32_t    oldVer = atomic_load_32(&passInfo->ver);
-            if (oldVer < rsp->passVer) {
-              atomic_store_32(&passInfo->ver, rsp->passVer);
-              if (passInfo->fp) {
-                (*passInfo->fp)(passInfo->param, &rsp->passVer, TAOS_NOTIFY_PASSVER);
-              }
-              tscDebug("update passVer of user %s from %d to %d, tscRid:%" PRIi64, rsp->user, oldVer,
-                       atomic_load_32(&passInfo->ver), pTscObj->id);
-            }
+      if (!pRsp) {
+        for (int32_t j = 0; j < TARRAY_SIZE(batchRsp->pArray); ++j) {
+          SGetUserAuthRsp *rsp = TARRAY_GET_ELEM(batchRsp->pArray, j);
+          if (0 == strncmp(rsp->user, pTscObj->user, TSDB_USER_LEN)) {
+            pRsp = rsp;
+            break;
           }
-
+        }
+        if (!pRsp) {
+          releaseTscObj(pReq->connKey.tscRid);
           break;
         }
       }
+
+      pTscObj->authVer = pRsp->version;
+
+      if (pTscObj->sysInfo != pRsp->sysInfo) {
+        tscDebug("update sysInfo of user %s from %" PRIi8 " to %" PRIi8 ", tscRid:%" PRIi64, pRsp->user,
+                 pTscObj->sysInfo, pRsp->sysInfo, pTscObj->id);
+        pTscObj->sysInfo = pRsp->sysInfo;
+      }
+
+      if (pTscObj->passInfo.fp) {
+        SPassInfo *passInfo = &pTscObj->passInfo;
+        int32_t    oldVer = atomic_load_32(&passInfo->ver);
+        if (oldVer < pRsp->passVer) {
+          atomic_store_32(&passInfo->ver, pRsp->passVer);
+          if (passInfo->fp) {
+            (*passInfo->fp)(passInfo->param, &pRsp->passVer, TAOS_NOTIFY_PASSVER);
+          }
+          tscDebug("update passVer of user %s from %d to %d, tscRid:%" PRIi64, pRsp->user, oldVer,
+                   atomic_load_32(&passInfo->ver), pTscObj->id);
+        }
+      }
       releaseTscObj(pReq->connKey.tscRid);
     }
   }

tests/script/api/passwdTest.c

@@ -32,7 +32,7 @@
 #define nRoot    10
 #define nUser    10
 #define USER_LEN 24
-#define BUF_LEN  256
+#define BUF_LEN  1024
 
 typedef uint16_t VarDataLenT;
 
@@ -46,7 +46,7 @@ typedef uint16_t VarDataLenT;
 
 void createUsers(TAOS *taos, const char *host, char *qstr);
 void passVerTestMulti(const char *host, char *qstr);
-void sysInfoTest(const char *host, char *qstr);
+void sysInfoTest(TAOS *taos, const char *host, char *qstr);
 
 int   nPassVerNotified = 0;
 TAOS *taosu[nRoot] = {0};
@@ -200,7 +200,7 @@ int main(int argc, char *argv[]) {
   }
   createUsers(taos, argv[1], qstr);
   passVerTestMulti(argv[1], qstr);
-  sysInfoTest(argv[1], qstr);
+  sysInfoTest(taos, argv[1], qstr);
 
   taos_close(taos);
   taos_cleanup();
@@ -299,26 +299,25 @@ void passVerTestMulti(const char *host, char *qstr) {
   // sleep(300);
 }
 
-void sysInfoTest(const char *host, char *qstr) {
-  // root
+void sysInfoTest(TAOS *taosRoot, const char *host, char *qstr) {
   TAOS *taos[nRoot] = {0};
-  char  userName[USER_LEN] = "root";
+  char  userName[USER_LEN] = "user0";
 
   for (int i = 0; i < nRoot; ++i) {
-    taos[i] = taos_connect(host, "root", "taos", NULL, 0);
+    taos[i] = taos_connect(host, "user0", "taos", NULL, 0);
     if (taos[i] == NULL) {
       fprintf(stderr, "failed to connect to server, reason:%s\n", "null taos" /*taos_errstr(taos)*/);
       exit(1);
     }
   }
 
-  queryDB(taos[0], "create database if not exists demo11 vgroups 1 minrows 10");
-  queryDB(taos[0], "create database if not exists demo12 vgroups 1 minrows 10");
-  queryDB(taos[0], "create database if not exists demo13 vgroups 1 minrows 10");
+  queryDB(taosRoot, "create database if not exists demo11 vgroups 1 minrows 10");
+  queryDB(taosRoot, "create database if not exists demo12 vgroups 1 minrows 10");
+  queryDB(taosRoot, "create database if not exists demo13 vgroups 1 minrows 10");
 
-  queryDB(taos[0], "create table demo11.stb (ts timestamp, c1 int) tags(t1 int)");
-  queryDB(taos[0], "create table demo12.stb (ts timestamp, c1 int) tags(t1 int)");
-  queryDB(taos[0], "create table demo13.stb (ts timestamp, c1 int) tags(t1 int)");
+  queryDB(taosRoot, "create table demo11.stb (ts timestamp, c1 int) tags(t1 int)");
+  queryDB(taosRoot, "create table demo12.stb (ts timestamp, c1 int) tags(t1 int)");
+  queryDB(taosRoot, "create table demo13.stb (ts timestamp, c1 int) tags(t1 int)");
 
   sprintf(qstr, "show grants");
   char      output[BUF_LEN];
@@ -340,7 +339,7 @@ _REP:
     exit(EXIT_FAILURE);
   }
 
-  queryDB(taos[0], "alter user root sysinfo 0");
+  queryDB(taosRoot, "alter user user0 sysinfo 0");
 
   fprintf(stderr, "%s:%d sleep 2 seconds to wait HB take effect\n", __func__, __LINE__);
   for (int i = 1; i <= 2; ++i) {
@@ -357,7 +356,7 @@ _REP:
   }
   taos_free_result(res);
 
-  queryDB(taos[0], "alter user root sysinfo 1");
+  queryDB(taosRoot, "alter user user0 sysinfo 1");
   fprintf(stderr, "%s:%d sleep 2 seconds to wait HB take effect\n", __func__, __LINE__);
   for (int i = 1; i <= 2; ++i) {
     sleep(1);