Intialise ProbeContext

Signed-off-by: nagesh bansal <[email protected]>
litmuschaos · Dec 14, 2023 · c230223 · c230223
1 parent 2bce589
commit c230223
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 40 deletions.
diff --git a/pkg/probe/cmdprobe.go b/pkg/probe/cmdprobe.go
@@ -334,22 +334,29 @@ func triggerInlineContinuousCmdProbe(probe v1alpha1.ProbeAttributes, clients cli
 	// it marked the error for the probes, if any
 loop:
 	for {
-		err := triggerInlineCmdProbe(probe, chaosresult)
-		// record the error inside the probeDetails, we are maintaining a dedicated variable for the err, inside probeDetails
-		if err != nil {
-			err = addProbePhase(err, string(chaosDetails.Phase))
-			for index := range chaosresult.ProbeDetails {
-				if chaosresult.ProbeDetails[index].Name == probe.Name {
-					chaosresult.ProbeDetails[index].IsProbeFailedWithError = err
-					chaosresult.ProbeDetails[index].Status.Description = getDescription(err)
-					log.Errorf("The %v cmd probe has been Failed, err: %v", probe.Name, err)
-					isExperimentFailed = true
-					break loop
+		select {
+
+		case <-chaosDetails.ProbeContext.Ctx.Done():
+			log.Info("Chaos Execution completed. Stopping Probes")
+			break loop
+		default:
+			err := triggerInlineCmdProbe(probe, chaosresult)
+			// record the error inside the probeDetails, we are maintaining a dedicated variable for the err, inside probeDetails
+			if err != nil {
+				err = addProbePhase(err, string(chaosDetails.Phase))
+				for index := range chaosresult.ProbeDetails {
+					if chaosresult.ProbeDetails[index].Name == probe.Name {
+						chaosresult.ProbeDetails[index].IsProbeFailedWithError = err
+						chaosresult.ProbeDetails[index].Status.Description = getDescription(err)
+						log.Errorf("The %v cmd probe has been Failed, err: %v", probe.Name, err)
+						isExperimentFailed = true
+						break loop
+					}
 				}
 			}
+			// waiting for the probe polling interval
+			time.Sleep(probeTimeout.ProbePollingInterval)
 		}
-		// waiting for the probe polling interval
-		time.Sleep(probeTimeout.ProbePollingInterval)
 	}
 	// if experiment fails and stopOnfailure is provided as true then it will patch the chaosengine for abort
 	// if experiment fails but stopOnfailure is provided as false then it will continue the execution

diff --git a/pkg/probe/httpprobe.go b/pkg/probe/httpprobe.go
@@ -228,7 +228,7 @@ loop:
 		select {
 		case <-chaosDetails.ProbeContext.Ctx.Done():
 			log.Info("Chaos Execution completed. Stopping Probes")
-			break
+			break loop
 		default:
 			err = triggerHTTPProbe(probe, chaosresult)
 			// record the error inside the probeDetails, we are maintaining a dedicated variable for the err, inside probeDetails

diff --git a/pkg/probe/k8sprobe.go b/pkg/probe/k8sprobe.go
@@ -138,22 +138,29 @@ func triggerContinuousK8sProbe(probe v1alpha1.ProbeAttributes, clients clients.C
 	// marked the error for the probes, if any
 loop:
 	for {
-		err = triggerK8sProbe(probe, clients, chaosresult)
-		// record the error inside the probeDetails, we are maintaining a dedicated variable for the err, inside probeDetails
-		if err != nil {
-			err = addProbePhase(err, string(chaosDetails.Phase))
-			for index := range chaosresult.ProbeDetails {
-				if chaosresult.ProbeDetails[index].Name == probe.Name {
-					chaosresult.ProbeDetails[index].IsProbeFailedWithError = err
-					chaosresult.ProbeDetails[index].Status.Description = getDescription(err)
-					log.Errorf("the %v k8s probe has been Failed, err: %v", probe.Name, err)
-					isExperimentFailed = true
-					break loop
+		select {
+		case <-chaosDetails.ProbeContext.Ctx.Done():
+			log.Info("Chaos Execution completed. Stopping Probes")
+			break loop
+
+		default:
+			err = triggerK8sProbe(probe, clients, chaosresult)
+			// record the error inside the probeDetails, we are maintaining a dedicated variable for the err, inside probeDetails
+			if err != nil {
+				err = addProbePhase(err, string(chaosDetails.Phase))
+				for index := range chaosresult.ProbeDetails {
+					if chaosresult.ProbeDetails[index].Name == probe.Name {
+						chaosresult.ProbeDetails[index].IsProbeFailedWithError = err
+						chaosresult.ProbeDetails[index].Status.Description = getDescription(err)
+						log.Errorf("the %v k8s probe has been Failed, err: %v", probe.Name, err)
+						isExperimentFailed = true
+						break loop
+					}
 				}
 			}
+			// waiting for the probe polling interval
+			time.Sleep(probeTimeout.ProbePollingInterval)
 		}
-		// waiting for the probe polling interval
-		time.Sleep(probeTimeout.ProbePollingInterval)
 	}
 	// if experiment fails and stopOnfailure is provided as true then it will patch the chaosengine for abort
 	// if experiment fails but stopOnfailure is provided as false then it will continue the execution

diff --git a/pkg/probe/promProbe.go b/pkg/probe/promProbe.go
@@ -244,22 +244,28 @@ func triggerContinuousPromProbe(probe v1alpha1.ProbeAttributes, clients clients.
 	// it marked the error for the probes, if any
 loop:
 	for {
-		err = triggerPromProbe(probe, chaosresult)
-		// record the error inside the probeDetails, we are maintaining a dedicated variable for the err, inside probeDetails
-		if err != nil {
-			err = addProbePhase(err, string(chaosDetails.Phase))
-			for index := range chaosresult.ProbeDetails {
-				if chaosresult.ProbeDetails[index].Name == probe.Name {
-					chaosresult.ProbeDetails[index].IsProbeFailedWithError = err
-					chaosresult.ProbeDetails[index].Status.Description = getDescription(err)
-					log.Errorf("The %v prom probe has been Failed, err: %v", probe.Name, err)
-					isExperimentFailed = true
-					break loop
+		select {
+		case <-chaosDetails.ProbeContext.Ctx.Done():
+			log.Info("Chaos Execution completed. Stopping Probes")
+			break loop
+		default:
+			err = triggerPromProbe(probe, chaosresult)
+			// record the error inside the probeDetails, we are maintaining a dedicated variable for the err, inside probeDetails
+			if err != nil {
+				err = addProbePhase(err, string(chaosDetails.Phase))
+				for index := range chaosresult.ProbeDetails {
+					if chaosresult.ProbeDetails[index].Name == probe.Name {
+						chaosresult.ProbeDetails[index].IsProbeFailedWithError = err
+						chaosresult.ProbeDetails[index].Status.Description = getDescription(err)
+						log.Errorf("The %v prom probe has been Failed, err: %v", probe.Name, err)
+						isExperimentFailed = true
+						break loop
+					}
 				}
 			}
+			// waiting for the probe polling interval
+			time.Sleep(probeTimeout.ProbePollingInterval)
 		}
-		// waiting for the probe polling interval
-		time.Sleep(probeTimeout.ProbePollingInterval)
 	}
 	// if experiment fails and stopOnfailure is provided as true then it will patch the chaosengine for abort
 	// if experiment fails but stopOnfailure is provided as false then it will continue the execution

diff --git a/pkg/types/types.go b/pkg/types/types.go
@@ -217,6 +217,7 @@ func InitialiseChaosVariables(chaosDetails *ChaosDetails) {
 	chaosDetails.ParentsResources = []ParentResource{}
 	chaosDetails.Targets = []v1alpha1.TargetDetails{}
 	chaosDetails.Phase = PreChaosPhase
+	chaosDetails.ProbeContext.Ctx, chaosDetails.ProbeContext.CancelFunc = context.WithCancel(context.Background())
 }
 
 // SetResultAttributes initialise all the chaos result ENV