Skip to content

K
k3s
Unverified Commit 0a22c159 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #64015 from cofyc/improvetests

Automatic merge from submit-queue (batch tested with PRs 62756, 63862, 61419, 64015, 64063). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Handle TERM signal to reduce pod terminating time. **What this PR does / why we need it**: Register signal handler for `TERM`. For container, process is run as PID 1. PID 1 is special in linux, it ignore any signal with the default action. So process will not terminate on `SIGINT` or `SIGTERM` unless it is coded to do so. By default, docker use `TERM` signal to termiante pods, it will wait 10 seconds before sending `KILL` signal. ``` $ docker run -d --rm --name test busybox sh -c 'while true; do sleep 1; done' aa827df5d7bfffc5ca4fae2429d0b761a5a142c57ba3e1faa59b305c92f1c875 $ time docker stop test test real 0m10.408s user 0m0.048s sys 0m0.020s ``` It's better to register a exit handler for `TERM`, it reduces a lot of time in waiting pods to termiante. ``` $ docker run -d --rm --name test busybox sh -c 'trap exit TERM; while true; do sleep 1; done' e331bff454dba8e45df6065c3bd2a928e1c41303aafdf88ede38def3e4e5781f $ time docker stop test test real 0m0.690s user 0m0.048s sys 0m0.020s ``` **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```
parents 5fe35cdb 55bc8d74
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
test/e2e/framework/deployment_util.go
View file @ 0a22c159
...@@ -232,7 +232,7 @@ func CreateDeployment(client clientset.Interface, replicas int32, podLabels map[ ...@@ -232,7 +232,7 @@ func CreateDeployment(client clientset.Interface, replicas int32, podLabels map[
// name. A slice of BASH commands can be supplied as args to be run by the pod // name. A slice of BASH commands can be supplied as args to be run by the pod
func MakeDeployment(replicas int32, podLabels map[string]string, nodeSelector map[string]string, namespace string, pvclaims []*v1.PersistentVolumeClaim, isPrivileged bool, command string) *apps.Deployment { func MakeDeployment(replicas int32, podLabels map[string]string, nodeSelector map[string]string, namespace string, pvclaims []*v1.PersistentVolumeClaim, isPrivileged bool, command string) *apps.Deployment {
if len(command) == 0 { if len(command) == 0 {
command = "while true; do sleep 1; done" command = "trap exit TERM; while true; do sleep 1; done"
} }
zero := int64(0) zero := int64(0)
deploymentName := "deployment-" + string(uuid.NewUUID()) deploymentName := "deployment-" + string(uuid.NewUUID())
......
test/e2e/framework/pv_util.go
View file @ 0a22c159
...@@ -815,7 +815,7 @@ func MakeWritePod(ns string, pvc *v1.PersistentVolumeClaim) *v1.Pod { ...@@ -815,7 +815,7 @@ func MakeWritePod(ns string, pvc *v1.PersistentVolumeClaim) *v1.Pod {
// name. A slice of BASH commands can be supplied as args to be run by the pod // name. A slice of BASH commands can be supplied as args to be run by the pod
func MakePod(ns string, nodeSelector map[string]string, pvclaims []*v1.PersistentVolumeClaim, isPrivileged bool, command string) *v1.Pod { func MakePod(ns string, nodeSelector map[string]string, pvclaims []*v1.PersistentVolumeClaim, isPrivileged bool, command string) *v1.Pod {
if len(command) == 0 { if len(command) == 0 {
command = "while true; do sleep 1; done" command = "trap exit TERM; while true; do sleep 1; done"
} }
podSpec := &v1.Pod{ podSpec := &v1.Pod{
TypeMeta: metav1.TypeMeta{ TypeMeta: metav1.TypeMeta{
...@@ -902,7 +902,7 @@ func MakeNginxPod(ns string, nodeSelector map[string]string, pvclaims []*v1.Pers ...@@ -902,7 +902,7 @@ func MakeNginxPod(ns string, nodeSelector map[string]string, pvclaims []*v1.Pers
// SELinux testing requires to pass HostIPC and HostPID as booleansi arguments. // SELinux testing requires to pass HostIPC and HostPID as booleansi arguments.
func MakeSecPod(ns string, pvclaims []*v1.PersistentVolumeClaim, isPrivileged bool, command string, hostIPC bool, hostPID bool, seLinuxLabel *v1.SELinuxOptions, fsGroup *int64) *v1.Pod { func MakeSecPod(ns string, pvclaims []*v1.PersistentVolumeClaim, isPrivileged bool, command string, hostIPC bool, hostPID bool, seLinuxLabel *v1.SELinuxOptions, fsGroup *int64) *v1.Pod {
if len(command) == 0 { if len(command) == 0 {
command = "while true; do sleep 1; done" command = "trap exit TERM; while true; do sleep 1; done"
} }
podName := "security-context-" + string(uuid.NewUUID()) podName := "security-context-" + string(uuid.NewUUID())
if fsGroup == nil { if fsGroup == nil {
......
test/e2e/framework/util.go
View file @ 0a22c159
...@@ -3474,7 +3474,7 @@ func newExecPodSpec(ns, generateName string) *v1.Pod { ...@@ -3474,7 +3474,7 @@ func newExecPodSpec(ns, generateName string) *v1.Pod {
{ {
Name: "exec", Name: "exec",
Image: BusyBoxImage, Image: BusyBoxImage,
Command: []string{"sh", "-c", "while true; do sleep 5; done"}, Command: []string{"sh", "-c", "trap exit TERM; while true; do sleep 5; done"},
}, },
}, },
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment