From aa43876665e468f27c81e81331458bfc1304d804 Mon Sep 17 00:00:00 2001
From: Cary Xu <klxu@taosdata.com>
Date: Wed, 14 Sep 2022 18:10:51 +0800
Subject: [PATCH 1/3] enh: tsdb retention and fs optimization

---
 include/libs/tfs/tfs.h                      |  8 ++++++++
 source/dnode/vnode/src/tsdb/tsdbFS.c        |  4 ++--
 source/dnode/vnode/src/tsdb/tsdbRetention.c | 15 +++++++++++++--
 source/libs/tfs/src/tfs.c                   |  2 ++
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/include/libs/tfs/tfs.h b/include/libs/tfs/tfs.h
index 1dc154ce48..6f71fd4cd0 100644
--- a/include/libs/tfs/tfs.h
+++ b/include/libs/tfs/tfs.h
@@ -69,6 +69,14 @@ void tfsUpdateSize(STfs *pTfs);
  */
 SDiskSize tfsGetSize(STfs *pTfs);
 
+/**
+ * @brief Get level of multi-tier storage.
+ *
+ * @param pTfs
+ * @return int32_t
+ */
+int32_t tfsGetLevel(STfs *pTfs);
+
 /**
  * @brief Allocate an existing available tier level from fs.
  *
diff --git a/source/dnode/vnode/src/tsdb/tsdbFS.c b/source/dnode/vnode/src/tsdb/tsdbFS.c
index 31bdb784dd..f02bf2871c 100644
--- a/source/dnode/vnode/src/tsdb/tsdbFS.c
+++ b/source/dnode/vnode/src/tsdb/tsdbFS.c
@@ -58,7 +58,7 @@ static int32_t tsdbGnrtCurrent(STsdb *pTsdb, STsdbFS *pFS, char *fname) {
   taosCalcChecksumAppend(0, pData, size);
 
   // create and write
-  pFD = taosOpenFile(fname, TD_FILE_WRITE | TD_FILE_CREATE);
+  pFD = taosOpenFile(fname, TD_FILE_WRITE | TD_FILE_CREATE | TD_FILE_TRUNC);
   if (pFD == NULL) {
     code = TAOS_SYSTEM_ERROR(errno);
     goto _err;
@@ -1033,7 +1033,7 @@ int32_t tsdbFSCommit2(STsdb *pTsdb, STsdbFS *pFSNew) {
       code = TSDB_CODE_OUT_OF_MEMORY;
       goto _err;
     }
-    iOld++;
+
     iNew++;
     continue;
   }
diff --git a/source/dnode/vnode/src/tsdb/tsdbRetention.c b/source/dnode/vnode/src/tsdb/tsdbRetention.c
index d99bf2aa5c..eb4151079b 100644
--- a/source/dnode/vnode/src/tsdb/tsdbRetention.c
+++ b/source/dnode/vnode/src/tsdb/tsdbRetention.c
@@ -16,9 +16,19 @@
 #include "tsdb.h"
 
 static bool tsdbShouldDoRetention(STsdb *pTsdb, int64_t now) {
+  STsdbKeepCfg *keepCfg = &pTsdb->keepCfg;
+
+  if ((keepCfg->keep0 == keepCfg->keep1) && (keepCfg->keep1 == keepCfg->keep2)) {
+    return false;
+  }
+
+  if (tfsGetLevel(pTsdb->pVnode->pTfs) <= 1) {
+    return false;
+  }
+
   for (int32_t iSet = 0; iSet < taosArrayGetSize(pTsdb->fs.aDFileSet); iSet++) {
     SDFileSet *pSet = (SDFileSet *)taosArrayGet(pTsdb->fs.aDFileSet, iSet);
-    int32_t    expLevel = tsdbFidLevel(pSet->fid, &pTsdb->keepCfg, now);
+    int32_t    expLevel = tsdbFidLevel(pSet->fid, keepCfg, now);
     SDiskID    did;
 
     if (expLevel == pSet->diskId.level) continue;
@@ -53,7 +63,7 @@ int32_t tsdbDoRetention(STsdb *pTsdb, int64_t now) {
   if (code) goto _err;
 
   for (int32_t iSet = 0; iSet < taosArrayGetSize(fs.aDFileSet); iSet++) {
-    SDFileSet *pSet = (SDFileSet *)taosArrayGet(pTsdb->fs.aDFileSet, iSet);
+    SDFileSet *pSet = (SDFileSet *)taosArrayGet(fs.aDFileSet, iSet);
     int32_t    expLevel = tsdbFidLevel(pSet->fid, &pTsdb->keepCfg, now);
     SDiskID    did;
 
@@ -65,6 +75,7 @@ int32_t tsdbDoRetention(STsdb *pTsdb, int64_t now) {
       taosArrayRemove(fs.aDFileSet, iSet);
       iSet--;
     } else {
+      if (expLevel == 0) continue;
       if (tfsAllocDisk(pTsdb->pVnode->pTfs, expLevel, &did) < 0) {
         code = terrno;
         goto _exit;
diff --git a/source/libs/tfs/src/tfs.c b/source/libs/tfs/src/tfs.c
index 62aec219df..4600e5e568 100644
--- a/source/libs/tfs/src/tfs.c
+++ b/source/libs/tfs/src/tfs.c
@@ -113,6 +113,8 @@ SDiskSize tfsGetSize(STfs *pTfs) {
   return size;
 }
 
+int32_t tfsGetLevel(STfs *pTfs) { return pTfs->nlevel; }
+
 int32_t tfsAllocDisk(STfs *pTfs, int32_t expLevel, SDiskID *pDiskId) {
   pDiskId->level = expLevel;
   pDiskId->id = -1;

From f7fe7a4afb56370b8a872f95598f43c4fc2f244a Mon Sep 17 00:00:00 2001
From: Cary Xu <klxu@taosdata.com>
Date: Wed, 14 Sep 2022 19:18:51 +0800
Subject: [PATCH 2/3] fix: remove the code change for commit

---
 source/dnode/vnode/src/tsdb/tsdbFS.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source/dnode/vnode/src/tsdb/tsdbFS.c b/source/dnode/vnode/src/tsdb/tsdbFS.c
index f02bf2871c..d80ce9c899 100644
--- a/source/dnode/vnode/src/tsdb/tsdbFS.c
+++ b/source/dnode/vnode/src/tsdb/tsdbFS.c
@@ -1034,6 +1034,7 @@ int32_t tsdbFSCommit2(STsdb *pTsdb, STsdbFS *pFSNew) {
       goto _err;
     }
 
+    iOld++;
     iNew++;
     continue;
   }

From e05fd1615b2793798eb73ce4b67614bb297fb1be Mon Sep 17 00:00:00 2001
From: Cary Xu <klxu@taosdata.com>
Date: Wed, 14 Sep 2022 19:19:25 +0800
Subject: [PATCH 3/3] fix: remove the code change for commit

---
 source/dnode/vnode/src/tsdb/tsdbFS.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/source/dnode/vnode/src/tsdb/tsdbFS.c b/source/dnode/vnode/src/tsdb/tsdbFS.c
index d80ce9c899..10926ae6ad 100644
--- a/source/dnode/vnode/src/tsdb/tsdbFS.c
+++ b/source/dnode/vnode/src/tsdb/tsdbFS.c
@@ -1033,7 +1033,6 @@ int32_t tsdbFSCommit2(STsdb *pTsdb, STsdbFS *pFSNew) {
       code = TSDB_CODE_OUT_OF_MEMORY;
       goto _err;
     }
-
     iOld++;
     iNew++;
     continue;