diff --git a/pkg/mysql/mysql_http_check.go b/pkg/mysql/mysql_http_check.go index 12cd2dc..e36d50d 100644 --- a/pkg/mysql/mysql_http_check.go +++ b/pkg/mysql/mysql_http_check.go @@ -40,7 +40,6 @@ func MySQLHttpCheckHashKey(clusterName string, key *InstanceKey) string { } func CheckHttp(clusterName string, probe *Probe) (httpCheckResult *MySQLHttpCheck) { - if probe.HttpCheckPort <= 0 { go func() { metrics.GetOrRegisterCounter("httpcheck.skip", nil).Inc(1) }() return NewMySQLHttpCheck(clusterName, &probe.Key, http.StatusOK) diff --git a/pkg/throttle/throttler.go b/pkg/throttle/throttler.go index 7da7ca6..90d2b75 100644 --- a/pkg/throttle/throttler.go +++ b/pkg/throttle/throttler.go @@ -365,9 +365,10 @@ func (throttler *Throttler) refreshMySQLInventory() error { } log.Debugf("Read %+v hosts from ProxySQL %s, hostgroup id: %d (%s)", len(servers), dsn, clusterSettings.ProxySQLSettings.HostgroupID, clusterName) clusterProbes := &mysql.ClusterProbes{ - ClusterName: clusterName, - IgnoreHostsCount: clusterSettings.IgnoreHostsCount, - InstanceProbes: mysql.NewProbes(), + ClusterName: clusterName, + IgnoreHostsCount: clusterSettings.IgnoreHostsCount, + IgnoreHostsThreshold: clusterSettings.IgnoreHostsThreshold, + InstanceProbes: mysql.NewProbes(), } for _, server := range servers { key := mysql.InstanceKey{Hostname: server.Host, Port: int(server.Port)} @@ -389,9 +390,10 @@ func (throttler *Throttler) refreshMySQLInventory() error { keyspace, shard, strings.Join(vitess.ParseCells(clusterSettings.VitessSettings), ","), ) clusterProbes := &mysql.ClusterProbes{ - ClusterName: clusterName, - IgnoreHostsCount: clusterSettings.IgnoreHostsCount, - InstanceProbes: mysql.NewProbes(), + ClusterName: clusterName, + IgnoreHostsCount: clusterSettings.IgnoreHostsCount, + IgnoreHostsThreshold: clusterSettings.IgnoreHostsThreshold, + InstanceProbes: mysql.NewProbes(), } for _, tablet := range tablets { key := mysql.InstanceKey{Hostname: tablet.MysqlHostname, Port: int(tablet.MysqlPort)}