Skip to content
This repository has been archived by the owner on Sep 30, 2024. It is now read-only.

skip AddReplicaKey if it is specified in config.Config.DiscoveryIgnoreReplicaHostnameFilters #1096

Merged
merged 5 commits into from
Apr 28, 2020
Merged

skip AddReplicaKey if it is specified in config.Config.DiscoveryIgnoreReplicaHostnameFilters #1096

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c6f6bae
skip AddReplicaKey if it is specified in config.Config.DiscoveryIgnor…
Mar 12, 2020
c741c99
Merge branch 'master' into skip_adding_replicas
shlomi-noach Apr 3, 2020
8a69de2
Merge branch 'master' into skip_adding_replicas
shlomi-noach Apr 5, 2020
e4356a1
Merge branch 'master' into skip_adding_replicas
shlomi-noach Apr 28, 2020
470852c
Merge branch 'master' into skip_adding_replicas
shlomi-noach Apr 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions go/inst/instance_dao.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
})

Expand Down