diff --git a/src/tsdb/inc/tsdbMain.h b/src/tsdb/inc/tsdbMain.h
index 9dbc1239c59166d2206d25d781cd8db0e15928f7..8e1d54abd6546711246521fd008ae81dc5d80988 100644
--- a/src/tsdb/inc/tsdbMain.h
+++ b/src/tsdb/inc/tsdbMain.h
@@ -14,18 +14,15 @@
  */
 #ifndef _TD_TSDB_MAIN_H_
 #define _TD_TSDB_MAIN_H_
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 
-#include "hash.h"
 #include "os.h"
+#include "hash.h"
 #include "tcoding.h"
 #include "tglobal.h"
 #include "tkvstore.h"
 #include "tlist.h"
-#include "tlockfree.h"
 #include "tlog.h"
+#include "tlockfree.h"
 #include "tsdb.h"
 #include "tskiplist.h"
 #include "tutil.h"
diff --git a/src/tsdb/src/tsdbMain.c b/src/tsdb/src/tsdbMain.c
index 2074ff8ba5104e86cd5356dbcf5c71b79391139f..638a884f003b7323387b57df49350b1320bc9591 100644
--- a/src/tsdb/src/tsdbMain.c
+++ b/src/tsdb/src/tsdbMain.c
@@ -12,6 +12,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
+
 // no test file errors here
 #include "tsdbMain.h"
 #include "os.h"
diff --git a/src/util/src/tkvstore.c b/src/util/src/tkvstore.c
index fdd772f3ad42724d308cf7fe0c8e40f0f82304de..583c0821fb9b2d7db214b097d562a49bf0d1114b 100644
--- a/src/util/src/tkvstore.c
+++ b/src/util/src/tkvstore.c
@@ -94,7 +94,7 @@ SKVStore *tdOpenKVStore(char *fname, iterFunc iFunc, afterFunc aFunc, void *appH
   SKVStore *pStore = tdNewKVStore(fname, iFunc, aFunc, appH);
   if (pStore == NULL) return NULL;
 
-  pStore->fd = open(pStore->fname, O_RDWR);
+  pStore->fd = open(pStore->fname, O_RDONLY);
   if (pStore->fd < 0) {
     uError("failed to open file %s since %s", pStore->fname, strerror(errno));
     terrno = TAOS_SYSTEM_ERROR(errno);
@@ -118,7 +118,7 @@ SKVStore *tdOpenKVStore(char *fname, iterFunc iFunc, afterFunc aFunc, void *appH
   return pStore;
 
 _err:
-  if (pStore->fd > 0) {
+  if (pStore->fd >= 0) {
     close(pStore->fd);
     pStore->fd = -1;
   }
@@ -168,6 +168,7 @@ int tdUpdateKVStoreRecord(SKVStore *pStore, uint64_t uid, void *cont, int contLe
   rInfo.offset = lseek(pStore->fd, 0, SEEK_CUR);
   if (rInfo.offset < 0) {
     uError("failed to lseek file %s since %s", pStore->fname, strerror(errno));
+    terrno = TAOS_SYSTEM_ERROR(errno);
     return -1;
   }
 
@@ -194,7 +195,7 @@ int tdUpdateKVStoreRecord(SKVStore *pStore, uint64_t uid, void *cont, int contLe
   pStore->ninfo.size += (sizeof(SKVRecord) + contLen);
   SKVRecord *pRecord = taosHashGet(pStore->map, (void *)&uid, sizeof(uid));
   if (pRecord != NULL) {  // just to insert
-    pStore->ninfo.tombSize += pRecord->size;
+    pStore->ninfo.tombSize += (pRecord->size + sizeof(SKVRecord));
   } else {
     pStore->ninfo.nRecords++;
   }
@@ -380,7 +381,10 @@ static int tdInitKVStoreHeader(int fd, char *fname) {
 
 static SKVStore *tdNewKVStore(char *fname, iterFunc iFunc, afterFunc aFunc, void *appH) {
   SKVStore *pStore = (SKVStore *)calloc(1, sizeof(SKVStore));
-  if (pStore == NULL) goto _err;
+  if (pStore == NULL) {
+    terrno = TSDB_CODE_COM_OUT_OF_MEMORY;
+    goto _err;
+  }
 
   pStore->fname = strdup(fname);
   if (pStore->fname == NULL) {
@@ -459,12 +463,18 @@ static int tdRestoreKVStore(SKVStore *pStore) {
   while (true) {
     ssize_t tsize = taosTRead(pStore->fd, tbuf, sizeof(SKVRecord));
     if (tsize == 0) break;
-    if (tsize < sizeof(SKVRecord)) {
-      uError("failed to read %" PRIzu " bytes from file %s at offset %" PRId64 "since %s", sizeof(SKVRecord), pStore->fname,
-             pStore->info.size, strerror(errno));
+    if (tsize < 0) {
+      uError("failed to read %" PRIzu " bytes from file %s at offset %" PRId64 "since %s", sizeof(SKVRecord),
+             pStore->fname, pStore->info.size, strerror(errno));
       terrno = TAOS_SYSTEM_ERROR(errno);
       goto _err;
     }
+    if (tsize < sizeof(SKVRecord)) {
+      uError("file %s is corrupted offset %" PRId64 " len %" PRIzu, pStore->fname, pStore->info.size,
+             sizeof(SKVRecord));
+      terrno = TSDB_CODE_COM_FILE_CORRUPTED;
+      goto _err;
+    }
 
     char *pBuf = tdDecodeKVRecord(tbuf, &rInfo);
     ASSERT(POINTER_DISTANCE(pBuf, tbuf) == sizeof(SKVRecord));
@@ -478,6 +488,11 @@ static int tdRestoreKVStore(SKVStore *pStore) {
       pStore->info.tombSize += (rInfo.size + sizeof(SKVRecord) * 2);
     } else {
       ASSERT(rInfo.offset > 0 && rInfo.size > 0);
+      SKVRecord *pRecord = taosHashGet(pStore->map, (void *)(&rInfo.uid), sizeof(rInfo.uid));
+      if (pRecord != NULL) {
+        pStore->info.tombSize += (sizeof(SKVRecord) + pRecord->size);
+      }
+
       if (taosHashPut(pStore->map, (void *)(&rInfo.uid), sizeof(rInfo.uid), &rInfo, sizeof(rInfo)) < 0) {
         uError("failed to put record in KV store %s", pStore->fname);
         terrno = TSDB_CODE_COM_OUT_OF_MEMORY;
@@ -520,12 +535,20 @@ static int tdRestoreKVStore(SKVStore *pStore) {
       goto _err;
     }
 
-    if (taosTRead(pStore->fd, buf, (size_t)pRecord->size) < pRecord->size) {
+    ssize_t tsize = taosTRead(pStore->fd, buf, (size_t)pRecord->size);
+    if (tsize < 0) {
       uError("failed to read %" PRId64 " bytes from file %s since %s, offset %" PRId64, pRecord->size, pStore->fname,
              strerror(errno), pRecord->offset);
       terrno = TAOS_SYSTEM_ERROR(errno);
       goto _err;
     }
+    
+    if (tsize < pRecord->size) {
+      uError("file %s is corrupted, offset %" PRId64 " size %" PRId64, pStore->fname,
+             pRecord->offset + sizeof(SKVRecord), pRecord->size);
+      terrno = TSDB_CODE_COM_FILE_CORRUPTED;
+      goto _err;
+    }
 
     if (pStore->iFunc) {
       if ((*pStore->iFunc)(pStore->appH, buf, (int)pRecord->size) < 0) {