From a02ab4ccfbb40e48abe435e24e4f50ee2c72cab2 Mon Sep 17 00:00:00 2001 From: wangmm0220 Date: Thu, 31 Aug 2023 17:35:41 +0800 Subject: [PATCH] fix:coredump if saved epoch bigger than request epoch & modify test cases --- source/dnode/vnode/src/tq/tqUtil.c | 4 ++-- tests/system-test/7-tmq/tmqMaxGroupIds.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/dnode/vnode/src/tq/tqUtil.c b/source/dnode/vnode/src/tq/tqUtil.c index 06dd8dd1e9..27f197916f 100644 --- a/source/dnode/vnode/src/tq/tqUtil.c +++ b/source/dnode/vnode/src/tq/tqUtil.c @@ -210,8 +210,8 @@ static int32_t extractDataAndRspForDbStbSubscribe(STQ* pTq, STqHandle* pHandle, // uint64_t st = taosGetTimestampMs(); int totalRows = 0; while (1) { - int32_t savedEpoch = atomic_load_32(&pHandle->epoch); - ASSERT (savedEpoch <= pRequest->epoch); +// int32_t savedEpoch = atomic_load_32(&pHandle->epoch); +// ASSERT (savedEpoch <= pRequest->epoch); if (tqFetchLog(pTq, pHandle, &fetchVer, pRequest->reqId) < 0) { tqOffsetResetToLog(&taosxRsp.rspOffset, fetchVer); diff --git a/tests/system-test/7-tmq/tmqMaxGroupIds.py b/tests/system-test/7-tmq/tmqMaxGroupIds.py index d22b79a44c..d8f0fbd6cf 100644 --- a/tests/system-test/7-tmq/tmqMaxGroupIds.py +++ b/tests/system-test/7-tmq/tmqMaxGroupIds.py @@ -205,7 +205,7 @@ class TDTestCase: tdLog.exit("show consumers %d not equal expect num: %d"%(topicNum, expectConsumerNUm)) flag = 0 - for i in range(10): + while (1): tdSql.query('show subscriptions;') subscribeNum = tdSql.queryRows tdLog.info(" get subscriptions count: %d"%(subscribeNum))