From 474514ab6682e8a6b276b983cf21836c641b616e Mon Sep 17 00:00:00 2001 From: wangmm0220 Date: Thu, 25 Jan 2024 17:29:55 +0800 Subject: [PATCH] fix:test case error --- source/dnode/mnode/impl/src/mndConsumer.c | 3 ++- .../0-others/subscribe_stream_privilege.py | 11 +++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/source/dnode/mnode/impl/src/mndConsumer.c b/source/dnode/mnode/impl/src/mndConsumer.c index 14e3df2af9..2c8a193121 100644 --- a/source/dnode/mnode/impl/src/mndConsumer.c +++ b/source/dnode/mnode/impl/src/mndConsumer.c @@ -234,6 +234,7 @@ static int32_t checkPrivilege(SMnode *pMnode, SMqConsumerObj *pConsumer, SMqHbR continue; } STopicPrivilege *data = taosArrayReserve(rsp->topicPrivileges, 1); + strcpy(data->topic, topic); if (mndCheckTopicPrivilege(pMnode, user, MND_OPER_SUBSCRIBE, pTopic) != 0 || grantCheck(TSDB_GRANT_SUBSCRIBE) < 0) { data->noPrivilege = 1; } else{ @@ -320,7 +321,7 @@ static int32_t mndProcessMqHbReq(SRpcMsg *pMsg) { goto end; } - tSerializeSMqHbRsp(&buf, tlen, &rsp); + tSerializeSMqHbRsp(buf, tlen, &rsp); pMsg->info.rsp = buf; pMsg->info.rspLen = tlen; diff --git a/tests/system-test/0-others/subscribe_stream_privilege.py b/tests/system-test/0-others/subscribe_stream_privilege.py index 881060ee3c..5f40450af4 100644 --- a/tests/system-test/0-others/subscribe_stream_privilege.py +++ b/tests/system-test/0-others/subscribe_stream_privilege.py @@ -22,6 +22,8 @@ from util.sqlset import * class TDTestCase: + clientCfgDict = {'debugFlag': 135} + updatecfgDict = {'debugFlag': 135, 'clientCfg':clientCfgDict} def init(self, conn, logSql, replicaVar=1): self.replicaVar = int(replicaVar) tdLog.debug("start to execute %s" % __file__) @@ -61,7 +63,7 @@ class TDTestCase: def prepare_data(self): for db in self.dbnames: - tdSql.execute(f"create database {db}") + tdSql.execute(f"create database {db} vgroups 1") tdSql.execute(f"use {db}") tdSql.execute(self.setsql.set_create_stable_sql(self.stbname, self.column_dict, self.tag_dict)) for i in range(self.tbnum): @@ -110,11 +112,9 @@ class TDTestCase: tdLog.exit(f"grant privilege, should get res") elif cnt == 2: if res: - time.sleep(1000) tdLog.exit(f"revoke privilege, should get NULL") - - else: - break + else: + break tdLog.debug("test subscribe topic privilege revoked by other user") tdSql.execute(f'revoke subscribe on {self.topic_name} from {self.user_name}') @@ -122,7 +122,6 @@ class TDTestCase: finally: consumer.close() - time.sleep(1000) def create_user(self): tdSql.execute(f'create topic {self.topic_name} as database {self.dbnames[0]}')