Correcting the condition for updating a silence. Earlier was checking… #2816
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Fixes #2809 |
silence/silence.go
Outdated
| @@ -586,7 +586,7 @@ func canUpdate(a, b *pb.Silence, now time.Time) bool { | |||
| // Allowed timestamp modifications depend on the current time. | |||
| switch st := getState(a, now); st { | |||
| case types.SilenceStateActive: | |||
| if !b.StartsAt.Equal(a.StartsAt) { | |||
| if b.StartsAt.Unix()-a.StartsAt.Unix() != 0 { | |||
There was a problem hiding this comment.
Suggested change
| if b.StartsAt.Unix()-a.StartsAt.Unix() != 0 { | |
| if b.StartsAt.Unix() != a.StartsAt.Unix() { |
|
Thanks, I have added a comment that makes this simpler. Is there an easy test we could add for this, or a comment we should write about why we call that method? |
33d33a9 to
9726794
Compare
There is a test case that I have added. Is there something else that you are looking for? |
silence/silence_test.go
Outdated
| } | ||
| id1, _ := s.Set(sil1) | ||
|
|
||
| // Update silence |
There was a problem hiding this comment.
Suggested change
| // Update silence | |
| // Update silence with 2 extra nanoseconds, so the "seconds" part should not change. |
… upto nanosecond precision but reduced to second as the UI only sends upto millisecond Signed-off-by: Prashant Balachandran <pnair@redhat.com>
9726794 to
6618217
Compare
simonpasquier
approved these changes
Mar 4, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Correcting the condition for updating a silence. Earlier was checking upto
nanosecond precision but reduced to second as the UI only sends upto millisecond
Signed-off-by: Prashant Balachandran pnair@redhat.com