Pod latency threshold flag for all cluster-density and node-density w…

…o… (kube-burner#487) * Pod latency threshold flag for all cluster-density and node-density workloads Signed-off-by: Raul Sevilla <[email protected]> --------- Signed-off-by: Raul Sevilla <[email protected]>
rsevilla87 · Nov 10, 2023 · b1350f8 · b1350f8
1 parent 3b168fd
commit b1350f8
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 2 deletions.
diff --git a/cmd/kube-burner/ocp-config/cluster-density-ms/cluster-density-ms.yml b/cmd/kube-burner/ocp-config/cluster-density-ms/cluster-density-ms.yml
@@ -9,6 +9,10 @@ global:
     type: {{.INDEXING_TYPE}}
   measurements:
     - name: podLatency
+      thresholds:
+        - conditionType: Ready
+          metric: P99
+          threshold: {{.POD_READY_THRESHOLD}}
 jobs:
   - name: cluster-density-ms
     namespace: cluster-density-ms

diff --git a/cmd/kube-burner/ocp-config/cluster-density-v2/cluster-density-v2.yml b/cmd/kube-burner/ocp-config/cluster-density-v2/cluster-density-v2.yml
@@ -9,6 +9,10 @@ global:
     type: {{.INDEXING_TYPE}}
   measurements:
     - name: podLatency
+      thresholds:
+        - conditionType: Ready
+          metric: P99
+          threshold: {{.POD_READY_THRESHOLD}}
 jobs:
   - name: cluster-density-v2
     namespace: cluster-density-v2

diff --git a/cmd/kube-burner/ocp-config/cluster-density/cluster-density.yml b/cmd/kube-burner/ocp-config/cluster-density/cluster-density.yml
@@ -9,6 +9,10 @@ global:
     type: {{.INDEXING_TYPE}}
   measurements:
     - name: podLatency
+      thresholds:
+        - conditionType: Ready
+          metric: P99
+          threshold: {{.POD_READY_THRESHOLD}}
 jobs:
   - name: cluster-density
     namespace: cluster-density

diff --git a/cmd/kube-burner/ocp-config/node-density-cni/node-density-cni.yml b/cmd/kube-burner/ocp-config/node-density-cni/node-density-cni.yml
@@ -9,6 +9,10 @@ global:
     type: {{.INDEXING_TYPE}}
   measurements:
     - name: podLatency
+      thresholds:
+        - conditionType: Ready
+          metric: P99
+          threshold: {{.POD_READY_THRESHOLD}}
 jobs:
   - name: node-density-cni
     namespace: node-density-cni

diff --git a/pkg/workloads/cluster-density.go b/pkg/workloads/cluster-density.go
@@ -28,6 +28,7 @@ func NewClusterDensity(wh *WorkloadHelper, variant string) *cobra.Command {
 	var iterations, churnPercent int
 	var churn bool
 	var churnDelay, churnDuration time.Duration
+	var podReadyThreshold time.Duration
 	cmd := &cobra.Command{
 		Use:   variant,
 		Short: fmt.Sprintf("Runs %v workload", variant),
@@ -41,11 +42,13 @@ func NewClusterDensity(wh *WorkloadHelper, variant string) *cobra.Command {
 			os.Setenv("CHURN_DURATION", fmt.Sprintf("%v", churnDuration))
 			os.Setenv("CHURN_DELAY", fmt.Sprintf("%v", churnDelay))
 			os.Setenv("CHURN_PERCENT", fmt.Sprint(churnPercent))
+			os.Setenv("POD_READY_THRESHOLD", fmt.Sprintf("%v", podReadyThreshold))
 		},
 		Run: func(cmd *cobra.Command, args []string) {
 			wh.run(cmd.Name(), MetricsProfileMap[cmd.Name()])
 		},
 	}
+	cmd.Flags().DurationVar(&podReadyThreshold, "pod-ready-threshold", 2*time.Minute, "Pod ready timeout threshold")
 	cmd.Flags().IntVar(&iterations, "iterations", 0, fmt.Sprintf("%v iterations", variant))
 	cmd.Flags().BoolVar(&churn, "churn", true, "Enable churning")
 	cmd.Flags().DurationVar(&churnDuration, "churn-duration", 1*time.Hour, "Churn duration")

diff --git a/pkg/workloads/index.go b/pkg/workloads/index.go
@@ -116,7 +116,7 @@ func NewIndex(metricsEndpoint *string, metadata *BenchmarkMetadata, ocpMetaAgent
 			}
 		},
 	}
