RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2025-02-16 10:37:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug with zero retention time

Browse Source 
Essentially, the Silences.Expire() will in that case have no effect
because the affected silence is immediately seen as expired from the
storage and thus not updated. The silence will stay around in its old
state.

This fix makes sure to use the same “now” throughout the expiration
process.

Signed-off-by: beorn7 <beorn@soundcloud.com>
This commit is contained in:
beorn7 2019-02-27 18:00:27 +01:00
parent 82b634916e
commit 0ab3b724cc
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
silence/silence.go
View File

@ -473,8 +473,8 @@ func (s *Silences) getSilence(id string) (*pb.Silence, bool) {
return msil.Silence, true
}
func (s *Silences) setSilence(sil *pb.Silence) error {
sil.UpdatedAt = s.now()
func (s *Silences) setSilence(sil *pb.Silence, now time.Time) error {
sil.UpdatedAt = now
if err := validateSilence(sil); err != nil {
return errors.Wrap(err, "silence invalid")
@ -489,7 +489,7 @@ func (s *Silences) setSilence(sil *pb.Silence) error {
return err
}
if s.st.merge(msil, s.now()) {
if s.st.merge(msil, now) {
s.version++
}
s.broadcast(b)
@ -511,7 +511,7 @@ func (s *Silences) Set(sil *pb.Silence) (string, error) {
}
if ok {
if canUpdate(prev, sil, now) {
return sil.Id, s.setSilence(sil)
return sil.Id, s.setSilence(sil, now)
}
if getState(prev, s.now()) != types.SilenceStateExpired {
// We cannot update the silence, expire the old one.
@ -527,7 +527,7 @@ func (s *Silences) Set(sil *pb.Silence) (string, error) {
sil.StartsAt = now
}
return sil.Id, s.setSilence(sil)
return sil.Id, s.setSilence(sil, now)
}
// canUpdate returns true if silence a can be updated to b without
@ -584,7 +584,7 @@ func (s *Silences) expire(id string) error {
sil.EndsAt = now
}
return s.setSilence(sil)
return s.setSilence(sil, now)
}
// QueryParam expresses parameters along which silences are queried.
@ -704,7 +704,7 @@ func (s *Silences) Version() int {
return s.version
}
// Count silences by state.
// CountState counts silences by state.
func (s *Silences) CountState(states ...types.SilenceState) (int, error) {
// This could probably be optimized.
sils, _, err := s.Query(QState(states...))
@ -832,6 +832,8 @@ func (s *Silences) Merge(b []byte) error {
return nil
}
// SetBroadcast sets the provided function as the one creating data to be
// broadcast.
func (s *Silences) SetBroadcast(f func([]byte)) {
s.mtx.Lock()
s.broadcast = f
@ -841,6 +843,7 @@ func (s *Silences) SetBroadcast(f func([]byte)) {
type state map[string]*pb.MeshSilence
func (s state) merge(e *pb.MeshSilence, now time.Time) bool {
id := e.Silence.Id
if e.ExpiresAt.Before(now) {
return false
}
@ -851,7 +854,6 @@ func (s state) merge(e *pb.MeshSilence, now time.Time) bool {
e.Silence.CreatedBy = e.Silence.Comments[0].Author
e.Silence.Comments = nil
}
id := e.Silence.Id
prev, ok := s[id]
if !ok || prev.Silence.UpdatedAt.Before(e.Silence.UpdatedAt) {

8
silence/silence_test.go
View File

@ -199,7 +199,7 @@ func TestSilencesSetSilence(t *testing.T) {
// setSilence() is always called with s.mtx locked()
go func() {
s.mtx.Lock()
require.NoError(t, s.setSilence(sil))
require.NoError(t, s.setSilence(sil, now))
s.mtx.Unlock()
}()
@ -864,8 +864,8 @@ func TestSilenceExpireWithZeroRetention(t *testing.T) {
require.Contains(t, err.Error(), "already expired")
_, err = s.QueryOne(QIDs("pending"))
require.Error(t, err)
require.Contains(t, err.Error(), "silence not found") // It is expired from the storage, too.
require.NoError(t, err)
require.Equal(t, 1, count)
count, err = s.CountState(types.SilenceStatePending)
require.NoError(t, err)
@ -873,7 +873,7 @@ func TestSilenceExpireWithZeroRetention(t *testing.T) {
count, err = s.CountState(types.SilenceStateExpired)
require.NoError(t, err)
require.Equal(t, 1, count) // As the two explicitly expired silences have immediately expired.
require.Equal(t, 3, count)
}
func TestValidateMatcher(t *testing.T) {