From 49062431150be43ac0704c00c12cbe2b36bdfc76 Mon Sep 17 00:00:00 2001
From: Shungang Li <sgli@taosdata.com>
Date: Wed, 20 Dec 2023 18:32:23 +0800
Subject: [PATCH 1/3] fix: dynamic cfg resetlog

---
 source/common/src/tglobal.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c
index fd88098b03..fdac3882c3 100644
--- a/source/common/src/tglobal.c
+++ b/source/common/src/tglobal.c
@@ -1432,6 +1432,13 @@ static int32_t taosCfgSetOption(OptionNameAndVar *pOptions, int32_t optionSize,
 static int32_t taosCfgDynamicOptionsForServer(SConfig *pCfg, char *name) {
   terrno = TSDB_CODE_SUCCESS;
 
+  if (strcasecmp(name, "resetlog") == 0) {
+    // trigger, no item in cfg
+    taosResetLog();
+    cfgDumpCfg(tsCfg, 0, false);
+    return 0;
+  }
+
   SConfigItem *pItem = cfgGetItem(pCfg, name);
   if (!pItem || (pItem->dynScope & CFG_DYN_SERVER) == 0) {
     uError("failed to config:%s, not support", name);
@@ -1445,12 +1452,6 @@ static int32_t taosCfgDynamicOptionsForServer(SConfig *pCfg, char *name) {
     return 0;
   }
 
-  if (strcasecmp(name, "resetlog") == 0) {
-    taosResetLog();
-    cfgDumpCfg(tsCfg, 0, false);
-    return 0;
-  }
-
   {  //  'bool/int32_t/int64_t/float/double' variables with general modification function
     static OptionNameAndVar debugOptions[] = {
         {"dDebugFlag", &dDebugFlag},     {"vDebugFlag", &vDebugFlag},     {"mDebugFlag", &mDebugFlag},
@@ -1774,4 +1775,4 @@ void taosSetAllDebugFlag(int32_t flag, bool rewrite) {
   uInfo("all debug flag are set to %d", flag);
 }
 
-int8_t taosGranted() { return atomic_load_8(&tsGrant); }
\ No newline at end of file
+int8_t taosGranted() { return atomic_load_8(&tsGrant); }

From 7466fcc39838935ef1a3782260b297774ac971f0 Mon Sep 17 00:00:00 2001
From: Shungang Li <sgli@taosdata.com>
Date: Thu, 21 Dec 2023 19:52:40 +0800
Subject: [PATCH 2/3] fix: no more rm old log in resetlog

---
 source/util/src/tlog.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/source/util/src/tlog.c b/source/util/src/tlog.c
index 184e18fc67..e113a95fcc 100644
--- a/source/util/src/tlog.c
+++ b/source/util/src/tlog.c
@@ -337,14 +337,10 @@ static int32_t taosOpenNewLogFile() {
 }
 
 void taosResetLog() {
-  char lastName[LOG_FILE_NAME_LEN + 20];
-  sprintf(lastName, "%s.%d", tsLogObj.logName, tsLogObj.flag);
-
   // force create a new log file
   tsLogObj.lines = tsNumOfLogLines + 10;
 
   taosOpenNewLogFile();
-  (void)taosRemoveFile(lastName);
 
   uInfo("==================================");
   uInfo("   reset log file ");

From 212c1ebb3c139a10881c15cd3e6bb8af7375b3f8 Mon Sep 17 00:00:00 2001
From: Shungang Li <sgli@taosdata.com>
Date: Thu, 21 Dec 2023 19:52:40 +0800
Subject: [PATCH 3/3] udpate test case test_hot_refresh_configurations

---
 source/util/src/tlog.c                                      | 4 ----
 .../system-test/0-others/test_hot_refresh_configurations.py | 6 ++++++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/source/util/src/tlog.c b/source/util/src/tlog.c
index 184e18fc67..e113a95fcc 100644
--- a/source/util/src/tlog.c
+++ b/source/util/src/tlog.c
@@ -337,14 +337,10 @@ static int32_t taosOpenNewLogFile() {
 }
 
 void taosResetLog() {
-  char lastName[LOG_FILE_NAME_LEN + 20];
-  sprintf(lastName, "%s.%d", tsLogObj.logName, tsLogObj.flag);
-
   // force create a new log file
   tsLogObj.lines = tsNumOfLogLines + 10;
 
   taosOpenNewLogFile();
-  (void)taosRemoveFile(lastName);
 
   uInfo("==================================");
   uInfo("   reset log file ");
diff --git a/tests/system-test/0-others/test_hot_refresh_configurations.py b/tests/system-test/0-others/test_hot_refresh_configurations.py
index cbde8c060e..59222281ae 100644
--- a/tests/system-test/0-others/test_hot_refresh_configurations.py
+++ b/tests/system-test/0-others/test_hot_refresh_configurations.py
@@ -215,6 +215,12 @@ class TDTestCase:
                         self.svr_check(item["name"], item["alias"], item["except_values"], True)
             else:
                 raise Exception(f"unknown key: {key}")
+        # reset log
+        path = os.sep.join([tdDnodes.getDnodesRootDir(), "dnode1", "log", "taosdlog.*"])
+        tdSql.execute("alter all dnodes 'resetlog';")
+        r = subprocess.Popen("cat {} | grep 'reset log file'".format(path), shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        stdout, stderr = r.communicate()
+        assert('reset log file' in stdout.decode())
 
     def stop(self):
         tdSql.close()