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 #113724 from kerthcet/cleanup/klog

Browse Source 
Replace klog with benchmark log framework in scheduler_perf
This commit is contained in:
Kubernetes Prow Robot 2022-11-09 19:34:53 -08:00 committed by GitHub
commit 98bd73cfe0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
test/integration/scheduler_perf/scheduler_perf_test.go
View File

@ -43,7 +43,6 @@ import (
"k8s.io/component-base/featuregate" "k8s.io/component-base/featuregate"
featuregatetesting "k8s.io/component-base/featuregate/testing" featuregatetesting "k8s.io/component-base/featuregate/testing"
"k8s.io/component-base/metrics/legacyregistry" "k8s.io/component-base/metrics/legacyregistry"
"k8s.io/klog/v2"
"k8s.io/kubernetes/pkg/scheduler/apis/config" "k8s.io/kubernetes/pkg/scheduler/apis/config"
"k8s.io/kubernetes/pkg/scheduler/apis/config/scheme" "k8s.io/kubernetes/pkg/scheduler/apis/config/scheme"
"k8s.io/kubernetes/pkg/scheduler/apis/config/validation" "k8s.io/kubernetes/pkg/scheduler/apis/config/validation"
@ -597,7 +596,7 @@ func BenchmarkPerfScheduling(b *testing.B) {
}) })
} }
if err := dataItems2JSONFile(dataItems, b.Name()); err != nil { if err := dataItems2JSONFile(dataItems, b.Name()); err != nil {
klog.Fatalf("%v: unable to write measured data %+v: %v", b.Name(), dataItems, err) b.Fatalf("unable to write measured data %+v: %v", dataItems, err)
} }
} }
@ -626,7 +625,7 @@ func unrollWorkloadTemplate(b *testing.B, wt []op, w *workload) []op {
} }
switch concreteOp := realOp.(type) { switch concreteOp := realOp.(type) {
case *createPodSetsOp: case *createPodSetsOp:
klog.Infof("Creating %d pod sets %s", concreteOp.Count, concreteOp.CountParam) b.Logf("Creating %d pod sets %s", concreteOp.Count, concreteOp.CountParam)
for i := 0; i < concreteOp.Count; i++ { for i := 0; i < concreteOp.Count; i++ {
copy := concreteOp.CreatePodsOp copy := concreteOp.CreatePodsOp
ns := fmt.Sprintf("%s-%d", concreteOp.NamespacePrefix, i) ns := fmt.Sprintf("%s-%d", concreteOp.NamespacePrefix, i)
@ -697,7 +696,7 @@ func runWorkload(b *testing.B, tc *testCase, w *workload) []DataItem {
nextNodeIndex += concreteOp.Count nextNodeIndex += concreteOp.Count
case *createNamespacesOp: case *createNamespacesOp:
nsPreparer, err := newNamespacePreparer(concreteOp, client) nsPreparer, err := newNamespacePreparer(concreteOp, client, b)
if err != nil { if err != nil {
b.Fatalf("op %d: %v", opIndex, err) b.Fatalf("op %d: %v", opIndex, err)
} }
@ -743,7 +742,7 @@ func runWorkload(b *testing.B, tc *testCase, w *workload) []DataItem {
go collector.run(collectorCtx) go collector.run(collectorCtx)
} }
} }
if err := createPods(namespace, concreteOp, client); err != nil { if err := createPods(b, namespace, concreteOp, client); err != nil {
b.Fatalf("op %d: %v", opIndex, err) b.Fatalf("op %d: %v", opIndex, err)
} }
if concreteOp.SkipWaitToCompletion { if concreteOp.SkipWaitToCompletion {
@ -755,7 +754,7 @@ func runWorkload(b *testing.B, tc *testCase, w *workload) []DataItem {
numPodsScheduledPerNamespace[namespace] = concreteOp.Count numPodsScheduledPerNamespace[namespace] = concreteOp.Count
} }
} else { } else {
if err := waitUntilPodsScheduledInNamespace(ctx, podInformer, b.Name(), namespace, concreteOp.Count); err != nil { if err := waitUntilPodsScheduledInNamespace(ctx, b, podInformer, namespace, concreteOp.Count); err != nil {
b.Fatalf("op %d: error in waiting for pods to get scheduled: %v", opIndex, err) b.Fatalf("op %d: error in waiting for pods to get scheduled: %v", opIndex, err)
} }
} }
@ -882,7 +881,7 @@ func runWorkload(b *testing.B, tc *testCase, w *workload) []DataItem {
b.Fatalf("op %d: unknown namespace %s", opIndex, namespace) b.Fatalf("op %d: unknown namespace %s", opIndex, namespace)
} }
} }
if err := waitUntilPodsScheduled(ctx, podInformer, b.Name(), concreteOp.Namespaces, numPodsScheduledPerNamespace); err != nil { if err := waitUntilPodsScheduled(ctx, b, podInformer, concreteOp.Namespaces, numPodsScheduledPerNamespace); err != nil {
b.Fatalf("op %d: %v", opIndex, err) b.Fatalf("op %d: %v", opIndex, err)
} }
// At the end of the barrier, we can be sure that there are no pods // At the end of the barrier, we can be sure that there are no pods
@ -959,12 +958,12 @@ func getNodePreparer(prefix string, cno *createNodesOp, clientset clientset.Inte
), nil ), nil
} }
func createPods(namespace string, cpo *createPodsOp, clientset clientset.Interface) error { func createPods(b *testing.B, namespace string, cpo *createPodsOp, clientset clientset.Interface) error {
strategy, err := getPodStrategy(cpo) strategy, err := getPodStrategy(cpo)
if err != nil { if err != nil {
return err return err
} }
klog.Infof("Creating %d pods in namespace %q", cpo.Count, namespace) b.Logf("creating %d pods in namespace %q", cpo.Count, namespace)
config := testutils.NewTestPodCreatorConfig() config := testutils.NewTestPodCreatorConfig()
config.AddStrategy(namespace, cpo.Count, strategy) config.AddStrategy(namespace, cpo.Count, strategy)
podCreator := testutils.NewTestPodCreator(clientset, config) podCreator := testutils.NewTestPodCreator(clientset, config)
@ -974,7 +973,7 @@ func createPods(namespace string, cpo *createPodsOp, clientset clientset.Interfa
// waitUntilPodsScheduledInNamespace blocks until all pods in the given // waitUntilPodsScheduledInNamespace blocks until all pods in the given
// namespace are scheduled. Times out after 10 minutes because even at the // namespace are scheduled. Times out after 10 minutes because even at the
// lowest observed QPS of ~10 pods/sec, a 5000-node test should complete. // lowest observed QPS of ~10 pods/sec, a 5000-node test should complete.
func waitUntilPodsScheduledInNamespace(ctx context.Context, podInformer coreinformers.PodInformer, name string, namespace string, wantCount int) error { func waitUntilPodsScheduledInNamespace(ctx context.Context, b *testing.B, podInformer coreinformers.PodInformer, namespace string, wantCount int) error {
return wait.PollImmediate(1*time.Second, 10*time.Minute, func() (bool, error) { return wait.PollImmediate(1*time.Second, 10*time.Minute, func() (bool, error) {
select { select {
case <-ctx.Done(): case <-ctx.Done():
@ -988,14 +987,14 @@ func waitUntilPodsScheduledInNamespace(ctx context.Context, podInformer coreinfo
if len(scheduled) >= wantCount { if len(scheduled) >= wantCount {
return true, nil return true, nil
} }
klog.Infof("%s: namespace %s, pods: want %d, got %d", name, namespace, wantCount, len(scheduled)) b.Logf("namespace: %s, pods: want %d, got %d", namespace, wantCount, len(scheduled))
return false, nil return false, nil
}) })
} }
// waitUntilPodsScheduled blocks until the all pods in the given namespaces are // waitUntilPodsScheduled blocks until the all pods in the given namespaces are
// scheduled. // scheduled.
func waitUntilPodsScheduled(ctx context.Context, podInformer coreinformers.PodInformer, name string, namespaces []string, numPodsScheduledPerNamespace map[string]int) error { func waitUntilPodsScheduled(ctx context.Context, b *testing.B, podInformer coreinformers.PodInformer, namespaces []string, numPodsScheduledPerNamespace map[string]int) error {
// If unspecified, default to all known namespaces. // If unspecified, default to all known namespaces.
if len(namespaces) == 0 { if len(namespaces) == 0 {
for namespace := range numPodsScheduledPerNamespace { for namespace := range numPodsScheduledPerNamespace {
@ -1012,7 +1011,7 @@ func waitUntilPodsScheduled(ctx context.Context, podInformer coreinformers.PodIn
if !ok { if !ok {
return fmt.Errorf("unknown namespace %s", namespace) return fmt.Errorf("unknown namespace %s", namespace)
} }
if err := waitUntilPodsScheduledInNamespace(ctx, podInformer, name, namespace, wantCount); err != nil { if err := waitUntilPodsScheduledInNamespace(ctx, b, podInformer, namespace, wantCount); err != nil {
return fmt.Errorf("error waiting for pods in namespace %q: %w", namespace, err) return fmt.Errorf("error waiting for pods in namespace %q: %w", namespace, err)
} }
} }
@ -1166,9 +1165,10 @@ type namespacePreparer struct {
count int count int
prefix string prefix string
spec *v1.Namespace spec *v1.Namespace
t testing.TB
} }
func newNamespacePreparer(cno *createNamespacesOp, clientset clientset.Interface) (*namespacePreparer, error) { func newNamespacePreparer(cno *createNamespacesOp, clientset clientset.Interface, b *testing.B) (*namespacePreparer, error) {
ns := &v1.Namespace{} ns := &v1.Namespace{}
if cno.NamespaceTemplatePath != nil { if cno.NamespaceTemplatePath != nil {
if err := getSpecFromFile(cno.NamespaceTemplatePath, ns); err != nil { if err := getSpecFromFile(cno.NamespaceTemplatePath, ns); err != nil {
@ -1181,6 +1181,7 @@ func newNamespacePreparer(cno *createNamespacesOp, clientset clientset.Interface
count: cno.Count, count: cno.Count,
prefix: cno.Prefix, prefix: cno.Prefix,
spec: ns, spec: ns,
t: b,
}, nil }, nil
} }
@ -1199,7 +1200,7 @@ func (p *namespacePreparer) prepare() error {
if p.spec != nil { if p.spec != nil {
base = p.spec base = p.spec
} }
klog.Infof("Making %d namespaces with prefix %q and template %v", p.count, p.prefix, *base) p.t.Logf("Making %d namespaces with prefix %q and template %v", p.count, p.prefix, *base)
for i := 0; i < p.count; i++ { for i := 0; i < p.count; i++ {
n := base.DeepCopy() n := base.DeepCopy()
n.Name = fmt.Sprintf("%s-%d", p.prefix, i) n.Name = fmt.Sprintf("%s-%d", p.prefix, i)
@ -1219,7 +1220,7 @@ func (p *namespacePreparer) cleanup() error {
for i := 0; i < p.count; i++ { for i := 0; i < p.count; i++ {
n := fmt.Sprintf("%s-%d", p.prefix, i) n := fmt.Sprintf("%s-%d", p.prefix, i)
if err := p.client.CoreV1().Namespaces().Delete(context.Background(), n, metav1.DeleteOptions{}); err != nil { if err := p.client.CoreV1().Namespaces().Delete(context.Background(), n, metav1.DeleteOptions{}); err != nil {
klog.Errorf("Deleting Namespace: %v", err) p.t.Errorf("Deleting Namespace: %v", err)
errRet = err errRet = err
} }
} }

2
test/integration/scheduler_perf/util.go
View File

@ -97,7 +97,7 @@ func mustSetupScheduler(b *testing.B, config *config.KubeSchedulerConfiguration)
var err error var err error
config, err = newDefaultComponentConfig() config, err = newDefaultComponentConfig()
if err != nil { if err != nil {
klog.Fatalf("Error creating default component config: %v", err) b.Fatalf("Error creating default component config: %v", err)
} }
} }