Merge pull request #28343 from taosdata/ts5507

update encrypt test case for ts-5507 by charles

tests/army/db-encrypt/basic.py

@@ -13,6 +13,7 @@ from frame.srvCtl import *
 from frame.caseBase import *
 from frame import *
 from frame.autogen import *
+from frame import epath
 # from frame.server.dnodes import *
 # from frame.server.cluster import *
 
@@ -20,7 +21,9 @@ from frame.autogen import *
 class TDTestCase(TBase):
     
     def init(self, conn, logSql, replicaVar=1):
+        updatecfgDict = {'dDebugFlag':131}
         super(TDTestCase, self).init(conn, logSql, replicaVar=1, checkColName="c1")
+        
         self.valgrind = 0
         self.db = "test"
         self.stb = "meters"
@@ -50,9 +53,36 @@ class TDTestCase(TBase):
         tdSql.error("create encrypt_key '12345678abcdefghi'")
         tdSql.error("create database test ENCRYPT_ALGORITHM 'sm4'")
 
+    def recreate_dndoe_encrypt_key(self):
+        """
+        Description: From the jira TS-5507, the encrypt key can be recreated.
+        create: 
+            2024-09-23 created by Charles
+        update:
+            None
+        """
+        # taosd path
+        taosd_path = epath.binPath()
+        tdLog.info(f"taosd_path: {taosd_path}")
+        # dnode2 path
+        dndoe2_path = tdDnodes.getDnodeDir(2)
+        dnode2_data_path = os.sep.join([dndoe2_path, "data"])
+        dnode2_cfg_path = os.sep.join([dndoe2_path, "cfg"])
+        tdLog.info(f"dnode2_path: {dnode2_data_path}")
+        # stop dnode2
+        tdDnodes.stoptaosd(2)
+        tdLog.info("stop dndoe2")
+        # delete dndoe2 data
+        cmd = f"rm -rf {dnode2_data_path}"
+        os.system(cmd)
+        # recreate the encrypt key for dnode2
+        os.system(f"{os.sep.join([taosd_path, 'taosd'])} -y '1234567890' -c {dnode2_cfg_path}")
+        tdLog.info("test case: recreate the encrypt key for dnode2 passed")
+
     def run(self):
         self.create_encrypt_db_error()
         self.create_encrypt_db()
+        self.recreate_dndoe_encrypt_key()
 
     def stop(self):
         tdSql.close()

tests/parallel_test/cases.task

@@ -10,7 +10,7 @@
 # army-test
 #
 ,,y,army,./pytest.sh python3 ./test.py -f multi-level/mlevel_basic.py -N 3 -L 3 -D 2
-,,y,army,./pytest.sh python3 ./test.py -f db-encrypt/basic.py
+,,y,army,./pytest.sh python3 ./test.py -f db-encrypt/basic.py -N 3 -M 3
 ,,n,army,python3 ./test.py -f storage/s3/s3Basic.py -N 3
 ,,y,army,./pytest.sh python3 ./test.py -f cluster/snapshot.py -N 3 -L 3 -D 2
 ,,y,army,./pytest.sh python3 ./test.py -f query/function/test_func_elapsed.py