diff --git a/cluster-density.go b/cluster-density.go index 4249faeb..3ae6e258 100644 --- a/cluster-density.go +++ b/cluster-density.go @@ -66,6 +66,7 @@ func NewClusterDensity(wh *workloads.WorkloadHelper, variant string) *cobra.Comm rc = wh.Run(cmd.Name()) }, PostRun: func(cmd *cobra.Command, args []string) { + log.Info("Exiting kube-burner-ocp ", wh.Config.UUID) os.Exit(rc) }, } diff --git a/crd-scale.go b/crd-scale.go index 31adcb3c..c4a63ade 100644 --- a/crd-scale.go +++ b/crd-scale.go @@ -26,6 +26,7 @@ import ( func NewCrdScale(wh *workloads.WorkloadHelper) *cobra.Command { var iterations int var metricsProfiles []string + var rc int cmd := &cobra.Command{ Use: "crd-scale", Short: "Runs crd-scale workload", @@ -35,7 +36,11 @@ func NewCrdScale(wh *workloads.WorkloadHelper) *cobra.Command { }, Run: func(cmd *cobra.Command, args []string) { setMetrics(cmd, metricsProfiles) - wh.Run(cmd.Name()) + rc = wh.Run(cmd.Name()) + }, + PostRun: func(cmd *cobra.Command, args []string) { + log.Info("Exiting kube-burner-ocp ", wh.Config.UUID) + os.Exit(rc) }, } cmd.Flags().IntVar(&iterations, "iterations", 0, "Number of CRDs to create") diff --git a/custom-workload.go b/custom-workload.go index 3c797f24..42ff1103 100644 --- a/custom-workload.go +++ b/custom-workload.go @@ -31,6 +31,7 @@ func CustomWorkload(wh *workloads.WorkloadHelper) *cobra.Command { var churnDelay, churnDuration, podReadyThreshold time.Duration var configFile, churnDeletionStrategy string var iterations, churnPercent, churnCycles, iterationsPerNamespace, podsPerNode int + var rc int cmd := &cobra.Command{ Use: "init", Short: "Runs custom workload", @@ -67,7 +68,11 @@ func CustomWorkload(wh *workloads.WorkloadHelper) *cobra.Command { log.Fatalf("Error reading custom configuration file: %v", err.Error()) } configFileName := strings.Split(configFile, ".")[0] - wh.Run(configFileName) + rc = wh.Run(cmd.Name()) + }, + PostRun: func(cmd *cobra.Command, args []string) { + log.Info("Exiting kube-burner-ocp ", wh.Config.UUID) + os.Exit(rc) }, } cmd.Flags().StringVarP(&configFile, "config", "c", "", "Config file path or url") diff --git a/egressip.go b/egressip.go index 2011b2d5..9980c302 100644 --- a/egressip.go +++ b/egressip.go @@ -150,6 +150,7 @@ func NewEgressIP(wh *workloads.WorkloadHelper, variant string) *cobra.Command { var externalServerIP string var podReadyThreshold time.Duration var metricsProfiles []string + var rc int cmd := &cobra.Command{ Use: variant, Short: fmt.Sprintf("Runs %v workload", variant), @@ -162,7 +163,11 @@ func NewEgressIP(wh *workloads.WorkloadHelper, variant string) *cobra.Command { }, Run: func(cmd *cobra.Command, args []string) { setMetrics(cmd, metricsProfiles) - wh.Run(cmd.Name()) + rc = wh.Run(cmd.Name()) + }, + PostRun: func(cmd *cobra.Command, args []string) { + log.Info("Exiting kube-burner-ocp ", wh.Config.UUID) + os.Exit(rc) }, } cmd.Flags().DurationVar(&podReadyThreshold, "pod-ready-threshold", 2*time.Minute, "Pod ready timeout threshold") diff --git a/index.go b/index.go index cbcbaf64..c56fafc6 100644 --- a/index.go +++ b/index.go @@ -51,7 +51,7 @@ func NewIndex(metricsEndpoint *string, ocpMetaAgent *ocpmetadata.Metadata) *cobr Long: "If no other indexer is specified, local indexer is used by default", SilenceUsage: true, PostRun: func(cmd *cobra.Command, args []string) { - log.Info("👋 Exiting kube-burner ", uuid) + log.Info("Exiting kube-burner-ocp ", uuid) os.Exit(rc) }, Run: func(cmd *cobra.Command, args []string) { diff --git a/networkpolicy.go b/networkpolicy.go index d4a04886..2b09167d 100644 --- a/networkpolicy.go +++ b/networkpolicy.go @@ -30,6 +30,7 @@ func NewNetworkPolicy(wh *workloads.WorkloadHelper, variant string) *cobra.Comma var churnDelay, churnDuration time.Duration var churnDeletionStrategy string var metricsProfiles []string + var rc int cmd := &cobra.Command{ Use: variant, Short: fmt.Sprintf("Runs %v workload", variant), @@ -44,7 +45,11 @@ func NewNetworkPolicy(wh *workloads.WorkloadHelper, variant string) *cobra.Comma }, Run: func(cmd *cobra.Command, args []string) { setMetrics(cmd, metricsProfiles) - wh.Run(cmd.Name()) + rc = wh.Run(cmd.Name()) + }, + PostRun: func(cmd *cobra.Command, args []string) { + log.Info("Exiting kube-burner-ocp ", wh.Config.UUID) + os.Exit(rc) }, } cmd.Flags().IntVar(&iterations, "iterations", 0, fmt.Sprintf("%v iterations", variant)) diff --git a/node-density-cni.go b/node-density-cni.go index e1b3d057..34b76c32 100644 --- a/node-density-cni.go +++ b/node-density-cni.go @@ -33,6 +33,7 @@ func NewNodeDensityCNI(wh *workloads.WorkloadHelper) *cobra.Command { var podReadyThreshold time.Duration var iterationsPerNamespace int var metricsProfiles []string + var rc int cmd := &cobra.Command{ Use: "node-density-cni", Short: "Runs node-density-cni workload", @@ -51,7 +52,11 @@ func NewNodeDensityCNI(wh *workloads.WorkloadHelper) *cobra.Command { }, Run: func(cmd *cobra.Command, args []string) { setMetrics(cmd, metricsProfiles) - wh.Run(cmd.Name()) + rc = wh.Run(cmd.Name()) + }, + PostRun: func(cmd *cobra.Command, args []string) { + log.Info("Exiting kube-burner-ocp ", wh.Config.UUID) + os.Exit(rc) }, } cmd.Flags().DurationVar(&podReadyThreshold, "pod-ready-threshold", 1*time.Minute, "Pod ready timeout threshold") diff --git a/node-density-heavy.go b/node-density-heavy.go index 67d00139..f13a4dc4 100644 --- a/node-density-heavy.go +++ b/node-density-heavy.go @@ -32,6 +32,7 @@ func NewNodeDensityHeavy(wh *workloads.WorkloadHelper) *cobra.Command { var namespacedIterations bool var iterationsPerNamespace int var metricsProfiles []string + var rc int cmd := &cobra.Command{ Use: "node-density-heavy", Short: "Runs node-density-heavy workload", @@ -51,7 +52,11 @@ func NewNodeDensityHeavy(wh *workloads.WorkloadHelper) *cobra.Command { }, Run: func(cmd *cobra.Command, args []string) { setMetrics(cmd, metricsProfiles) - wh.Run(cmd.Name()) + rc = wh.Run(cmd.Name()) + }, + PostRun: func(cmd *cobra.Command, args []string) { + log.Info("Exiting kube-burner-ocp ", wh.Config.UUID) + os.Exit(rc) }, } cmd.Flags().DurationVar(&podReadyThreshold, "pod-ready-threshold", 2*time.Minute, "Pod ready timeout threshold") diff --git a/node-density.go b/node-density.go index 43a8112d..409fbbbb 100644 --- a/node-density.go +++ b/node-density.go @@ -31,6 +31,7 @@ func NewNodeDensity(wh *workloads.WorkloadHelper) *cobra.Command { var podReadyThreshold time.Duration var containerImage string var metricsProfiles []string + var rc int cmd := &cobra.Command{ Use: "node-density", Short: "Runs node-density workload", @@ -47,7 +48,11 @@ func NewNodeDensity(wh *workloads.WorkloadHelper) *cobra.Command { }, Run: func(cmd *cobra.Command, args []string) { setMetrics(cmd, metricsProfiles) - wh.Run(cmd.Name()) + rc = wh.Run(cmd.Name()) + }, + PostRun: func(cmd *cobra.Command, args []string) { + log.Info("Exiting kube-burner-ocp ", wh.Config.UUID) + os.Exit(rc) }, } cmd.Flags().IntVar(&podsPerNode, "pods-per-node", 245, "Pods per node") diff --git a/pvc-density.go b/pvc-density.go index 88884030..2b12c729 100644 --- a/pvc-density.go +++ b/pvc-density.go @@ -42,6 +42,7 @@ func NewPVCDensity(wh *workloads.WorkloadHelper) *cobra.Command { var storageProvisioners, metricsProfiles []string var claimSize string var containerImage string + var rc int provisioner := "aws" cmd := &cobra.Command{ @@ -65,7 +66,11 @@ func NewPVCDensity(wh *workloads.WorkloadHelper) *cobra.Command { }, Run: func(cmd *cobra.Command, args []string) { setMetrics(cmd, metricsProfiles) - wh.Run(cmd.Name()) + rc = wh.Run(cmd.Name()) + }, + PostRun: func(cmd *cobra.Command, args []string) { + log.Info("Exiting kube-burner-ocp ", wh.Config.UUID) + os.Exit(rc) }, } diff --git a/udn-density-l3-pods.go b/udn-density-l3-pods.go index 5b2a28d3..cca167e0 100644 --- a/udn-density-l3-pods.go +++ b/udn-density-l3-pods.go @@ -31,6 +31,7 @@ func NewUDNDensityL3Pods(wh *workloads.WorkloadHelper) *cobra.Command { var churnDelay, churnDuration, podReadyThreshold time.Duration var churnDeletionStrategy string var metricsProfiles []string + var rc int cmd := &cobra.Command{ Use: "udn-density-l3-pods", Short: "Runs node-density-udn workload", @@ -47,7 +48,11 @@ func NewUDNDensityL3Pods(wh *workloads.WorkloadHelper) *cobra.Command { }, Run: func(cmd *cobra.Command, args []string) { setMetrics(cmd, metricsProfiles) - wh.Run(cmd.Name()) + rc = wh.Run(cmd.Name()) + }, + PostRun: func(cmd *cobra.Command, args []string) { + log.Info("Exiting kube-burner-ocp ", wh.Config.UUID) + os.Exit(rc) }, } cmd.Flags().BoolVar(&churn, "churn", true, "Enable churning") diff --git a/web-burner.go b/web-burner.go index 6c136d29..495c40ab 100644 --- a/web-burner.go +++ b/web-burner.go @@ -30,6 +30,7 @@ func NewWebBurner(wh *workloads.WorkloadHelper, variant string) *cobra.Command { var bridge string var podReadyThreshold time.Duration var metricsProfiles []string + var rc int cmd := &cobra.Command{ Use: variant, Short: fmt.Sprintf("Runs %v workload", variant), @@ -46,7 +47,11 @@ func NewWebBurner(wh *workloads.WorkloadHelper, variant string) *cobra.Command { }, Run: func(cmd *cobra.Command, args []string) { setMetrics(cmd, metricsProfiles) - wh.Run(cmd.Name()) + rc = wh.Run(cmd.Name()) + }, + PostRun: func(cmd *cobra.Command, args []string) { + log.Info("Exiting kube-burner-ocp ", wh.Config.UUID) + os.Exit(rc) }, } cmd.Flags().DurationVar(&podReadyThreshold, "pod-ready-threshold", 2*time.Minute, "Pod ready timeout threshold") diff --git a/workers-scale.go b/workers-scale.go index c51b541b..1cec6624 100644 --- a/workers-scale.go +++ b/workers-scale.go @@ -55,7 +55,7 @@ func NewWorkersScale(metricsEndpoint *string, ocpMetaAgent *ocpmetadata.Metadata Long: "If no other indexer is specified, local indexer is used by default", SilenceUsage: true, PostRun: func(cmd *cobra.Command, args []string) { - log.Info("👋 Exiting kube-burner ", uuid) + log.Info("Exiting kube-burner-ocp ", uuid) os.Exit(rc) }, Run: func(cmd *cobra.Command, args []string) {