YAMLSelector bugfix for Knative RPS

Signed-off-by: Lazar Cvetković <l.cvetkovic.997@gmail.com>

Author: cvetkovic

cmd/loader.go

@@ -207,7 +207,6 @@ func runTraceMode(cfg *config.LoaderConfiguration, readIATFromFile bool, writeIA
 		TraceGranularity: parseTraceGranularity(cfg),
 		TraceDuration:    durationToParse,
 
-		YAMLPath: yamlPath,
 		TestMode: false,
 
 		Functions: functions,
@@ -218,7 +217,7 @@ func runTraceMode(cfg *config.LoaderConfiguration, readIATFromFile bool, writeIA
 		return
 	}
 
-	log.Infof("Using %s as a service YAML specification file.\n", experimentDriver.Configuration.YAMLPath)
+	log.Infof("Using %s as a service YAML specification file.\n", yamlPath)
 
 	experimentDriver.GenerateSpecification()
 	experimentDriver.ReadOrWriteFileSpecification(writeIATsToFile, readIATFromFile)
@@ -227,6 +226,7 @@ func runTraceMode(cfg *config.LoaderConfiguration, readIATFromFile bool, writeIA
 
 func runRPSMode(cfg *config.LoaderConfiguration, readIATFromFile bool, writeIATsToFile bool) {
 	experimentDuration := determineDurationToParse(cfg.ExperimentDuration, cfg.WarmupDuration)
+	yamlPath := parseYAMLSpecification(cfg)
 
 	rpsTarget := cfg.RpsTarget
 	coldStartPercentage := cfg.RpsColdStartRatioPercentage
@@ -246,9 +246,7 @@ func runRPSMode(cfg *config.LoaderConfiguration, readIATFromFile bool, writeIATs
 
 		DirigentConfiguration: dirigentConfig,
 
-		YAMLPath: parseYAMLSpecification(cfg),
-
-		Functions: generator.CreateRPSFunctions(cfg, dirigentConfig, warmFunction, warmStartCount, coldFunctions, coldStartCount),
+		Functions: generator.CreateRPSFunctions(cfg, dirigentConfig, warmFunction, warmStartCount, coldFunctions, coldStartCount, yamlPath),
 	})
 
 	// Skip experiments execution during dry run mode

pkg/config/configuration.go

@@ -15,7 +15,6 @@ type Configuration struct {
 	// TraceDuration In minutes.
 	TraceDuration int
 
-	YAMLPath string
 	TestMode bool
 
 	Functions []*common.Function

pkg/generator/rps.go

@@ -106,7 +106,7 @@ func GenerateColdStartFunctions(experimentDuration int, rpsTarget float64, coold
 }
 
 func CreateRPSFunctions(cfg *config.LoaderConfiguration, dcfg *config.DirigentConfig, warmFunction common.IATArray, warmFunctionCount []int,
-	coldFunctions []common.IATArray, coldFunctionCount [][]int) []*common.Function {
+	coldFunctions []common.IATArray, coldFunctionCount [][]int, yamlPath string) []*common.Function {
 	var result []*common.Function
 
 	busyLoopFor := ComputeBusyLoopPeriod(cfg.RpsMemoryMB)
@@ -139,6 +139,7 @@ func CreateRPSFunctions(cfg *config.LoaderConfiguration, dcfg *config.DirigentCo
 				RuntimeSpecification: createRuntimeSpecification(len(warmFunction), cfg.RpsRuntimeMs, cfg.RpsMemoryMB),
 			},
 
+			YAMLPath:            yamlPath,
 			ColdStartBusyLoopMs: busyLoopFor,
 		})
 	}
@@ -170,6 +171,7 @@ func CreateRPSFunctions(cfg *config.LoaderConfiguration, dcfg *config.DirigentCo
 				RuntimeSpecification: createRuntimeSpecification(len(coldFunctions[i]), cfg.RpsRuntimeMs, cfg.RpsMemoryMB),
 			},
 
+			YAMLPath:            yamlPath,
 			ColdStartBusyLoopMs: busyLoopFor,
 		})
 	}