diff --git a/source/dnode/vnode/src/tsdb/tsdbRetention.c b/source/dnode/vnode/src/tsdb/tsdbRetention.c
index 44a06e76f7..2ae646a571 100644
--- a/source/dnode/vnode/src/tsdb/tsdbRetention.c
+++ b/source/dnode/vnode/src/tsdb/tsdbRetention.c
@@ -32,7 +32,7 @@ static int32_t tsdbDoRetentionImpl(STsdb *pTsdb, int64_t now, int8_t try, int8_t
     SDiskID    did;
 
     // check
-    if (expLevel == pDFileSet->fid) continue;
+    if (expLevel == pDFileSet->diskId.id) continue;
 
     // delete or move
     if (expLevel < 0) {
diff --git a/source/dnode/vnode/src/tsdb/tsdbUtil.c b/source/dnode/vnode/src/tsdb/tsdbUtil.c
index 65cbfb00da..dc6c823368 100644
--- a/source/dnode/vnode/src/tsdb/tsdbUtil.c
+++ b/source/dnode/vnode/src/tsdb/tsdbUtil.c
@@ -480,11 +480,11 @@ int32_t tsdbFidLevel(int32_t fid, STsdbKeepCfg *pKeepCfg, int64_t now) {
   }
 
   key = now - pKeepCfg->keep0 * tsTickPerMin[pKeepCfg->precision];
-  aFid[0] = tsdbKeyFid(key, pKeepCfg->days, pKeepCfg->keep0);
+  aFid[0] = tsdbKeyFid(key, pKeepCfg->days, pKeepCfg->precision);
   key = now - pKeepCfg->keep1 * tsTickPerMin[pKeepCfg->precision];
-  aFid[1] = tsdbKeyFid(key, pKeepCfg->days, pKeepCfg->keep1);
+  aFid[1] = tsdbKeyFid(key, pKeepCfg->days, pKeepCfg->precision);
   key = now - pKeepCfg->keep2 * tsTickPerMin[pKeepCfg->precision];
-  aFid[2] = tsdbKeyFid(key, pKeepCfg->days, pKeepCfg->keep2);
+  aFid[2] = tsdbKeyFid(key, pKeepCfg->days, pKeepCfg->precision);
 
   if (fid >= aFid[0]) {
     return 0;
diff --git a/source/dnode/vnode/src/vnd/vnodeOpen.c b/source/dnode/vnode/src/vnd/vnodeOpen.c
index fe26bd1090..cf95040585 100644
--- a/source/dnode/vnode/src/vnd/vnodeOpen.c
+++ b/source/dnode/vnode/src/vnd/vnodeOpen.c
@@ -28,7 +28,7 @@ int vnodeCreate(const char *path, SVnodeCfg *pCfg, STfs *pTfs) {
   }
 
   // create vnode env
-  if (tfsMkdir(pTfs, path) < 0) {
+  if (tfsMkdirAt(pTfs, path, (SDiskID){0}) < 0) {
     vError("vgId:%d, failed to create vnode since: %s", pCfg->vgId, tstrerror(terrno));
     return -1;
   }