From e119a7ad485b7fb051be54721e7e0f956e61a552 Mon Sep 17 00:00:00 2001 From: Liu Jicong Date: Wed, 27 Apr 2022 17:27:36 +0800 Subject: [PATCH] fix --- source/dnode/mnode/impl/src/mndConsumer.c | 2 -- source/dnode/mnode/impl/src/mnode.c | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/source/dnode/mnode/impl/src/mndConsumer.c b/source/dnode/mnode/impl/src/mndConsumer.c index 3557c73bff..ac75baeb35 100644 --- a/source/dnode/mnode/impl/src/mndConsumer.c +++ b/source/dnode/mnode/impl/src/mndConsumer.c @@ -597,7 +597,6 @@ static int32_t mndConsumerActionUpdate(SSdb *pSdb, SMqConsumerObj *pOldConsumer, if (pNewConsumer->updateType == CONSUMER_UPDATE__MODIFY) { ASSERT(taosArrayGetSize(pOldConsumer->rebNewTopics) == 0); ASSERT(taosArrayGetSize(pOldConsumer->rebRemovedTopics) == 0); - ASSERT(taosArrayGetSize(pNewConsumer->assignedTopics) != 0); SArray *tmp = pOldConsumer->rebNewTopics; pOldConsumer->rebNewTopics = pNewConsumer->rebNewTopics; pNewConsumer->rebNewTopics = tmp; @@ -630,7 +629,6 @@ static int32_t mndConsumerActionUpdate(SSdb *pSdb, SMqConsumerObj *pOldConsumer, } else if (pNewConsumer->updateType == CONSUMER_UPDATE__RECOVER) { ASSERT(taosArrayGetSize(pOldConsumer->currentTopics) == 0); ASSERT(taosArrayGetSize(pOldConsumer->rebNewTopics) == 0); - ASSERT(taosArrayGetSize(pOldConsumer->assignedTopics) != 0); int32_t sz = taosArrayGetSize(pOldConsumer->assignedTopics); for (int32_t i = 0; i < sz; i++) { diff --git a/source/dnode/mnode/impl/src/mnode.c b/source/dnode/mnode/impl/src/mnode.c index 41a309e941..b38fd6178c 100644 --- a/source/dnode/mnode/impl/src/mnode.c +++ b/source/dnode/mnode/impl/src/mnode.c @@ -43,7 +43,7 @@ #include "mndUser.h" #include "mndVgroup.h" -#define MQ_TIMER_MS 3000 +#define MQ_TIMER_MS 2000 #define TRNAS_TIMER_MS 6000 static void *mndBuildTimerMsg(int32_t *pContLen) { @@ -418,7 +418,6 @@ int64_t mndGenerateUid(char *name, int32_t len) { } while (true); } - int32_t mndGetMonitorInfo(SMnode *pMnode, SMonClusterInfo *pClusterInfo, SMonVgroupInfo *pVgroupInfo, SMonGrantInfo *pGrantInfo) { if (!mndIsMaster(pMnode)) return -1; @@ -528,4 +527,4 @@ int32_t mndGetMonitorInfo(SMnode *pMnode, SMonClusterInfo *pClusterInfo, SMonVgr int32_t mndGetLoad(SMnode *pMnode, SMnodeLoad *pLoad) { pLoad->syncState = pMnode->syncMgmt.state; return 0; -} \ No newline at end of file +} -- GitLab