fix(master): close rocksdb when master shutdown

Signed-off-by: NaturalSelect <[email protected]>
sejust · Sep 15, 2023 · 273e2ea · 273e2ea
1 parent adc8ecc
commit 273e2ea
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/master/server.go b/master/server.go
@@ -148,7 +148,7 @@ func (m *Server) Start(cfg *config.Config) (err error) {
 		return
 	}
 
-	if m.rocksDBStore, err = raftstore_db.NewRocksDBStore(m.storeDir, LRUCacheSize, WriteBufferSize); err != nil {
+	if m.rocksDBStore, err = raftstore_db.NewRocksDBStoreAndRecovery(m.storeDir, LRUCacheSize, WriteBufferSize); err != nil {
 		return
 	}
 
@@ -192,6 +192,9 @@ func (m *Server) Shutdown() {
 		}
 	}
 	stat.CloseStat()
+	if m.rocksDBStore != nil {
+		m.rocksDBStore.Close()
+	}
 	m.wg.Done()
 }
 

diff --git a/raftstore/raftstore_db/store_rocksdb.go b/raftstore/raftstore_db/store_rocksdb.go
@@ -75,10 +75,10 @@ func NewRocksDBStoreAndRecovery(dir string, lruCacheSize, writeBufferSize int) (
 	if !fileutil.ExistDir(dir) && fileutil.ExistDir(recoverDir) {
 		// we move temp dir to rocksdb dir for commiting transaction
 		if err = os.Rename(recoverDir, dir); err != nil {
-			log.LogErrorf("failed to rename rocksdb recovery dir %v", err.Error())
+			log.LogErrorf("action[NewRocksDBStoreAndRecovery]failed to rename rocksdb recovery dir %v", err.Error())
 			return
 		}
-		log.LogDebug("recovery rocksdb success")
+		log.LogDebug("action[NewRocksDBStoreAndRecovery]recovery rocksdb success")
 	} else if err = os.MkdirAll(dir, os.ModePerm); err != nil {
 		return
 	}