From c6f6bae0df1959cf1d2551b743d4a38ad121a8ad Mon Sep 17 00:00:00 2001 From: Maksim Fedotov Date: Thu, 12 Mar 2020 20:12:21 +0300 Subject: [PATCH] skip AddReplicaKey if it is specified in config.Config.DiscoveryIgnoreReplicaHostnameFilters --- go/inst/instance_dao.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/go/inst/instance_dao.go b/go/inst/instance_dao.go index ea7ce4fcd..3cc968e41 100644 --- a/go/inst/instance_dao.go +++ b/go/inst/instance_dao.go @@ -604,7 +604,9 @@ func ReadTopologyInstanceBufferable(instanceKey *InstanceKey, bufferWrites bool, replicaKey, err := NewResolveInstanceKey(host, port) if err == nil && replicaKey.IsValid() { - instance.AddReplicaKey(replicaKey) + if !RegexpMatchPatterns(replicaKey.StringCode(), config.Config.DiscoveryIgnoreReplicaHostnameFilters) { + instance.AddReplicaKey(replicaKey) + } foundByShowSlaveHosts = true } return err @@ -632,7 +634,9 @@ func ReadTopologyInstanceBufferable(instanceKey *InstanceKey, bufferWrites bool, logReadTopologyInstanceError(instanceKey, "ResolveHostname: processlist", resolveErr) } replicaKey := InstanceKey{Hostname: cname, Port: instance.Key.Port} - instance.AddReplicaKey(&replicaKey) + if !RegexpMatchPatterns(replicaKey.StringCode(), config.Config.DiscoveryIgnoreReplicaHostnameFilters) { + instance.AddReplicaKey(&replicaKey) + } return err })