client: don't emit task shutdown delay event if not waiting #16281
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
tgross
approved these changes
Mar 1, 2023
Comment on lines
1112
to
1120
| // Check that we only emit the expected events. | ||
| hasEvent := false | ||
| for _, ev := range tr.state.Events { | ||
| require.NotEqual(t, structs.TaskWaitingShuttingDownDelay, ev.Type) | ||
| if ev.Type == structs.TaskSkippingShutdownDelay { | ||
| hasEvent = true | ||
| } | ||
| } | ||
| require.True(t, hasEvent) |
There was a problem hiding this comment.
Not a blocker, but I think this kind of loop is what must.Contains was designed for?
There was a problem hiding this comment.
I couldn't quite make that work. The best I was able to do was something like this:
want := &structs.TaskEvent{Type: structs.TaskSkippingShutdownDelay}
must.SliceContainsFunc(t, tr.state.Events, want, func(a, b *structs.TaskEvent) bool {
return a.Type == b.Type
})But SliceNotContainsFunc, which I would have to use to check for the absence of TaskWaitingShuttingDownDelay doesn't exist yet, so I left the initial implementation but replacing require with must.
There was a problem hiding this comment.
SliceNotContainsFunc
probably should exist, created shoenig/test#110
There was a problem hiding this comment.
Awesome, thanks!
I was thinking about the ergonomics of this use case, and I think it could be helpful to have something like these:
s := []string{"hit", "miss"}
must.SliceAtLeastOne(s, func(i string) bool {
return i == "hit"
}) // success
must.SliceAll(s, func(i string) bool {
return i == "hit"
}) // fail
must.SliceNone(s, func(i string) bool {
return i == "none"
}) // success
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.
#14775 introduced a new task event when the task runner is waiting for the
shutdown_delay, but some requests can be configured to ignore theshutdown_delay, in which case it can confusing to have this event, so emit one that notes the delay is being skipped instead.No changelog or backports necessary since #14775 has not being released yet.I just realized that I should've merged this for 1.5.0 🤦
Not big deal, but I added a changelog entry now.