-	cmd.Flags().StringVar(&metricsProfile, "metrics-profile", "metrics.yml", "Metrics profile file")
+	cmd.Flags().StringVarP(&metricsProfile, "metrics-profile", "m", "metrics.yml", "Metrics profile file")
 	cmd.Flags().StringVar(&metricsDirectory, "metrics-directory", "collected-metrics", "Directory to dump the metrics files in, when using default local indexing")
 	cmd.Flags().DurationVar(&prometheusStep, "step", 30*time.Second, "Prometheus step size")
 	cmd.Flags().Int64Var(&start, "start", time.Now().Unix()-3600, "Epoch start time")

diff --git a/pkg/workloads/node-density-cni.go b/pkg/workloads/node-density-cni.go
@@ -17,6 +17,7 @@ package workloads
 import (
 	"fmt"
 	"os"
+	"time"
 
 	log "github.com/sirupsen/logrus"
 
@@ -27,6 +28,7 @@ import (
 func NewNodeDensityCNI(wh *WorkloadHelper) *cobra.Command {
 	var podsPerNode int
 	var namespacedIterations bool
+	var podReadyThreshold time.Duration
 	var iterationsPerNamespace int
 	cmd := &cobra.Command{
 		Use:          "node-density-cni",
@@ -42,11 +44,13 @@ func NewNodeDensityCNI(wh *WorkloadHelper) *cobra.Command {
 			os.Setenv("JOB_ITERATIONS", fmt.Sprint((totalPods-podCount)/2))
 			os.Setenv("NAMESPACED_ITERATIONS", fmt.Sprint(namespacedIterations))
 			os.Setenv("ITERATIONS_PER_NAMESPACE", fmt.Sprint(iterationsPerNamespace))
+			os.Setenv("POD_READY_THRESHOLD", fmt.Sprintf("%v", podReadyThreshold))
 		},
 		Run: func(cmd *cobra.Command, args []string) {
 			wh.run(cmd.Name(), MetricsProfileMap[cmd.Name()])
 		},
 	}
+	cmd.Flags().DurationVar(&podReadyThreshold, "pod-ready-threshold", 1*time.Minute, "Pod ready timeout threshold")
 	cmd.Flags().IntVar(&podsPerNode, "pods-per-node", 245, "Pods per node")
 	cmd.Flags().BoolVar(&namespacedIterations, "namespaced-iterations", true, "Namespaced iterations")
 	cmd.Flags().IntVar(&iterationsPerNamespace, "iterations-per-namespace", 1000, "Iterations per namespace")

diff --git a/pkg/workloads/node-density-heavy.go b/pkg/workloads/node-density-heavy.go
@@ -52,7 +52,7 @@ func NewNodeDensityHeavy(wh *WorkloadHelper) *cobra.Command {
 			wh.run(cmd.Name(), MetricsProfileMap[cmd.Name()])
 		},
 	}
-	cmd.Flags().DurationVar(&podReadyThreshold, "pod-ready-threshold", 1*time.Hour, "Pod ready timeout threshold")
+	cmd.Flags().DurationVar(&podReadyThreshold, "pod-ready-threshold", 2*time.Minute, "Pod ready timeout threshold")
 	cmd.Flags().DurationVar(&probesPeriod, "probes-period", 10*time.Second, "Perf app readiness/livenes probes period")
 	cmd.Flags().IntVar(&podsPerNode, "pods-per-node", 245, "Pods per node")
 	cmd.Flags().BoolVar(&namespacedIterations, "namespaced-iterations", true, "Namespaced iterations")