github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

e2e_node: fix mirror pod test

Browse Source 
Modified stopNfsServer function to wait until nfs rpc is unregistered.
This should fix failing pull-kubernetes-node-arm64-ubuntu-serial-gce
job.
This commit is contained in:
Ed Bartosh 2024-10-15 01:12:49 +03:00
parent 429edc5f25
commit 876819b8b6
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/e2e_node/mirror_pod_test.go
View File

@ -233,9 +233,6 @@ var _ = SIGDescribe("MirrorPod", func() {
ginkgo.By("Stopping the NFS server") ginkgo.By("Stopping the NFS server")
stopNfsServer(f, nfsServerPod) stopNfsServer(f, nfsServerPod)
ginkgo.By("Waiting for NFS server to stop...")
time.Sleep(30 * time.Second)
ginkgo.By(fmt.Sprintf("Deleting the static nfs test pod: %s", staticPodName)) ginkgo.By(fmt.Sprintf("Deleting the static nfs test pod: %s", staticPodName))
err = deleteStaticPod(podPath, staticPodName, ns) err = deleteStaticPod(podPath, staticPodName, ns)
framework.ExpectNoError(err) framework.ExpectNoError(err)
@ -303,7 +300,7 @@ func restartNfsServer(f *framework.Framework, serverPod *v1.Pod) {
// pod's (only) container. This command changes the number of nfs server threads to 0, // pod's (only) container. This command changes the number of nfs server threads to 0,
// thus closing all open nfs connections. // thus closing all open nfs connections.
func stopNfsServer(f *framework.Framework, serverPod *v1.Pod) { func stopNfsServer(f *framework.Framework, serverPod *v1.Pod) {
const stopcmd = "/usr/sbin/rpc.nfsd 0" const stopcmd = "rpc.nfsd 0 && for i in $(seq 200); do rpcinfo -p | grep -q nfs || break; sleep 1; done"
_, _, err := e2evolume.PodExec(f, serverPod, stopcmd) _, _, err := e2evolume.PodExec(f, serverPod, stopcmd)
framework.ExpectNoError(err) framework.ExpectNoError(err)
} }