github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 18:54:06 +00:00
Code Issues Projects Releases Wiki Activity

revert the old loop to check if the node is rebooted

Browse Source
This commit is contained in:
zylxjtu 2025-02-28 19:39:21 +00:00
parent f1612003ff
commit 3d318b57e3
1 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
test/e2e/windows/reboot_node.go
View File

@ -53,6 +53,8 @@ var _ = sigDescribe(feature.Windows, "[Excluded:WindowsDocker] [MinimumKubeletVe
bootID, err := strconv.Atoi(targetNode.Status.NodeInfo.BootID) bootID, err := strconv.Atoi(targetNode.Status.NodeInfo.BootID)
framework.ExpectNoError(err, "Error converting bootID to int") framework.ExpectNoError(err, "Error converting bootID to int")
framework.Logf("Initial BootID: %d", bootID)
windowsImage := imageutils.GetE2EImage(imageutils.Agnhost) windowsImage := imageutils.GetE2EImage(imageutils.Agnhost)
// Create Windows pod on the selected Windows node Using Agnhost // Create Windows pod on the selected Windows node Using Agnhost
@ -179,29 +181,40 @@ var _ = sigDescribe(feature.Windows, "[Excluded:WindowsDocker] [MinimumKubeletVe
restartCount := 0 restartCount := 0
ginkgo.By("Waiting for nodes to be rebooted") timeout := time.After(time.Minute * 10)
gomega.Eventually(ctx, func(ctx context.Context) int { FOR:
refreshNode, err := f.ClientSet.CoreV1().Nodes().Get(ctx, targetNode.Name, metav1.GetOptions{}) for {
if err != nil { select {
return -1 case <-timeout:
break FOR
default:
if restartCount > 0 {
break FOR
}
ginkgo.By("Then checking existed agn-test-pod is running on the rebooted host")
agnPodOut, err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Get(ctx, agnPod.Name, metav1.GetOptions{})
if err == nil {
lastRestartCount := podutil.GetExistingContainerStatus(agnPodOut.Status.ContainerStatuses, "windows-container").RestartCount
restartCount = int(lastRestartCount - initialRestartCount)
}
time.Sleep(time.Second * 30)
} }
num, err := strconv.Atoi(refreshNode.Status.NodeInfo.BootID) // Attempt to convert empty string }
if err != nil {
return -1 // strconv.Atoi: parsing "": invalid syntax
} else {
return num
}
}).WithPolling(time.Second*30).WithTimeout(time.Minute*10).
Should(gomega.BeNumerically(">", bootID), "node was not rebooted")
ginkgo.By("Then checking existed agn-test-pod is running on the rebooted host") ginkgo.By("Checking whether the node is rebooted")
agnPodOut, err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Get(ctx, agnPod.Name, metav1.GetOptions{}) refreshNode, err := f.ClientSet.CoreV1().Nodes().Get(ctx, targetNode.Name, metav1.GetOptions{})
framework.ExpectNoError(err, "getting pod info after reboot") framework.ExpectNoError(err, "Error getting node info after reboot")
currentbootID, err := strconv.Atoi(refreshNode.Status.NodeInfo.BootID)
framework.ExpectNoError(err, "Error converting bootID to int")
framework.Logf("current BootID: %d", currentbootID)
gomega.Expect(currentbootID).To(gomega.Equal(bootID+1), "BootID should be incremented by 1 after reboot")
lastRestartCount := podutil.GetExistingContainerStatus(agnPodOut.Status.ContainerStatuses, "windows-container").RestartCount ginkgo.By("Checking whether agn-test-pod is rebooted")
restartCount = int(lastRestartCount - initialRestartCount)
gomega.Expect(restartCount).To(gomega.Equal(1), "restart count of agn-test-pod is 1") gomega.Expect(restartCount).To(gomega.Equal(1), "restart count of agn-test-pod is 1")
agnPodOut, err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Get(ctx, agnPod.Name, metav1.GetOptions{})
gomega.Expect(agnPodOut.Status.Phase).To(gomega.Equal(v1.PodRunning)) gomega.Expect(agnPodOut.Status.Phase).To(gomega.Equal(v1.PodRunning))
framework.ExpectNoError(err, "getting pod info after reboot")
assertConsistentConnectivity(ctx, f, nginxPod.ObjectMeta.Name, "linux", linuxCheck(agnPodOut.Status.PodIP, 80), internalMaxTries) assertConsistentConnectivity(ctx, f, nginxPod.ObjectMeta.Name, "linux", linuxCheck(agnPodOut.Status.PodIP, 80), internalMaxTries)
// create another host process pod to check system boot time // create another host process pod to check system boot time