Adds HasProbeCompleted check for onChaos

Signed-off-by: nagesh bansal <[email protected]>
litmuschaos · Dec 20, 2023 · b9f0187 · b9f0187
1 parent e35d355
commit b9f0187
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 2 deletions.
diff --git a/pkg/probe/cmdprobe.go b/pkg/probe/cmdprobe.go
@@ -387,16 +387,20 @@ func triggerInlineOnChaosCmdProbe(probe v1alpha1.ProbeAttributes, clients client
 
 	var endTime <-chan time.Time
 	timeDelay := time.Duration(duration) * time.Second
-
+	endTime = time.After(timeDelay)
 	// it trigger the inline cmd probe for the entire duration of chaos and it fails, if any err encounter
 	// it marked the error for the probes, if any
 loop:
 	for {
-		endTime = time.After(timeDelay)
 		select {
 		case <-endTime:
 			log.Infof("[Chaos]: Time is up for the %v probe", probe.Name)
 			endTime = nil
+			for index := range chaosresult.ProbeDetails {
+				if chaosresult.ProbeDetails[index].Name == probe.Name {
+					chaosresult.ProbeDetails[index].HasProbeCompleted = true
+				}
+			}
 			break loop
 		default:
 			// record the error inside the probeDetails, we are maintaining a dedicated variable for the err, inside probeDetails
@@ -449,6 +453,11 @@ loop:
 		case <-endTime:
 			log.Infof("[Chaos]: Time is up for the %v probe", probe.Name)
 			endTime = nil
+			for index := range chaosresult.ProbeDetails {
+				if chaosresult.ProbeDetails[index].Name == probe.Name {
+					chaosresult.ProbeDetails[index].HasProbeCompleted = true
+				}
+			}
 			break loop
 		default:
 			// record the error inside the probeDetails, we are maintaining a dedicated variable for the err, inside probeDetails

diff --git a/pkg/probe/httpprobe.go b/pkg/probe/httpprobe.go
@@ -381,6 +381,11 @@ loop:
 		case <-endTime:
 			log.Infof("[Chaos]: Time is up for the %v probe", probe.Name)
 			endTime = nil
+			for index := range chaosresult.ProbeDetails {
+				if chaosresult.ProbeDetails[index].Name == probe.Name {
+					chaosresult.ProbeDetails[index].HasProbeCompleted = true
+				}
+			}
 			break loop
 		default:
 			err = triggerHTTPProbe(probe, chaosresult)

diff --git a/pkg/probe/k8sprobe.go b/pkg/probe/k8sprobe.go
@@ -423,6 +423,11 @@ loop:
 		select {
 		case <-endTime:
 			log.Infof("[Chaos]: Time is up for the %v probe", probe.Name)
+			for index := range chaosresult.ProbeDetails {
+				if chaosresult.ProbeDetails[index].Name == probe.Name {
+					chaosresult.ProbeDetails[index].HasProbeCompleted = true
+				}
+			}
 			break loop
 		default:
 			err = triggerK8sProbe(probe, clients, chaosresult)

diff --git a/pkg/probe/promProbe.go b/pkg/probe/promProbe.go
@@ -306,6 +306,11 @@ loop:
 		select {
 		case <-endTime:
 			log.Infof("[Chaos]: Time is up for the %v probe", probe.Name)
+			for index := range chaosresult.ProbeDetails {
+				if chaosresult.ProbeDetails[index].Name == probe.Name {
+					chaosresult.ProbeDetails[index].HasProbeCompleted = true
+				}
+			}
 			endTime = nil
 			break loop
 		default: