From f1f7d5564f809afffc83bb71c7384f84ce6246d2 Mon Sep 17 00:00:00 2001
From: lichuang <lichuang1982@gmail.com>
Date: Thu, 27 May 2021 16:02:57 +0800
Subject: [PATCH] [TD-1920]add mnode_bak and mnode_tmp dir exist check when
 start up

---
 src/dnode/src/dnodeMain.c | 10 ++++++++--
 src/os/inc/osDir.h        |  1 +
 src/os/src/detail/osDir.c |  4 ++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/dnode/src/dnodeMain.c b/src/dnode/src/dnodeMain.c
index ee4dfcf852..cce382b15f 100644
--- a/src/dnode/src/dnodeMain.c
+++ b/src/dnode/src/dnodeMain.c
@@ -219,14 +219,20 @@ static int32_t dnodeInitStorage() {
 
   if (tsCompactMnodeWal == 1) {
     sprintf(tsMnodeTmpDir, "%s/mnode_tmp", tsDataDir);
-    tfsRmdir(tsMnodeTmpDir);
+    if (taosDirExist(tsMnodeTmpDir)) {
+      dError("mnode_tmp dir already exist in %s,quit compact job", tsMnodeTmpDir);
+      return -1;
+    }
     if (dnodeCreateDir(tsMnodeTmpDir) < 0) {
       dError("failed to create dir: %s, reason: %s", tsMnodeTmpDir, strerror(errno));
       return -1;
     }
 
     sprintf(tsMnodeBakDir, "%s/mnode_bak", tsDataDir);
-    //tfsRmdir(tsMnodeBakDir);   
+    if (taosDirExist(tsMnodeBakDir)) {
+      dError("mnode_bak dir already exist in %s,quit compact job", tsMnodeBakDir);
+      return -1;
+    }
   }
   //TODO(dengyihao): no need to init here 
   if (dnodeCreateDir(tsMnodeDir) < 0) {
diff --git a/src/os/inc/osDir.h b/src/os/inc/osDir.h
index bdc65e4520..7afe126451 100644
--- a/src/os/inc/osDir.h
+++ b/src/os/inc/osDir.h
@@ -21,6 +21,7 @@ extern "C" {
 #endif
 
 void    taosRemoveDir(char *rootDir);
+bool    taosDirExist(const char* dirname);
 int32_t taosMkDir(const char *pathname, mode_t mode);
 void    taosRemoveOldLogFiles(char *rootDir, int32_t keepDays);
 int32_t taosRename(char *oldName, char *newName);
diff --git a/src/os/src/detail/osDir.c b/src/os/src/detail/osDir.c
index 2a2e2519b5..c467c64872 100644
--- a/src/os/src/detail/osDir.c
+++ b/src/os/src/detail/osDir.c
@@ -45,6 +45,10 @@ void taosRemoveDir(char *rootDir) {
   uInfo("dir:%s is removed", rootDir);
 }
 
+bool taosDirExist(const char* dirname) {
+  return access(dirname, F_OK) == 0;
+}
+
 int taosMkDir(const char *path, mode_t mode) {
   int code = mkdir(path, 0755);
   if (code < 0 && errno == EEXIST) code = 0;
-- 
GitLab