github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 07:47:56 +00:00
Code Issues Projects Releases Wiki Activity

Making requested changes

Browse Source
This commit is contained in:
Vy Ta 2018-12-27 15:46:26 -07:00
parent 0a09b1d2a7
commit 906aceb89a
2 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/e2e/windows/density.go
View File

@ -28,7 +28,6 @@ import (
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/watch" "k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/cache"
stats "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
imageutils "k8s.io/kubernetes/test/utils/image" imageutils "k8s.io/kubernetes/test/utils/image"
"k8s.io/apimachinery/pkg/util/uuid" "k8s.io/apimachinery/pkg/util/uuid"
@ -48,14 +47,6 @@ var _ = SIGDescribe("Density [Serial] [Slow]", func() {
{ {
podsNr: 10, podsNr: 10,
interval: 0 * time.Millisecond, interval: 0 * time.Millisecond,
cpuLimits: framework.ContainersCPUSummary{
stats.SystemContainerKubelet: {0.50: 0.30, 0.95: 0.50},
stats.SystemContainerRuntime: {0.50: 0.40, 0.95: 0.60},
},
memLimits: framework.ResourceUsagePerContainer{
stats.SystemContainerKubelet: &framework.ContainerResourceUsage{MemoryRSSInBytes: 100 * 1024 * 1024},
stats.SystemContainerRuntime: &framework.ContainerResourceUsage{MemoryRSSInBytes: 500 * 1024 * 1024},
},
// percentile limit of single pod startup latency // percentile limit of single pod startup latency
podStartupLimits: framework.LatencyMetric{ podStartupLimits: framework.LatencyMetric{
Perc50: 30 * time.Second, Perc50: 30 * time.Second,
@ -104,7 +95,6 @@ type densityTest struct {
func runDensityBatchTest(f *framework.Framework, testArg densityTest) (time.Duration, []framework.PodLatencyData) { func runDensityBatchTest(f *framework.Framework, testArg densityTest) (time.Duration, []framework.PodLatencyData) {
const ( const (
podType = "density_test_pod" podType = "density_test_pod"
sleepBeforeCreatePods = 30 * time.Second
) )
var ( var (
mutex = &sync.Mutex{} mutex = &sync.Mutex{}
@ -120,14 +110,6 @@ func runDensityBatchTest(f *framework.Framework, testArg densityTest) (time.Dura
go controller.Run(stopCh) go controller.Run(stopCh)
defer close(stopCh) defer close(stopCh)
// TODO(coufon): in the test we found kubelet starts while it is busy on something, as a result 'syncLoop'
// does not response to pod creation immediately. Creating the first pod has a delay around 5s.
// The node status has already been 'ready' so `wait and check node being ready does not help here.
// Now wait here for a grace period to let 'syncLoop' be ready
time.Sleep(sleepBeforeCreatePods)
//rc.Start()
By("Creating a batch of pods") By("Creating a batch of pods")
// It returns a map['pod name']'creation time' containing the creation timestamps // It returns a map['pod name']'creation time' containing the creation timestamps
createTimes := createBatchPodWithRateControl(f, pods, testArg.interval) createTimes := createBatchPodWithRateControl(f, pods, testArg.interval)

2
test/e2e/windows/framework.go
View File

@ -1,5 +1,5 @@
/* /*
Copyright 2017 The Kubernetes Authors. Copyright 2018 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.