mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00
tests/framwork/e2e/cluster.go: revert back to sequential cluster stop to reduce e2e test run time
Signed-off-by: Chao Chen <chaochn@amazon.com>
This commit is contained in:
parent
6519a15db4
commit
941c4afb0c
@ -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 {
|
||||
|
@ -279,5 +279,5 @@ func forcestopCluster(clus *e2e.EtcdProcessCluster) error {
|
||||
for _, member := range clus.Procs {
|
||||
member.Kill()
|
||||
}
|
||||
return clus.Stop()
|
||||
return clus.ConcurrentStop()
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user