Improve shutdown/close code

BBVA · Feb 26, 2019 · 21b4f30 · 21b4f30
1 parent 45b8d80
commit 21b4f30
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/balloon/balloon.go b/balloon/balloon.go
@@ -47,12 +47,9 @@ type Balloon struct {
 
 func NewBalloon(store storage.Store, hasherF func() hashing.Hasher) (*Balloon, error) {
 
-	// create caches
-	hyperCache := cache.NewFreeCache(hyper.CacheSize)
-
 	// create trees
 	historyTree := history.NewHistoryTree(hasherF, store, 300)
-	hyperTree := hyper.NewHyperTree(hasherF, store, hyperCache)
+	hyperTree := hyper.NewHyperTree(hasherF, store, cache.NewFreeCache(hyper.CacheSize))
 
 	balloon := &Balloon{
 		version:     0,

diff --git a/raftwal/fsm.go b/raftwal/fsm.go
@@ -239,7 +239,8 @@ func (fsm *BalloonFSM) Restore(rc io.ReadCloser) error {
 }
 
 func (fsm *BalloonFSM) Close() error {
-	return fsm.store.Close()
+	fsm.balloon.Close()
+	return nil
 }
 
 func (fsm *BalloonFSM) applyAdd(event []byte, state *fsmState) *fsmAddResponse {

diff --git a/raftwal/raft.go b/raftwal/raft.go
@@ -241,6 +241,9 @@ func (b *RaftBalloon) Close(wait bool) error {
 	b.store.log = nil
 	b.store.stable = nil
 
+	// Close FSM
+	b.fsm.Close()
+
 	return nil
 }