Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make filter alias aware #1401

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Make filter alias aware #1401

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5c675f7
makes DiscoveryIgnoreHostnameFilters alias aware
Aug 25, 2021
8d761e8
formatted file with gofmt
Aug 25, 2021
0f8899c
Merge branch 'master' into make_filter_alias_aware
harunkucuk5 Aug 25, 2021
b872399
removed redundant import
Sep 2, 2021
61b87b5
Merge branch 'make_filter_alias_aware' of github.com:harunkucuk5/orch…
Sep 2, 2021
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
16 changes: 16 additions & 0 deletions go/logic/orchestrator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,22 @@ func DiscoverInstance(instanceKey inst.InstanceKey) {
return
}

if instance.InstanceAlias != "" &&
inst.FiltersMatchInstanceKey(&inst.InstanceKey{Hostname: instance.InstanceAlias, Port: instanceKey.Port}, config.Config.DiscoveryIgnoreHostnameFilters) {

log.Debugf("discoverInstance: skipping discovery of %+v (alias) because it matches DiscoveryIgnoreHostnameFilters", instance.InstanceAlias)

var ignoreInstanceKey = &inst.InstanceKey{Hostname: instanceKey.Hostname, Port: instanceKey.Port}

if !inst.InstanceIsForgotten(ignoreInstanceKey) {
err := inst.ForgetInstance(ignoreInstanceKey)
if err != nil {
log.Fatale(err)
}
}
return
}

// Investigate replicas and members of the same replication group:
for _, replicaKey := range append(instance.ReplicationGroupMembers.GetInstanceKeys(), instance.Replicas.GetInstanceKeys()...) {
replicaKey := replicaKey // not needed? no concurrency here?
Expand Down