From 2857cfc3c648a8c62ead215b331a8b4cb908f267 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 2 Feb 2021 21:03:57 +0800
Subject: [PATCH] TD-2890 TD-2870

---
 src/util/src/tref.c       | 2 +-
 src/vnode/src/vnodeMain.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/util/src/tref.c b/src/util/src/tref.c
index ebae8ece14..805c51bdb3 100644
--- a/src/util/src/tref.c
+++ b/src/util/src/tref.c
@@ -204,7 +204,7 @@ void *taosAcquireRef(int rsetId, int64_t rid)
   void     *p = NULL;
 
   if (rsetId < 0 || rsetId >= TSDB_REF_OBJECTS) {
-    uTrace("rsetId:%d rid:%" PRId64 " failed to acquire, rsetId not valid", rsetId, rid);
+    //uTrace("rsetId:%d rid:%" PRId64 " failed to acquire, rsetId not valid", rsetId, rid);
     terrno = TSDB_CODE_REF_INVALID_ID;
     return NULL;
   }
diff --git a/src/vnode/src/vnodeMain.c b/src/vnode/src/vnodeMain.c
index cd487105b8..ac9536d243 100644
--- a/src/vnode/src/vnodeMain.c
+++ b/src/vnode/src/vnodeMain.c
@@ -194,12 +194,14 @@ int32_t vnodeOpen(int32_t vgId) {
 
   int32_t code = vnodeReadCfg(pVnode);
   if (code != TSDB_CODE_SUCCESS) {
+    vError("vgId:%d, failed to read config file, set cfgVersion to 0", pVnode->vgId);
     vnodeCleanUp(pVnode);
-    return code;
+    return 0;
   } 
 
   code = vnodeReadVersion(pVnode);
   if (code != TSDB_CODE_SUCCESS) {
+    pVnode->version = 0;
     vError("vgId:%d, failed to read file version, generate it from data file", pVnode->vgId);
     // Allow vnode start even when read file version fails, set file version as wal version or zero
     // vnodeCleanUp(pVnode);
-- 
GitLab