fix: panic when setting a zero interval for ticker #2335
Merged
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
docmerlin
force-pushed
the
fix/tickerpanic
branch
5 times, most recently
from
97cb5b1 to
8e50903
Compare
wolffcm
reviewed
May 14, 2020
| @@ -80,7 +80,7 @@ func (n *BarrierNode) newBarrier(group edge.GroupInfo, first edge.PointMeta) (ed | |||
| ) | |||
| return periodicBarrier, periodicBarrier.Stop, nil | |||
| default: | |||
| return nil, nil, errors.New("unreachable code, barrier node should have non-zero idle or non-zero period") | |||
| return nil, nil, errors.New("unreachable code, barrier node should have positive idle or positive period") | |||
There was a problem hiding this comment.
I'm curious, what is the behavior supposed to be if period and idle are both set? Is that possible?
There was a problem hiding this comment.
The docs say it's based on one of them. I wonder if you should return an error if both are set?
There was a problem hiding this comment.
That is probably a good idea. I think it is outside the scope of this PR though.
| @@ -447,6 +448,9 @@ func unmarshalStats(data []byte, parents []Node, typ TypeOf) (Node, error) { | |||
| } | |||
| child := nodeParent.Stats(0) | |||
| err := json.Unmarshal(data, child) | |||
| if child.Interval == 0 { | |||
| return nil, errors.New("zero is an invalid stats interval") | |||
There was a problem hiding this comment.
This code is for serializing kapacitor pipelines, isn't it? Doesn't this check belong in stats.go?
There was a problem hiding this comment.
I added one to stats.go
docmerlin
force-pushed
the
fix/tickerpanic
branch
from
8e50903 to
9a0d74a
Compare
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.
Required for all non-trivial PRs
Closes #2281