github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #41793 from wojtek-t/speedup_density_2 

Automatic merge from submit-queue (batch tested with PRs 41797, 41793, 41795, 41807, 41781)

Slightly speedup density test
pull/6/head
Kubernetes Submit Queue 2017-02-22 22:06:32 -08:00 committed by GitHub
parent c6036b6acc 70e8c9cb89
commit ffda545ce9
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/density.go
View File

@ -339,9 +339,13 @@ var _ = framework.KubeDescribe("Density", func() {
}
})
options := framework.FrameworkOptions{
ClientQPS: 50.0,
ClientBurst: 100,
}
// Explicitly put here, to delete namespace at the end of the test
// (after measuring latency metrics, etc.).
f := framework.NewDefaultFramework("density")
f := framework.NewFramework("density", options, nil)
f.NamespaceDeletionTimeout = time.Hour
BeforeEach(func() {

6
test/e2e/framework/util.go
View File

@ -2786,7 +2786,7 @@ func DeleteResourceAndPods(clientset clientset.Interface, internalClientset inte
}
deleteTime := time.Now().Sub(startTime)
Logf("Deleting %v %s took: %v", kind, name, deleteTime)
err = waitForPodsInactive(ps, 10*time.Millisecond, 10*time.Minute)
err = waitForPodsInactive(ps, 100*time.Millisecond, 10*time.Minute)
if err != nil {
return fmt.Errorf("error while waiting for pods to become inactive %s: %v", name, err)
}
@ -2794,10 +2794,12 @@ func DeleteResourceAndPods(clientset clientset.Interface, internalClientset inte
Logf("Terminating %v %s pods took: %v", kind, name, terminatePodTime)
// this is to relieve namespace controller's pressure when deleting the
// namespace after a test.
err = waitForPodsGone(ps, 10*time.Second, 10*time.Minute)
err = waitForPodsGone(ps, 100*time.Millisecond, 10*time.Minute)
if err != nil {
return fmt.Errorf("error while waiting for pods gone %s: %v", name, err)
}
gcPodTime := time.Now().Sub(startTime) - terminatePodTime
Logf("Garbage collecting %v %s pods took: %v", kind, name, gcPodTime)
return nil
}