reverse flag logic and add comments

go-graphite · Jul 24, 2023 · ab8c2ce · ab8c2ce
1 parent 5fc4c79
commit ab8c2ce
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/cmd/bucky/inconsistent.go b/cmd/bucky/inconsistent.go
@@ -13,7 +13,7 @@ import (
 
 // import "github.com/go-graphite/buckytools/hashing"
 
-var inconsistentInconsistentCacheMetrics bool
+var inconsistentFilterCacheMetrics bool
 var inconsistentGoCarbonMetricsPrefix string
 
 func init() {
@@ -39,7 +39,7 @@ Use bucky rebalance to correct.`
  "Force the remote daemons to rebuild their cache.")
  c.Flag.BoolVar(&listRegexMode, "r", false,
  "Filter by a regular expression.")
- c.Flag.BoolVar(&inconsistentInconsistentCacheMetrics, "inconsistent-cache-metrics", false, "Search for go-carbon inconsistent metrics.")
+ c.Flag.BoolVar(&inconsistentFilterCacheMetrics, "filter-cache-metrics", true, "Filter go-carbon inconsistent metrics.")
  c.Flag.StringVar(&inconsistentGoCarbonMetricsPrefix, "go-carbon-prefix", "carbon.agents.", "go-carbon metric prefix")
 }
 
@@ -68,7 +68,9 @@ func InconsistentMetrics(hostports []string, regex string) (map[string][]string,
  }
 
  for _, m := range metrics {
- if !inconsistentInconsistentCacheMetrics && strings.HasPrefix(m, inconsistentGoCarbonMetricsPrefix) {
+ if inconsistentFilterCacheMetrics && strings.HasPrefix(m, inconsistentGoCarbonMetricsPrefix) {
+ // Graphite cache metrics (usually "carbon.agents.*" metrics) can be inserted into the stream
+ // after hashing has been completed (if written locally). In this case, they will never be consistent and shouldn't be.
  continue
  }
  if Cluster.Hash.GetNode(m).Server != host {

diff --git a/cmd/bucky/rebalance.go b/cmd/bucky/rebalance.go
@@ -56,7 +56,7 @@ Set -offload=true to speed up rebalance.`
  c.Flag.BoolVar(&listForce, "f", false, "Force the remote daemons to rebuild their cache.")
  c.Flag.StringVar(&rebalanceConfig.allowedDsts, "allowed-dsts", "", "Only copy/rebalance metrics to the allowed destinations (ip1:port,ip2:port). By default (i.e. empty), all dsts are allowed.")
  c.Flag.StringVar(&rebalanceConfig.allowedMetricRegex, "r", "", "Only copy/rebalance metrics matching regex. By default (i.e. empty), all metrics are allowed.")
- c.Flag.BoolVar(&inconsistentInconsistentCacheMetrics, "inconsistent-cache-metrics", false, "Search for go-carbon inconsistent metrics.")
+ c.Flag.BoolVar(&inconsistentFilterCacheMetrics, "filter-cache-metrics", true, "Filter go-carbon inconsistent metrics.")
  c.Flag.StringVar(&inconsistentGoCarbonMetricsPrefix, "go-carbon-prefix", "carbon.agents.", "go-carbon metric prefix")
 }