Skip to content
This repository has been archived by the owner on Nov 14, 2023. It is now read-only.

Stop entity change loop when controller stops. Fixes #786 #787

Merged
merged 1 commit into from
Sep 1, 2023
Merged

Stop entity change loop when controller stops. Fixes #786 #787

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions controller/events/dispatcher_entity_change.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ func (self *Dispatcher) initEntityChangeEvents(n *network.Network) {
self.AddEntityChangeSource(store)
}
self.AddGlobalEntityChangeMetadata("version", n.VersionProvider.Version())
go self.entityChangeEventsDispatcher.flushLoop()
go self.entityChangeEventsDispatcher.flushLoop(n.GetCloseNotify())
}

func (self *Dispatcher) AddEntityChangeSource(store boltz.Store) {
Expand Down Expand Up @@ -295,10 +295,13 @@ func (self *entityChangeEventDispatcher) notifyFlush() {
}
}

func (self *entityChangeEventDispatcher) flushLoop() {
func (self *entityChangeEventDispatcher) flushLoop(closeNotify <-chan struct{}) {
for {
// wait to be notified of an event
<-self.notifyCh
// wait to be notified of an event or for controller shutdown
select {
case <-self.notifyCh:
case <-closeNotify:
}

// wait until we've not gotten an event for 5 seconds before cleaning up
flushed := false
Expand All @@ -309,6 +312,9 @@ func (self *entityChangeEventDispatcher) flushLoop() {
pfxlog.Logger().Debug("cleaning up entity change events")
self.flushCommittedTxEvents(false)
flushed = true
case <-closeNotify:
self.flushCommittedTxEvents(false)
return
}
}
}
Expand Down