mvcc/backend: exit on racey after-stop commit call

Fix etcd-io/etcdlabs#30.
etcd-io · Oct 20, 2016 · bbb28fb · bbb28fb
1 parent eff98b7
commit bbb28fb
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/mvcc/backend/batch_tx.go b/mvcc/backend/batch_tx.go
@@ -41,6 +41,7 @@ type batchTx struct {
 	tx      *bolt.Tx
 	backend *backend
 	pending int
+	stopped bool
 }
 
 func newBatchTx(backend *backend) *batchTx {
@@ -145,6 +146,7 @@ func (t *batchTx) CommitAndStop() {
 	t.Lock()
 	defer t.Unlock()
 	t.commit(true)
+	t.stopped = true
 }
 
 func (t *batchTx) Unlock() {
@@ -156,6 +158,10 @@ func (t *batchTx) Unlock() {
 }
 
 func (t *batchTx) commit(stop bool) {
+	if t.stopped {
+		return
+	}
+
 	var err error
 	// commit the last tx
 	if t.tx != nil {