tests/robustness: cleanup errgroup usage #17858
Open
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
We don't really need to use errgroups. In most places we return nil from the errgroup goroutines, those can be replaced by goroutines + waitgroups. There was one place where we returned ctx.Err() from the errgroup routine but never caught that error from Wait(). It is okay to not return an error here as well since we catch the context cancellation error higher up in the call stack anyway. Signed-off-by: Madhav Jivrajani <madhav.jiv@gmail.com>
MadhavJivrajani
commented
Apr 23, 2024
Comment on lines
-72
to
+73
| return ctx.Err() | ||
| return |
There was a problem hiding this comment.
Not returning an error here since we check for it anyway higher up in the call stack:
etcd/tests/robustness/traffic/traffic.go
Line 101 in 94b155a
Also, this way it is more consistent with how the etcdTraffic implementation handles this.
serathius
reviewed
Apr 23, 2024
| @@ -108,15 +108,17 @@ func testRobustness(ctx context.Context, t *testing.T, lg *zap.Logger, s testSce | |||
| func (s testScenario) run(ctx context.Context, t *testing.T, lg *zap.Logger, clus *e2e.EtcdProcessCluster) (reports []report.ClientReport) { | |||
| ctx, cancel := context.WithCancel(ctx) | |||
| defer cancel() | |||
| g := errgroup.Group{} | |||
There was a problem hiding this comment.
Maybe we don't use errors, but usage of errgroup is more concise.
There was a problem hiding this comment.
I am okay with keeping it in as well! I usually just prefer not using things in exp if the language or stdlib can handle it.
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.
We don't really need to use errgroups. In most places we return nil from the errgroup goroutines, those can be replaced by goroutines + waitgroups.
There was one place where we returned ctx.Err() from the errgroup routine but never caught that error from Wait(). It is okay to not return an error here as well since we catch the context cancellation error higher up in the call stack anyway.
cc @serathius