Browse Source

etcdserver: close mvcc.KV on init error path

Scheduled compaction will panic if KV is not stopped before
closing the backend.
Anthony Romano 8 years ago
parent
commit
c1c9a2c96c
1 changed files with 9 additions and 0 deletions
  1. 9 0
      etcdserver/server.go

+ 9 - 0
etcdserver/server.go

@@ -450,6 +450,15 @@ func NewServer(cfg *ServerConfig) (srv *EtcdServer, err error) {
 			plog.Warningf("consistent index never saved (snapshot index=%d)", snapshot.Metadata.Index)
 		}
 	}
+	newSrv := srv // since srv == nil in defer if srv is returned as nil
+	defer func() {
+		// closing backend without first closing kv can cause
+		// resumed compactions to fail with closed tx errors
+		if err != nil {
+			newSrv.kv.Close()
+		}
+	}()
+
 	srv.consistIndex.setConsistentIndex(srv.kv.ConsistentIndex())
 	tp, err := auth.NewTokenProvider(cfg.AuthToken,
 		func(index uint64) <-chan struct{} {