github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #53051 from tanshanshan/test925

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 53051, 52489, 53920). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

fix todo

**What this PR does / why we need it**:
fix todo 
thanks
**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
```
This commit is contained in:
Kubernetes Submit Queue 2017-10-24 21:38:17 -07:00 committed by GitHub
commit 1336cc0b05
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e_node/density_test.go
View File

@ -524,7 +524,7 @@ func newInformerWatchPod(f *framework.Framework, mutex *sync.Mutex, watchTimes m
return controller return controller
} }
// createBatchPodSequential creats pods back-to-back in sequence. // createBatchPodSequential creates pods back-to-back in sequence.
func createBatchPodSequential(f *framework.Framework, pods []*v1.Pod) (time.Duration, []framework.PodLatencyData) { func createBatchPodSequential(f *framework.Framework, pods []*v1.Pod) (time.Duration, []framework.PodLatencyData) {
batchStartTime := metav1.Now() batchStartTime := metav1.Now()
e2eLags := make([]framework.PodLatencyData, 0) e2eLags := make([]framework.PodLatencyData, 0)
@ -570,7 +570,7 @@ func logPodCreateThroughput(batchLag time.Duration, e2eLags []framework.PodLaten
logPerfData(getThroughputPerfData(batchLag, e2eLags, podsNr, testInfo), "throughput") logPerfData(getThroughputPerfData(batchLag, e2eLags, podsNr, testInfo), "throughput")
} }
// increaseKubeletAPIQPSLimit sets Kubelet API QPS via ConfigMap. Kubelet will restart with the new QPS. // setKubeletAPIQPSLimit sets Kubelet API QPS via ConfigMap. Kubelet will restart with the new QPS.
func setKubeletAPIQPSLimit(f *framework.Framework, newAPIQPS int32) { func setKubeletAPIQPSLimit(f *framework.Framework, newAPIQPS int32) {
const restartGap = 40 * time.Second const restartGap = 40 * time.Second

2
test/e2e_node/docker_util.go
View File

@ -87,7 +87,7 @@ func isDockerLiveRestoreEnabled() (bool, error) {
return info.LiveRestoreEnabled, nil return info.LiveRestoreEnabled, nil
} }
// stopDockerDaemon starts the Docker daemon. // startDockerDaemon starts the Docker daemon.
func startDockerDaemon() error { func startDockerDaemon() error {
switch { switch {
case systemdutil.IsRunningSystemd(): case systemdutil.IsRunningSystemd():

7
test/e2e_node/image_list.go
View File

@ -93,8 +93,11 @@ func (rp *remotePuller) Name() string {
} }
func (rp *remotePuller) Pull(image string) ([]byte, error) { func (rp *remotePuller) Pull(image string) ([]byte, error) {
// TODO(runcom): should we check if the image is already pulled with ImageStatus? imageStatus, err := rp.imageService.ImageStatus(&runtimeapi.ImageSpec{Image: image})
_, err := rp.imageService.PullImage(&runtimeapi.ImageSpec{Image: image}, nil) if err == nil && imageStatus != nil {
return nil, nil
}
_, err = rp.imageService.PullImage(&runtimeapi.ImageSpec{Image: image}, nil)
return nil, err return nil, err
} }

2
test/e2e_node/resource_collector.go
View File

@ -534,7 +534,7 @@ func getContainer(pid int) (string, error) {
return "", cgroups.NewNotFoundError("memory") return "", cgroups.NewNotFoundError("memory")
} }
// since we use this container for accounting, we need to ensure its a unified hierarchy. // since we use this container for accounting, we need to ensure it is a unified hierarchy.
if cpu != memory { if cpu != memory {
return "", fmt.Errorf("cpu and memory cgroup hierarchy not unified. cpu: %s, memory: %s", cpu, memory) return "", fmt.Errorf("cpu and memory cgroup hierarchy not unified. cpu: %s, memory: %s", cpu, memory)
} }