luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

consul: Fixing accidental commit of transaction

This commit is contained in:
Armon Dadgar 2014-12-10 23:49:23 -08:00
parent 4da4e322a3
commit ae69cbca7b
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
consul/state_store.go
View File

@ -1212,7 +1212,10 @@ func (s *StateStore) kvsDeleteWithIndex(index uint64, tableIndex string, parts .
return err
}
defer tx.Abort()
return s.kvsDeleteWithIndexTxn(index, tx, tableIndex, parts...)
if err := s.kvsDeleteWithIndexTxn(index, tx, tableIndex, parts...); err != nil {
return err
}
return tx.Commit()
}
// kvsDeleteWithIndexTxn does a delete within an existing transaction
@ -1259,7 +1262,7 @@ func (s *StateStore) kvsDeleteWithIndexTxn(index uint64, tx *MDBTxn, tableIndex
}
})
}
return tx.Commit()
return nil
}
// KVSCheckAndSet is used to perform an atomic check-and-set