From 4c06f3986e23c154457e6b360aff28c86d9a1f32 Mon Sep 17 00:00:00 2001
From: Minglei Jin <mljin@taosdata.com>
Date: Fri, 7 May 2021 12:03:01 +0800
Subject: [PATCH] [TD-4005]<fix>: fix repeated vnode open when tsdb state not
 ok

---
 src/inc/taoserror.h       | 1 +
 src/util/src/terror.c     | 2 ++
 src/vnode/src/vnodeMain.c | 6 +++---
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/inc/taoserror.h b/src/inc/taoserror.h
index eff4eecbc1..855afe923d 100644
--- a/src/inc/taoserror.h
+++ b/src/inc/taoserror.h
@@ -218,6 +218,7 @@ int32_t* taosGetErrno();
 #define TSDB_CODE_VND_NOT_SYNCED                TAOS_DEF_ERROR_CODE(0, 0x0511)  //"Database suspended")
 #define TSDB_CODE_VND_NO_WRITE_AUTH             TAOS_DEF_ERROR_CODE(0, 0x0512)  //"Database write operation denied")
 #define TSDB_CODE_VND_IS_SYNCING                TAOS_DEF_ERROR_CODE(0, 0x0513)  //"Database is syncing")
+#define TSDB_CODE_VND_INVALID_TSDB_STATE        TAOS_DEF_ERROR_CODE(0, 0x0513)  //"Invalid tsdb state")
 
 // tsdb
 #define TSDB_CODE_TDB_INVALID_TABLE_ID          TAOS_DEF_ERROR_CODE(0, 0x0600)  //"Invalid table ID")
diff --git a/src/util/src/terror.c b/src/util/src/terror.c
index 586a886f47..fc24b28dc3 100644
--- a/src/util/src/terror.c
+++ b/src/util/src/terror.c
@@ -230,6 +230,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_VND_IS_BALANCING,             "Database is balancing
 TAOS_DEFINE_ERROR(TSDB_CODE_VND_NOT_SYNCED,               "Database suspended")
 TAOS_DEFINE_ERROR(TSDB_CODE_VND_NO_WRITE_AUTH,            "Database write operation denied")
 TAOS_DEFINE_ERROR(TSDB_CODE_VND_IS_SYNCING,               "Database is syncing")
+TAOS_DEFINE_ERROR(TSDB_CODE_VND_INVALID_TSDB_STATE,       "Invalid tsdb state")
 
 // tsdb
 TAOS_DEFINE_ERROR(TSDB_CODE_TDB_INVALID_TABLE_ID,         "Invalid table ID")
@@ -253,6 +254,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_TDB_TABLE_RECONFIGURE,        "Need to reconfigure t
 TAOS_DEFINE_ERROR(TSDB_CODE_TDB_IVD_CREATE_TABLE_INFO,    "Invalid information to create table")
 TAOS_DEFINE_ERROR(TSDB_CODE_TDB_NO_AVAIL_DISK,            "No available disk")
 TAOS_DEFINE_ERROR(TSDB_CODE_TDB_MESSED_MSG,               "TSDB messed message")
+TAOS_DEFINE_ERROR(TSDB_CODE_TDB_IVLD_TAG_VAL,             "TSDB invalid tag value")
 
 // query
 TAOS_DEFINE_ERROR(TSDB_CODE_QRY_INVALID_QHANDLE,          "Invalid handle")
diff --git a/src/vnode/src/vnodeMain.c b/src/vnode/src/vnodeMain.c
index ee8ed9e0fa..8ec66316e3 100644
--- a/src/vnode/src/vnodeMain.c
+++ b/src/vnode/src/vnodeMain.c
@@ -310,11 +310,11 @@ int32_t vnodeOpen(int32_t vgId) {
     vnodeCleanUp(pVnode);
     return terrno;
   } else if (tsdbGetState(pVnode->tsdb) != TSDB_STATE_OK) {
-    vError("vgId:%d, failed to open tsdb, replica:%d reason:%s", pVnode->vgId, pVnode->syncCfg.replica,
-           tstrerror(terrno));
+    vError("vgId:%d, failed to open tsdb(state: %d), replica:%d reason:%s", pVnode->vgId,
+           tsdbGetState(pVnode->tsdb), pVnode->syncCfg.replica, tstrerror(terrno));
     if (pVnode->syncCfg.replica <= 1) {
       vnodeCleanUp(pVnode);
-      return terrno;
+      return TSDB_CODE_VND_INVALID_TSDB_STATE;
     } else {
       pVnode->fversion = 0;
       pVnode->version = 0;
-- 
GitLab