mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-05 02:09:56 +00:00
Log how much time it takes e2e tests to clean up the namespace
Will get a better handle on deletion test wasted time
This commit is contained in:
parent
9a9a296556
commit
fcab3a442d
@ -954,12 +954,13 @@ func CheckTestingNSDeletedExcept(c clientset.Interface, skip string) error {
|
|||||||
// deleteNS deletes the provided namespace, waits for it to be completely deleted, and then checks
|
// deleteNS deletes the provided namespace, waits for it to be completely deleted, and then checks
|
||||||
// whether there are any pods remaining in a non-terminating state.
|
// whether there are any pods remaining in a non-terminating state.
|
||||||
func deleteNS(c clientset.Interface, clientPool dynamic.ClientPool, namespace string, timeout time.Duration) error {
|
func deleteNS(c clientset.Interface, clientPool dynamic.ClientPool, namespace string, timeout time.Duration) error {
|
||||||
|
startTime := time.Now()
|
||||||
if err := c.Core().Namespaces().Delete(namespace, nil); err != nil {
|
if err := c.Core().Namespaces().Delete(namespace, nil); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
// wait for namespace to delete or timeout.
|
// wait for namespace to delete or timeout.
|
||||||
err := wait.PollImmediate(5*time.Second, timeout, func() (bool, error) {
|
err := wait.PollImmediate(2*time.Second, timeout, func() (bool, error) {
|
||||||
if _, err := c.Core().Namespaces().Get(namespace, metav1.GetOptions{}); err != nil {
|
if _, err := c.Core().Namespaces().Get(namespace, metav1.GetOptions{}); err != nil {
|
||||||
if apierrs.IsNotFound(err) {
|
if apierrs.IsNotFound(err) {
|
||||||
return true, nil
|
return true, nil
|
||||||
@ -1007,6 +1008,7 @@ func deleteNS(c clientset.Interface, clientPool dynamic.ClientPool, namespace st
|
|||||||
// no remaining content, but namespace was not deleted (namespace controller is probably wedged)
|
// no remaining content, but namespace was not deleted (namespace controller is probably wedged)
|
||||||
return fmt.Errorf("namespace %v was not deleted with limit: %v, namespace is empty but is not yet removed", namespace, err)
|
return fmt.Errorf("namespace %v was not deleted with limit: %v, namespace is empty but is not yet removed", namespace, err)
|
||||||
}
|
}
|
||||||
|
Logf("namespace %v deletion completed in %s", namespace, time.Now().Sub(startTime))
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user