tests/framework/e2e: kill etcd cluster processes after test finished

Signed-off-by: Chao Chen <[email protected]>
etcd-io · Apr 4, 2023 · 1898654 · 1898654
1 parent 6f4e5f3
commit 1898654
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/tests/framework/e2e/cluster.go b/tests/framework/e2e/cluster.go
@@ -878,6 +878,13 @@ func (epc *EtcdProcessCluster) Stop() (err error) {
 	return err
 }
 
+func (epc *EtcdProcessCluster) ForceStop() (err error) {
+	for _, member := range epc.Procs {
+		member.Kill()
+	}
+	return epc.Stop()
+}
+
 func (epc *EtcdProcessCluster) Client(opts ...config.ClientOption) *EtcdctlV3 {
 	etcdctl, err := NewEtcdctl(epc.Cfg.Client, epc.EndpointsGRPC(), opts...)
 	if err != nil {
@@ -888,7 +895,7 @@ func (epc *EtcdProcessCluster) Client(opts ...config.ClientOption) *EtcdctlV3 {
 
 func (epc *EtcdProcessCluster) Close() error {
 	epc.lg.Info("closing test cluster...")
-	err := epc.Stop()
+	err := epc.ForceStop()
 	for _, p := range epc.Procs {
 		// p is nil when NewEtcdProcess fails in the middle
 		// Close still gets called to clean up test data