Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix performance test issues #46423

Merged
merged 3 commits into from
May 26, 2017
Merged

Fix performance test issues #46423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ded8e03
Reduce service creation/deletion parallelism in the load test
gmarek May 25, 2017
02951f1
Correctly handle nil resource usage in performance e2e tests
gmarek May 25, 2017
2437cf4
fix type in start-kubemark
gmarek May 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 5 additions & 6 deletions test/e2e/framework/kubelet_stats.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ import (
"k8s.io/kubernetes/pkg/master/ports"
"k8s.io/kubernetes/pkg/metrics"

"github.com/golang/glog"
"github.com/prometheus/common/model"
)

Expand Down Expand Up @@ -370,10 +369,8 @@ func getOneTimeResourceUsageOnNode(
}

f := func(name string, newStats *stats.ContainerStats) *ContainerResourceUsage {
// TODO(gmarek): remove when #46198 is debugged.
if newStats == nil || newStats.CPU == nil {
glog.Warning("NewStats is %#v for container %v", newStats, name)
return &ContainerResourceUsage{}
if newStats == nil || newStats.CPU == nil || newStats.Memory == nil {
return nil
}
return &ContainerResourceUsage{
Name: name,
Expand Down Expand Up @@ -402,7 +399,9 @@ func getOneTimeResourceUsageOnNode(
if !isInteresting {
continue
}
usageMap[pod.PodRef.Name+"/"+container.Name] = f(pod.PodRef.Name+"/"+container.Name, &container)
if usage := f(pod.PodRef.Name+"/"+container.Name, &container); usage != nil {
usageMap[pod.PodRef.Name+"/"+container.Name] = usage
}
}
}
return usageMap, nil
Expand Down
6 changes: 4 additions & 2 deletions test/e2e/perf/load.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ const (
// nodeCountPerNamespace determines how many namespaces we will be using
// depending on the number of nodes in the underlying cluster.
nodeCountPerNamespace = 100
// How many threads will be used to create/delete services during this test.
serviceOperationsParallelism = 5
)

var randomKind = schema.GroupKind{Kind: "Random"}
Expand Down Expand Up @@ -190,15 +192,15 @@ var _ = framework.KubeDescribe("Load capacity", func() {
_, err := clientset.Core().Services(services[i].Namespace).Create(services[i])
framework.ExpectNoError(err)
}
workqueue.Parallelize(25, len(services), createService)
workqueue.Parallelize(serviceOperationsParallelism, len(services), createService)
framework.Logf("%v Services created.", len(services))
defer func(services []*v1.Service) {
framework.Logf("Starting to delete services...")
deleteService := func(i int) {
err := clientset.Core().Services(services[i].Namespace).Delete(services[i].Name, nil)
framework.ExpectNoError(err)
}
workqueue.Parallelize(25, len(services), deleteService)
workqueue.Parallelize(serviceOperationsParallelism, len(services), deleteService)
framework.Logf("Services deleted")
}(services)
} else {
Expand Down
4 changes: 2 additions & 2 deletions test/kubemark/start-kubemark.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,8 +303,8 @@ current-context: kubemark-context")
metrics_mem=$((200 + ${metrics_mem_per_node}*${NUM_NODES:-10}))
sed -i'' -e "s/{{METRICS_MEM}}/${metrics_mem}/g" "${RESOURCE_DIRECTORY}/addons/heapster.json"
metrics_cpu_per_node_numerator=${NUM_NODES:-10}
metrics_cpu_per_node_denumerator=2
metrics_cpu=$((80 + metrics_cpu_per_node_numerator / metrics_cpu_per_node_denumerator))
metrics_cpu_per_node_denominator=2
metrics_cpu=$((80 + metrics_cpu_per_node_numerator / metrics_cpu_per_node_denominator))
sed -i'' -e "s/{{METRICS_CPU}}/${metrics_cpu}/g" "${RESOURCE_DIRECTORY}/addons/heapster.json"
eventer_mem_per_node=500
eventer_mem=$((200 * 1024 + ${eventer_mem_per_node}*${NUM_NODES:-10}))
Expand Down