fix netdns success rate err

Signed-off-by: ii2day <ji.li@daocloud.io>
kdoctor-io · Sep 28, 2023 · 57ab077 · 57ab077
1 parent 67c6bf7
commit 57ab077
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/pkg/pluginManager/netdns/agentExecuteTask.go b/pkg/pluginManager/netdns/agentExecuteTask.go
@@ -26,8 +26,8 @@ import (
 
 func ParseSuccessCondition(successCondition *crd.NetSuccessCondition, metricResult *v1beta1.DNSMetrics) (failureReason string, err error) {
 	switch {
-	case successCondition.SuccessRate != nil && float64(metricResult.SuccessCounts)/float64(metricResult.SuccessCounts) < *(successCondition.SuccessRate):
-		failureReason = fmt.Sprintf("Success Rate %v is lower than request %v", float64(metricResult.SuccessCounts)/float64(metricResult.SuccessCounts), *(successCondition.SuccessRate))
+	case successCondition.SuccessRate != nil && float64(metricResult.SuccessCounts)/float64(metricResult.RequestCounts) < *(successCondition.SuccessRate):
+		failureReason = fmt.Sprintf("Success Rate %v is lower than request %v", float64(metricResult.SuccessCounts)/float64(metricResult.RequestCounts), *(successCondition.SuccessRate))
 	case successCondition.MeanAccessDelayInMs != nil && int64(metricResult.Latencies.Mean) > *(successCondition.MeanAccessDelayInMs):
 		failureReason = fmt.Sprintf("mean delay %v ms is bigger than request %v ms", metricResult.Latencies.Mean, *(successCondition.MeanAccessDelayInMs))
 	default:

diff --git a/test/e2e/common/tools.go b/test/e2e/common/tools.go
@@ -223,6 +223,9 @@ func CompareResult(f *frame.Framework, name, taskKind string, podIPs []string, n
 				if math.Abs(realRequestCount-expectRequestCount)/expectRequestCount > 0.1 {
 					return GetResultFromReport(r), fmt.Errorf("The error in the number of requests is greater than 0.1,real request count: %d,expect request count:%d", int(realRequestCount), int(expectRequestCount))
 				}
+				if float64(m.Metrics.SuccessCounts)/float64(m.Metrics.RequestCounts) != m.SucceedRate {
+					return GetResultFromReport(r), fmt.Errorf("succeedRate not equal")
+				}
 			}
 			// startTime
 			shcedule := pluginManager.NewSchedule(*rs.Spec.Schedule.Schedule)
@@ -272,6 +275,9 @@ func CompareResult(f *frame.Framework, name, taskKind string, podIPs []string, n
 				if math.Abs(realCount-expectCount)/expectCount > 0.1 {
 					return GetResultFromReport(r), fmt.Errorf("The error in the number of requests is greater than 0.1,real request count: %d,expect request count:%d", int(realCount), int(expectCount))
 				}
+				if float64(m.Metrics.SuccessCounts)/float64(m.Metrics.RequestCounts) != m.SucceedRate {
+					return GetResultFromReport(r), fmt.Errorf("succeedRate not equal")
+				}
 			}
 			// startTime
 			shcedule := pluginManager.NewSchedule(*rs.Spec.Schedule.Schedule)
@@ -334,6 +340,9 @@ func CompareResult(f *frame.Framework, name, taskKind string, podIPs []string, n
 				if math.Abs(realCount-expectCount)/expectCount > 0.1 {
 					return GetResultFromReport(r), fmt.Errorf("The error in the number of requests is greater than 0.1, real request count: %d,expect request count:%d ", int(realCount), int(expectCount))
 				}
+				if float64(m.Metrics.SuccessCounts)/float64(m.Metrics.RequestCounts) != m.SucceedRate {
+					return GetResultFromReport(r), fmt.Errorf("succeedRate not equal")
+				}
 			}
 			// startTime
 			shcedule := pluginManager.NewSchedule(*rs.Spec.Schedule.Schedule)