github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 18:54:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #28466 from sttts/sttts-fix-benchmark-integration

Browse Source 
Automatic merge from submit-queue

Fix compilation of master_benchmark_test.go
This commit is contained in:
k8s-merge-robot 2016-07-08 03:41:05 -07:00 committed by GitHub
commit c092e2c5c5
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/integration/master/master_benchmark_test.go
View File

@ -26,6 +26,7 @@ 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"
@ -136,9 +137,10 @@ func BenchmarkPodList(b *testing.B) {
defer func() { defer func() {
glog.V(3).Infof("Worker %d: Node %v listing pods took %v", id, host, time.Since(now)) glog.V(3).Infof("Worker %d: Node %v listing pods took %v", id, host, time.Since(now))
}() }()
if pods, err := m.RestClient.Pods(ns.Name).List( if pods, err := m.RestClient.Pods(ns.Name).List(api.ListOptions{
labels.Everything(), LabelSelector: labels.Everything(),
fields.OneTermEqualSelector(client.PodHost, host)); err != nil { FieldSelector: fields.OneTermEqualSelector(api.PodHostField, host),
}); err != nil {
return err return err
} else if len(pods.Items) < podsPerNode { } else if len(pods.Items) < podsPerNode {
glog.Fatalf("List retrieved %d pods, which is less than %d", len(pods.Items), podsPerNode) glog.Fatalf("List retrieved %d pods, which is less than %d", len(pods.Items), podsPerNode)
@ -178,7 +180,10 @@ 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))
}() }()
pods, err := m.RestClient.Pods(ns.Name).List(labels.Everything(), fields.Everything()) pods, err := m.RestClient.Pods(ns.Name).List(api.ListOptions{
LabelSelector: labels.Everything(),
FieldSelector: fields.Everything(),
})
if err != nil { if err != nil {
return err return err
} }