From dd195a41b1626f21c645c8c398d9d1cedaffad2f Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Wed, 11 Mar 2020 18:16:56 +0800 Subject: [PATCH] fix vnodeClearMeterState() called twice --- src/system/detail/src/vnodeMeter.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/system/detail/src/vnodeMeter.c b/src/system/detail/src/vnodeMeter.c index df70d12721..a530aa80fa 100644 --- a/src/system/detail/src/vnodeMeter.c +++ b/src/system/detail/src/vnodeMeter.c @@ -786,17 +786,16 @@ void vnodeUpdateMeter(void *param, void *tmrId) { return; } + vnodeClearMeterState(pObj, TSDB_METER_STATE_UPDATING); + if (taosTmrStart(vnodeUpdateMeter, 50, pNew, vnodeTmrCtrl) == NULL) { dError("vid:%d sid:%d id:%s, failed to start update timer", pNew->vnode, pNew->sid, pNew->meterId); - vnodeClearMeterState(pObj, TSDB_METER_STATE_UPDATING); free(pNew->schema); free(pNew); } else { dTrace("vid:%d sid:%d meterId:%s, there are data in cache, commit first, update later", pNew->vnode, pNew->sid, pNew->meterId); } - - vnodeClearMeterState(pObj, TSDB_METER_STATE_UPDATING); return; } -- GitLab