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

Merge pull request #18068 from wojtek-t/fix_benchmark_integration

Browse Source 
Fix compile errors in benchmark
This commit is contained in:
Marek Grabowski 2015-12-03 09:04:52 +01:00
commit 99d4b9f1b7
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/integration/master_benchmark_test.go
View File

@ -26,12 +26,9 @@ import (
"time" "time"
"github.com/golang/glog" "github.com/golang/glog"
"k8s.io/kubernetes/pkg/api"
client "k8s.io/kubernetes/pkg/client/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/labels"
etcdgeneric "k8s.io/kubernetes/pkg/registry/generic/etcd"
"k8s.io/kubernetes/pkg/storage/etcd/etcdtest"
"k8s.io/kubernetes/test/integration/framework" "k8s.io/kubernetes/test/integration/framework"
) )
@ -169,9 +166,6 @@ func BenchmarkPodListEtcd(b *testing.B) {
glog.Infof("Starting benchmark: b.N %d, pods %d, workers %d, podsPerNode %d", glog.Infof("Starting benchmark: b.N %d, pods %d, workers %d, podsPerNode %d",
b.N, numPods, numTasks, podsPerNode) b.N, numPods, numTasks, podsPerNode)
ctx := api.WithNamespace(api.NewContext(), framework.TestNS)
key := etcdgeneric.NamespaceKeyRootFunc(ctx, fmt.Sprintf("%s/pods", etcdtest.PathPrefix()))
b.StartTimer() b.StartTimer()
for i := 0; i < iter; i++ { for i := 0; i < iter; i++ {
framework.RunParallel(func(id int) error { framework.RunParallel(func(id int) error {
@ -179,10 +173,12 @@ func BenchmarkPodListEtcd(b *testing.B) {
defer func() { defer func() {
glog.V(3).Infof("Worker %d: listing pods took %v", id, time.Since(now)) glog.V(3).Infof("Worker %d: listing pods took %v", id, time.Since(now))
}() }()
if response, err := m.EtcdStorage.Client.Get(key, true, true); err != nil { pods, err := m.RestClient.Pods(framework.TestNS).List(labels.Everything(), fields.Everything())
if err != nil {
return err return err
} else if len(response.Node.Nodes) < podsPerNode { }
glog.Fatalf("List retrieved %d pods, which is less than %d", len(response.Node.Nodes), podsPerNode) if len(pods.Items) < numPods {
glog.Fatalf("List retrieved %d pods, which is less than %d", len(pods.Items), numPods)
} }
return nil return nil
}, numTasks, Workers) }, numTasks, Workers)