Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tests/framwork/e2e/cluster.go: revert back to sequential cluster stop to reduce e2e test run time #15637

Merged
merged 1 commit into from
Apr 12, 2023
Merged

tests/framwork/e2e/cluster.go: revert back to sequential cluster stop to reduce e2e test run time #15637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions tests/framework/e2e/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -856,6 +856,22 @@ func (epc *EtcdProcessCluster) rollingStart(f func(ep EtcdProcess) error) error
}

func (epc *EtcdProcessCluster) Stop() (err error) {
for _, p := range epc.Procs {
if p == nil {
continue
}
if curErr := p.Stop(); curErr != nil {
if err != nil {
err = fmt.Errorf("%v; %v", err, curErr)
} else {
err = curErr
}
}
}
return err
}

func (epc *EtcdProcessCluster) ConcurrentStop() (err error) {
errCh := make(chan error, len(epc.Procs))
for i := range epc.Procs {
if epc.Procs[i] == nil {
Expand Down
2 changes: 1 addition & 1 deletion tests/robustness/linearizability_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,5 +279,5 @@ func forcestopCluster(clus *e2e.EtcdProcessCluster) error {
for _, member := range clus.Procs {
member.Kill()
}
return clus.Stop()
return clus.ConcurrentStop()
}