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

Add net.LookipIP DNS provider implementation #208

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Add net.LookipIP DNS provider implementation #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 30 additions & 0 deletions kv/memberlist/dnsprovider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ package memberlist

import (
"context"
"net"
"sync"
)

// DNSProvider supports storing or resolving a list of addresses.
Expand All @@ -13,3 +15,31 @@ type DNSProvider interface {
// Addresses returns the latest addresses present in the DNSProvider.
Addresses() []string
}

type dnsProvider struct {
sync.Mutex
addr []string
}

func NewDNSProvider() DNSProvider { return &dnsProvider{} }

func (d *dnsProvider) Resolve(ctx context.Context, addrs []string) error {
d.Lock()
defer d.Unlock()
for _, a := range addrs {
ips, err := net.LookupIP(a)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should the context be checked for cancellation on each iteration? That seems like it'd make this more responsive.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or perhaps just once before doing any DNS lookups?

if err != nil {
return err
}
for _, ip := range ips {
d.addr = append(d.addr, ip.String())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of doing an append(d.addr) in a loop, I'd rather see a new slice of addresses constructed and then swapped at the end. That prevents cases where an error is returned and d.addr is only half updated. This would also allow you to avoid holding the lock while doing network operations. Something like:

var addrs []string
for _, a: range addrs {
    // do the lookup
    addrs = append(addrs, ip.String())
}
d.Lock()
d.addrs = addrs
d.Unlock()
return nil

}
}
return nil
}

func (d *dnsProvider) Addresses() []string {
d.Lock()
defer d.Unlock()
return d.addr
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you need to make a copy of this otherwise the underlying storage of the slice can still be modified after the caller starts using it (I could be wrong, we do run tests with -race but this code feels like a race condition).

}
28 changes: 28 additions & 0 deletions kv/memberlist/dnsprovider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package memberlist

import (
"context"
"testing"
)

func TestDNSProvider(t *testing.T) {
dns := &dnsProvider{}
if err := dns.Resolve(context.Background(), []string{"localhost"}); err != nil {
t.Fatal(err)
}
has127_0_0_1 := false
for _, addr := range dns.Addresses() {
if addr == "127.0.0.1" {
has127_0_0_1 = true
}
}
if !has127_0_0_1 {
t.Error("resolving localhost must result in 127.0.0.1 address", dns.Addresses())
}
if err := dns.Resolve(context.Background(), []string{"invalid dns"}); err == nil {
t.Error("resolving and invalid address must result in an error")
}
if len(dns.Addresses()) == 0 {
t.Error("DNSProvider must keep recent addresses on failure")
}
}