upstream/icingadb
1
0
Fork 0
mirror of https://github.com/Icinga/icingadb.git synced 2026-05-28 04:35:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix runtime updates for object types without checksum

Browse source
This commit is contained in:
Noah Hilverling 2020-01-07 16:45:11 +01:00
parent 8ca2098793
commit 37b629c40d
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
configobject/configsync/configsync.go
View file

@ -102,7 +102,7 @@ func Operator(super *supervisor.Supervisor, chHA chan int, objectInformation *co
go UpdatePrepWorker(super, objectInformation, done, chUpdate, chUpdateBack)
go UpdateExecWorker(super, objectInformation, done, chUpdateBack, wgUpdate, updateCounter)
go RuntimeUpdateWorker(super, objectInformation, done, chUpdate, chDelete, wgUpdate, wgDelete)
go RuntimeUpdateWorker(super, objectInformation, done, chInsert, chUpdate, chDelete, wgInsert, wgUpdate, wgDelete)
waitOrKill := func(wg *sync.WaitGroup, done chan struct{}) (kill bool) {
waitDone := make(chan bool)
@ -444,7 +444,7 @@ func UpdateExecWorker(super *supervisor.Supervisor, objectInformation *configobj
}
}
func RuntimeUpdateWorker(super *supervisor.Supervisor, objectInformation *configobject.ObjectInformation, done chan struct{}, chUpdate chan []string, chDelete chan []string, wgUpdate *sync.WaitGroup, wgDelete *sync.WaitGroup) {
func RuntimeUpdateWorker(super *supervisor.Supervisor, objectInformation *configobject.ObjectInformation, done chan struct{}, chInsert chan []string, chUpdate chan []string, chDelete chan []string, wgInsert *sync.WaitGroup, wgUpdate *sync.WaitGroup, wgDelete *sync.WaitGroup) {
subscription := super.Rdbw.Subscribe()
defer subscription.Close()
if err := subscription.Subscribe("icinga:config:delete", "icinga:config:update"); err != nil {
@ -458,8 +458,15 @@ func RuntimeUpdateWorker(super *supervisor.Supervisor, objectInformation *config
insertCurrentUpdatePackage := func() {
updateLen := len(currentUpdatePackage)
chUpdate <- currentUpdatePackage
wgUpdate.Add(updateLen)
if objectInformation.HasChecksum {
chUpdate <- currentUpdatePackage
wgUpdate.Add(updateLen)
} else {
chInsert <- currentUpdatePackage
wgInsert.Add(updateLen)
}
currentUpdatePackage = []string{}
log.WithFields(log.Fields{