Merge pull request #21882 from gmarek/throttle

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-03-01 06:38:06 -08:00
68 changed files with 102 additions and 87 deletions

View File

@@ -145,19 +145,15 @@ var _ = Describe("Density", func() {
// Explicitly put here, to delete namespace at the end of the test
// (after measuring latency metrics, etc.).framework := NewFramework("density")
framework := NewFramework("density")
options := FrameworkOptions{
clientQPS: 20,
clientBurst: 30,
}
framework := NewFramework("density", options)
framework.NamespaceDeletionTimeout = time.Hour
BeforeEach(func() {
// Explicitly create a client with higher QPS limits.
// However, make those at most comparable to components.
config, err := loadConfig()
Expect(err).NotTo(HaveOccurred())
config.QPS = 20
config.Burst = 30
c, err = loadClientFromConfig(config)
Expect(err).NotTo(HaveOccurred())
c = framework.Client
ns = framework.Namespace.Name
nodes := ListSchedulableNodesOrDie(c)
@@ -167,7 +163,7 @@ var _ = Describe("Density", func() {
// Terminating a namespace (deleting the remaining objects from it - which
// generally means events) can affect the current run. Thus we wait for all
// terminating namespace to be finally deleted before starting this test.
err = checkTestingNSDeletedExcept(c, ns)
err := checkTestingNSDeletedExcept(c, ns)
expectNoError(err)
uuid = string(util.NewUUID())