mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-03 19:58:17 +00:00 
			
		
		
		
	Merge pull request #128066 from bart0sh/PR160-e2e_nod-fix-mirror-pod-test
e2e_node: fix mirror pod test
This commit is contained in:
		@@ -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)
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user