Add warmup and sampleDelay

Signed-off-by: Raul Sevilla <rsevilla@redhat.com>
rsevilla87 · May 10, 2023 · bf7adc4 · bf7adc4
1 parent 0cfa97b
commit bf7adc4
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 5 deletions.
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -8,12 +8,26 @@ import (
 
 var Cfg []Config
 
+// UnmarshalYAML implements YAML unmarshalleer to set default values in the config
+func (c *Config) UnmarshalYAML(unmarshal func(interface{}) error) error {
+	type ConfigDefaulted Config
+	defaultCfg := ConfigDefaulted{
+		Warmup: false, // Disable warmup by default
+	}
+	if err := unmarshal(&defaultCfg); err != nil {
+		return err
+	}
+	*c = Config(defaultCfg)
+	return nil
+}
+
 func Load(cfg string) error {
 	f, err := os.Open(cfg)
 	if err != nil {
 		return err
 	}
 	data := yaml.NewDecoder(f)
+	data.KnownFields(true)
 	err = data.Decode(&Cfg)
 	return err
 }
diff --git a/pkg/config/types.go b/pkg/config/types.go
@@ -13,4 +13,6 @@ type Config struct {
 	Tool           string        `yaml:"tool" json:"tool"`
 	ServerReplicas int32         `yaml:"serverReplicas" json:"serverReplicas"`
 	Tuning         string        `yaml:"tuningPatch" json:"tuningPatch"`
+	SampleDelay    time.Duration `yaml:"sampleDelay"`
+	Warmup         bool          `yaml:"warmup" json:"-"`
 }
diff --git a/pkg/runner/exec.go b/pkg/runner/exec.go
@@ -63,7 +63,6 @@ func runBenchmark(cfg config.Config, clusterMetadata ocpmetadata.ClusterMetadata
 			ClusterMetadata: clusterMetadata,
 		}
 		log.Infof("Running sample %d/%d: %v", i, cfg.Samples, cfg.Duration)
-		// TODO ingress controller warmup is needed
 		for _, pod := range clientPods {
 			wg.Add(1)
 			go exec(context.TODO(), &wg, tool, pod, &result)
@@ -72,6 +71,10 @@ func runBenchmark(cfg config.Config, clusterMetadata ocpmetadata.ClusterMetadata
 		genResultSummary(&result)
 		log.Infof("Summary: Rps=%.2f req/s avgLatency=%.2f μs P99Latency=%.2f μs", result.TotalAvgRps, result.AvgLatency, result.P99Latency)
 		benchmarkResult = append(benchmarkResult, result)
+		if cfg.SampleDelay != 0 {
+			log.Info("Sleeping for ", cfg.SampleDelay)
+			time.Sleep(cfg.SampleDelay)
+		}
 	}
 	return benchmarkResult, nil
 }

diff --git a/pkg/runner/runner.go b/pkg/runner/runner.go
@@ -72,11 +72,15 @@ func Start(uuid string, indexer *indexers.Indexer) error {
 			return err
 		}
 		if indexer != nil {
-			msg, err := (*indexer).Index(result, indexers.IndexingOpts{})
-			if err != nil {
-				return err
+			if !cfg.Warmup {
+				msg, err := (*indexer).Index(result, indexers.IndexingOpts{})
+				if err != nil {
+					return err
+				}
+				log.Info(msg)
+			} else {
+				log.Info("Warmup is enabled, skipping indexing")
 			}
-			log.Info(msg)
 		}
 	}
 	return nil