From 1eba3f965e76fe3a51a303306e4b50a122963b70 Mon Sep 17 00:00:00 2001
From: Bomin Zhang <bmzhang@taosdata.com>
Date: Sat, 28 Nov 2020 09:57:26 +0000
Subject: [PATCH] [TD-2268]: cancel all related timers in taosTmrCleanUp

---
 src/util/src/ttimer.c | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/src/util/src/ttimer.c b/src/util/src/ttimer.c
index 0222a6d80a..baf396f030 100644
--- a/src/util/src/ttimer.c
+++ b/src/util/src/ttimer.c
@@ -560,6 +560,37 @@ void taosTmrCleanUp(void* handle) {
   tmrDebug("%s timer controller is cleaned up.", ctrl->label);
   ctrl->label[0] = 0;
 
+  // cancel all timers of this controller
+  for (size_t i = 0; i < timerMap.size; i++) {
+    timer_list_t* list = timerMap.slots + i;
+    lockTimerList(list);
+
+    tmr_obj_t* t = list->timers;
+    tmr_obj_t* prev = NULL;
+    while (t != NULL) {
+      tmr_obj_t* next = t->mnext;
+      if (t->ctrl != ctrl) {
+        prev = t;
+        t = next;
+        continue;
+      }
+
+      uint8_t state = atomic_val_compare_exchange_8(&t->state, TIMER_STATE_WAITING, TIMER_STATE_CANCELED);
+      if (state == TIMER_STATE_WAITING) {
+        removeFromWheel(t);
+      }
+      timerDecRef(t);
+      if (prev == NULL) {
+        list->timers = next;
+      } else {
+        prev->mnext = next;
+      }
+      t = next;
+    }
+
+    unlockTimerList(list);
+  }
+
   pthread_mutex_lock(&tmrCtrlMutex);
   ctrl->next = unusedTmrCtrl;
   numOfTmrCtrl--;
-- 
GitLab