mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-13 22:05:59 +00:00
Remove problematic Dbus restart test
Signed-off-by: Krzysztof Wilczyński <kwilczynski@redhat.com>
This commit is contained in:
parent
8453eb0c24
commit
2a8982b27b
@ -374,35 +374,6 @@ var _ = SIGDescribe("GracefulNodeShutdown [Serial] [NodeFeature:GracefulNodeShut
|
|||||||
return nil
|
return nil
|
||||||
}, nodeStatusUpdateTimeout, pollInterval).Should(gomega.Succeed())
|
}, nodeStatusUpdateTimeout, pollInterval).Should(gomega.Succeed())
|
||||||
})
|
})
|
||||||
|
|
||||||
ginkgo.It("after restart dbus, should be able to gracefully shutdown", func(ctx context.Context) {
|
|
||||||
// allows manual restart of dbus to work in Ubuntu.
|
|
||||||
err := overlayDbusConfig()
|
|
||||||
framework.ExpectNoError(err)
|
|
||||||
defer func() {
|
|
||||||
err := restoreDbusConfig()
|
|
||||||
framework.ExpectNoError(err)
|
|
||||||
}()
|
|
||||||
|
|
||||||
ginkgo.By("Restart Dbus")
|
|
||||||
err = restartDbus()
|
|
||||||
framework.ExpectNoError(err)
|
|
||||||
|
|
||||||
gomega.Eventually(ctx, func(ctx context.Context) error {
|
|
||||||
// re-send the shutdown signal in case the dbus restart is not done
|
|
||||||
ginkgo.By("Emitting Shutdown signal")
|
|
||||||
err = emitSignalPrepareForShutdown(true)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
isReady := getNodeReadyStatus(ctx, f)
|
|
||||||
if isReady {
|
|
||||||
return fmt.Errorf("node did not become shutdown as expected")
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}, nodeStatusUpdateTimeout, pollInterval).Should(gomega.Succeed())
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|
||||||
ginkgo.Context("when gracefully shutting down with Pod priority", func() {
|
ginkgo.Context("when gracefully shutting down with Pod priority", func() {
|
||||||
@ -680,12 +651,6 @@ func getNodeReadyStatus(ctx context.Context, f *framework.Framework) bool {
|
|||||||
return isNodeReady(&nodeList.Items[0])
|
return isNodeReady(&nodeList.Items[0])
|
||||||
}
|
}
|
||||||
|
|
||||||
func restartDbus() error {
|
|
||||||
cmd := "systemctl restart dbus"
|
|
||||||
_, err := runCommand("sh", "-c", cmd)
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
func systemctlDaemonReload() error {
|
func systemctlDaemonReload() error {
|
||||||
cmd := "systemctl daemon-reload"
|
cmd := "systemctl daemon-reload"
|
||||||
_, err := runCommand("sh", "-c", cmd)
|
_, err := runCommand("sh", "-c", cmd)
|
||||||
|
Loading…
Reference in New Issue
Block a user