github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #108048 from aojea/custom_etcd_integration

Browse Source 
integration: custom etcd gracefully termination
This commit is contained in:
Kubernetes Prow Robot 2022-05-03 17:18:48 -07:00 committed by GitHub
commit 743238e951
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/integration/framework/etcd.go
View File

@ -26,6 +26,7 @@ import (
"os/exec" "os/exec"
"runtime" "runtime"
"strings" "strings"
"syscall"
"time" "time"
"google.golang.org/grpc/grpclog" "google.golang.org/grpc/grpclog"
@ -128,7 +129,18 @@ func RunCustomEtcd(dataDir string, customFlags []string) (url string, stopFn fun
cmd.Stdout = os.Stdout cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr
stop := func() { stop := func() {
cancel() // try to exit etcd gracefully
defer cancel()
cmd.Process.Signal(syscall.SIGTERM)
go func() {
select {
case <-ctx.Done():
klog.Infof("etcd exited gracefully, context cancelled")
case <-time.After(5 * time.Second):
klog.Infof("etcd didn't exit in 5 seconds, killing it")
cancel()
}
}()
err := cmd.Wait() err := cmd.Wait()
klog.Infof("etcd exit status: %v", err) klog.Infof("etcd exit status: %v", err)
err = os.RemoveAll(etcdDataDir) err = os.RemoveAll(etcdDataDir)