From d70b346623195d27d3ee23794a8046d4ecaf0b5f Mon Sep 17 00:00:00 2001 From: hagen1778 Date: Tue, 29 Aug 2023 10:04:57 +0200 Subject: [PATCH] lib/promscrape: follow-up after eabcfc9bcddac37725c61f25b7e0dd35fa27212e `-promscrape.cluster.membersCount` by default should be `1`, like every single vmagent is a cluster of one member on its own. The change additionally validates that user can't set `-promscrape.cluster.membersCount` to value lower than `1`. https://github.com/VictoriaMetrics/VictoriaMetrics/commit/eabcfc9bcddac37725c61f25b7e0dd35fa27212e Signed-off-by: hagen1778 --- lib/promscrape/config.go | 5 ++++- lib/promscrape/config_test.go | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/promscrape/config.go b/lib/promscrape/config.go index 5d85e489c7..9506beadf6 100644 --- a/lib/promscrape/config.go +++ b/lib/promscrape/config.go @@ -83,7 +83,10 @@ func mustInitClusterMemberID() { if err != nil { logger.Fatalf("cannot parse -promscrape.cluster.memberNum=%q: %s", *clusterMemberNum, err) } - if n < 0 || (*clusterMembersCount != 0 && n >= *clusterMembersCount) { + if *clusterMembersCount < 1 { + logger.Fatalf("-promscrape.cluster.membersCount can't be lower than 1: got %d", *clusterMembersCount) + } + if n < 0 || n >= *clusterMembersCount { logger.Fatalf("-promscrape.cluster.memberNum must be in the range [0..%d] according to -promscrape.cluster.membersCount=%d", *clusterMembersCount, *clusterMembersCount) } diff --git a/lib/promscrape/config_test.go b/lib/promscrape/config_test.go index 7fe042b5f8..6548c48491 100644 --- a/lib/promscrape/config_test.go +++ b/lib/promscrape/config_test.go @@ -123,6 +123,7 @@ func TestNeedSkipScrapeWork(t *testing.T) { } // Disabled clustering f("foo", 0, 0, 0, false) + f("foo", 0, 0, 1, false) // A cluster with 2 nodes with disabled replication f("foo", 2, 0, 0, true)