github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Makes session invalidate loops use a separate slice to protect the iterator.

pull/1291/head
James Phillips 2015-10-12 23:35:48 -07:00
parent 834c6c1cb4
commit ca3a84edf8
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
consul/state/state_store.go
View File

@ -1949,15 +1949,19 @@ func (s *StateStore) deleteSessionTxn(tx *memdb.Txn, idx uint64, watches *DumbWa
if err != nil { if err != nil {
return fmt.Errorf("failed kvs lookup: %s", err) return fmt.Errorf("failed kvs lookup: %s", err)
} }
var kvs []interface{}
for entry := entries.Next(); entry != nil; entry = entries.Next() {
kvs = append(kvs, entry)
}
// Invalidate any held locks. // Invalidate any held locks.
switch session.Behavior { switch session.Behavior {
case structs.SessionKeysRelease: case structs.SessionKeysRelease:
for entry := entries.Next(); entry != nil; entry = entries.Next() { for _, obj := range kvs {
// Note that we clone here since we are modifying the // Note that we clone here since we are modifying the
// returned object and want to make sure our set op // returned object and want to make sure our set op
// respects the transaction we are in. // respects the transaction we are in.
e := entry.(*structs.DirEntry).Clone() e := obj.(*structs.DirEntry).Clone()
e.Session = "" e.Session = ""
if err := s.kvsSetTxn(tx, idx, e, true); err != nil { if err := s.kvsSetTxn(tx, idx, e, true); err != nil {
return fmt.Errorf("failed kvs update: %s", err) return fmt.Errorf("failed kvs update: %s", err)
@ -1969,8 +1973,8 @@ func (s *StateStore) deleteSessionTxn(tx *memdb.Txn, idx uint64, watches *DumbWa
} }
} }
case structs.SessionKeysDelete: case structs.SessionKeysDelete:
for entry := entries.Next(); entry != nil; entry = entries.Next() { for _, obj := range kvs {
e := entry.(*structs.DirEntry) e := obj.(*structs.DirEntry)
if err := s.kvsDeleteTxn(tx, idx, e.Key); err != nil { if err := s.kvsDeleteTxn(tx, idx, e.Key); err != nil {
return fmt.Errorf("failed kvs delete: %s", err) return fmt.Errorf("failed kvs delete: %s", err)
} }