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

state: fix bug in changeTrackerDB.publish 

Creating a new readTxn does not work because it will not see the newly created objects that are about to be committed. Instead use the active write Txn.
This commit is contained in:
Daniel Nephin 2020-07-21 18:20:34 -04:00
parent 81cc3daf69
commit 6a1a43721d
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
agent/consul/state/memdb.go
View File

@ -85,11 +85,8 @@ func (c *changeTrackerDB) WriteTxn(idx uint64) *txn {
return t return t
} }
func (c *changeTrackerDB) publish(changes Changes) error { func (c *changeTrackerDB) publish(tx ReadTxn, changes Changes) error {
readOnlyTx := c.db.Txn(false) events, err := c.processChanges(tx, changes)
defer readOnlyTx.Abort()
events, err := c.processChanges(readOnlyTx, changes)
if err != nil { if err != nil {
return fmt.Errorf("failed generating events from changes: %v", err) return fmt.Errorf("failed generating events from changes: %v", err)
} }
@ -127,7 +124,7 @@ type txn struct {
// Index is stored so that it may be passed along to any subscribers as part // Index is stored so that it may be passed along to any subscribers as part
// of a change event. // of a change event.
Index uint64 Index uint64
publish func(changes Changes) error publish func(tx ReadTxn, changes Changes) error
} }
// Commit first pushes changes to EventPublisher, then calls Commit on the // Commit first pushes changes to EventPublisher, then calls Commit on the
@ -152,7 +149,7 @@ func (tx *txn) Commit() error {
// In those cases changes should also be empty, and there will be nothing // In those cases changes should also be empty, and there will be nothing
// to publish. // to publish.
if tx.publish != nil { if tx.publish != nil {
if err := tx.publish(changes); err != nil { if err := tx.publish(tx.Txn, changes); err != nil {
return err return err
} }
} }