From c7a2a1c294b49175b10c35abfe4089c80c243047 Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Wed, 11 Mar 2020 20:11:30 +0800 Subject: [PATCH] back to simpler one-line change. --- src/system/detail/src/vnodeMeter.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/system/detail/src/vnodeMeter.c b/src/system/detail/src/vnodeMeter.c index a530aa80fa..ab610b1e00 100644 --- a/src/system/detail/src/vnodeMeter.c +++ b/src/system/detail/src/vnodeMeter.c @@ -786,16 +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); + return; } + 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