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

scheduler_perf: skip expensive cleanup during benchmarks

Browse Source 
Each benchmark test case runs with a fresh etcd instance. Therefore it is not
necessary to delete objects after a run.

A future unit test might reuse etcd, therefore cleanup is optional.
This commit is contained in:
Patrick Ohly 2023-03-22 13:29:33 +01:00
parent bbc7ca94a4
commit c91c578795
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -696,7 +696,7 @@ func BenchmarkPerfScheduling(b *testing.B) {
for feature, flag := range tc.FeatureGates { for feature, flag := range tc.FeatureGates {
defer featuregatetesting.SetFeatureGateDuringTest(b, utilfeature.DefaultFeatureGate, feature, flag)() defer featuregatetesting.SetFeatureGateDuringTest(b, utilfeature.DefaultFeatureGate, feature, flag)()
} }
results := runWorkload(ctx, b, tc, w) results := runWorkload(ctx, b, tc, w, false)
dataItems.DataItems = append(dataItems.DataItems, results...) dataItems.DataItems = append(dataItems.DataItems, results...)
if len(results) > 0 { if len(results) > 0 {
@ -773,7 +773,7 @@ func unrollWorkloadTemplate(b *testing.B, wt []op, w *workload) []op {
return unrolled return unrolled
} }
func runWorkload(ctx context.Context, b *testing.B, tc *testCase, w *workload) []DataItem { func runWorkload(ctx context.Context, b *testing.B, tc *testCase, w *workload, cleanup bool) []DataItem {
start := time.Now() start := time.Now()
b.Cleanup(func() { b.Cleanup(func() {
duration := time.Now().Sub(start) duration := time.Now().Sub(start)
@ -809,13 +809,15 @@ func runWorkload(ctx context.Context, b *testing.B, tc *testCase, w *workload) [
// All namespaces listed in numPodsScheduledPerNamespace will be cleaned up. // All namespaces listed in numPodsScheduledPerNamespace will be cleaned up.
numPodsScheduledPerNamespace := make(map[string]int) numPodsScheduledPerNamespace := make(map[string]int)
b.Cleanup(func() { if cleanup {
for namespace := range numPodsScheduledPerNamespace { b.Cleanup(func() {
if err := client.CoreV1().Namespaces().Delete(ctx, namespace, metav1.DeleteOptions{}); err != nil { for namespace := range numPodsScheduledPerNamespace {
b.Errorf("Deleting Namespace in numPodsScheduledPerNamespace: %v", err) if err := client.CoreV1().Namespaces().Delete(ctx, namespace, metav1.DeleteOptions{}); err != nil {
b.Errorf("Deleting Namespace in numPodsScheduledPerNamespace: %v", err)
}
} }
} })
}) }
for opIndex, op := range unrollWorkloadTemplate(b, tc.WorkloadTemplate, w) { for opIndex, op := range unrollWorkloadTemplate(b, tc.WorkloadTemplate, w) {
realOp, err := op.realOp.patchParams(w) realOp, err := op.realOp.patchParams(w)
@ -836,11 +838,13 @@ func runWorkload(ctx context.Context, b *testing.B, tc *testCase, w *workload) [
if err := nodePreparer.PrepareNodes(ctx, nextNodeIndex); err != nil { if err := nodePreparer.PrepareNodes(ctx, nextNodeIndex); err != nil {
b.Fatalf("op %d: %v", opIndex, err) b.Fatalf("op %d: %v", opIndex, err)
} }
b.Cleanup(func() { if cleanup {
if err := nodePreparer.CleanupNodes(ctx); err != nil { b.Cleanup(func() {
b.Fatalf("failed to clean up nodes, error: %v", err) if err := nodePreparer.CleanupNodes(ctx); err != nil {
} b.Fatalf("failed to clean up nodes, error: %v", err)
}) }
})
}
nextNodeIndex += concreteOp.Count nextNodeIndex += concreteOp.Count
case *createNamespacesOp: case *createNamespacesOp: