[probes] Return an error if interval is smaller than timeout (#560)

cloudprober · Oct 9, 2023 · e85d339 · e85d339
1 parent 5cb8096
commit e85d339
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/probes/options/options.go b/probes/options/options.go
@@ -150,6 +150,10 @@ func BuildProbeOptions(p *configpb.ProbeDef, ldLister endpoint.Lister, globalTar
 		}
 	}
 
+	if intervalDuration < timeoutDuration && p.GetType() != configpb.ProbeDef_UDP {
+		return nil, fmt.Errorf("interval (%v) cannot be smaller than timeout (%v)", intervalDuration, timeoutDuration)
+	}
+
 	if p.GetNegativeTest() && !negativeTestSupported[p.GetType()] {
 		return nil, fmt.Errorf("negative_test is not supported by %s probes", p.GetType().String())
 	}

diff --git a/probes/options/options_test.go b/probes/options/options_test.go
@@ -218,7 +218,7 @@ func TestStatsExportInterval(t *testing.T) {
 			name:         "Timeout bigger than intervalMsec",
 			intervalMsec: 10,
 			timeoutMsec:  12,
-			want:         12,
+			wantError:    true,
 		},
 		{
 			name:         "Interval and timeout less than default",