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

Always write HA heartbeat

Browse source
This commit is contained in:
Julian Brost 2021-03-02 12:23:39 +01:00 committed by Eric Lippmann
parent 4293a51c88
commit ab268bfbb6
1 changed files with 30 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
pkg/icingadb/ha.go
View file

@ -137,7 +137,7 @@ func (h *HA) controller() {
func (h *HA) realize(s *icingaredisv1.IcingaStatus, t *types.UnixMilli) error {
// boff := backoff.NewExponentialWithJitter(time.Millisecond*1, time.Second*1)
for attempt, retry := 0, true; retry; attempt++ {
for attempt := 0; true; attempt++ {
// sleep := boff(uint64(attempt))
// h.logger.Debugf("Sleeping for %s..", sleep)
// time.Sleep(sleep)
@ -158,41 +158,37 @@ func (h *HA) realize(s *icingaredisv1.IcingaStatus, t *types.UnixMilli) error {
break
}
_ = rows.Close()
if takeover {
i := v1.IcingadbInstance{
EntityWithoutChecksum: v1.EntityWithoutChecksum{
IdMeta: v1.IdMeta{
Id: h.instanceId,
},
i := v1.IcingadbInstance{
EntityWithoutChecksum: v1.EntityWithoutChecksum{
IdMeta: v1.IdMeta{
Id: h.instanceId,
},
EnvironmentMeta: v1.EnvironmentMeta{
EnvironmentId: s.EnvironmentID(),
},
Heartbeat: *t,
Responsible: types.Yes,
EndpointId: s.EndpointId,
Icinga2Version: s.Version,
Icinga2StartTime: s.ProgramStart,
Icinga2NotificationsEnabled: s.NotificationsEnabled,
Icinga2ActiveServiceChecksEnabled: s.ActiveServiceChecksEnabled,
Icinga2ActiveHostChecksEnabled: s.ActiveHostChecksEnabled,
Icinga2EventHandlersEnabled: s.EventHandlersEnabled,
Icinga2FlapDetectionEnabled: s.FlapDetectionEnabled,
Icinga2PerformanceDataEnabled: s.PerformanceDataEnabled,
}
_, err := tx.NamedExecContext(ctx, h.db.BuildUpsertStmt(i), i)
if err != nil {
cancel()
if !utils.IsDeadlock(err) {
retry = false
h.logger.Errorw("Can't Update or insert instance.", zap.Error(err))
} else {
h.logger.Infow("Can't Update or insert instance. Retrying..", zap.Error(err))
}
},
EnvironmentMeta: v1.EnvironmentMeta{
EnvironmentId: s.EnvironmentID(),
},
Heartbeat: *t,
Responsible: types.Bool{Bool: takeover || h.responsible, Valid: true},
EndpointId: s.EndpointId,
Icinga2Version: s.Version,
Icinga2StartTime: s.ProgramStart,
Icinga2NotificationsEnabled: s.NotificationsEnabled,
Icinga2ActiveServiceChecksEnabled: s.ActiveServiceChecksEnabled,
Icinga2ActiveHostChecksEnabled: s.ActiveHostChecksEnabled,
Icinga2EventHandlersEnabled: s.EventHandlersEnabled,
Icinga2FlapDetectionEnabled: s.FlapDetectionEnabled,
Icinga2PerformanceDataEnabled: s.PerformanceDataEnabled,
}
_, err = tx.NamedExecContext(ctx, h.db.BuildUpsertStmt(i), i)
if err != nil {
cancel()
if !utils.IsDeadlock(err) {
h.logger.Errorw("Can't Update or insert instance.", zap.Error(err))
break
} else {
h.logger.Infow("Can't Update or insert instance. Retrying..", zap.Error(err))
continue
}
} else {
retry = false
}
if err := tx.Commit(); err != nil {
return err
@ -200,6 +196,7 @@ func (h *HA) realize(s *icingaredisv1.IcingaStatus, t *types.UnixMilli) error {
if takeover {
h.signalTakeover()
}
break
}
return nil