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

fix(ring): use net.JoinHostPort to support IPv6 addresses #3903

Merged
merged 2 commits into from
Feb 12, 2025
+44 −13
Merged

fix(ring): use net.JoinHostPort to support IPv6 addresses #3903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39a2992
fix(ring): use net.JoinHostPort to support IPv6 addresses
marcsanmi Feb 12, 2025
646e66e
update missing occurrence
marcsanmi Feb 12, 2025
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
5 changes: 3 additions & 2 deletions pkg/compactor/compactor_ring.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ package compactor

import (
"flag"
"fmt"
"net"
"strconv"
"time"

"github.com/go-kit/log"
Expand Down Expand Up @@ -64,7 +65,7 @@ func (cfg *RingConfig) ToBasicLifecyclerConfig(logger log.Logger) (ring.BasicLif

return ring.BasicLifecyclerConfig{
ID: cfg.Common.InstanceID,
Addr: fmt.Sprintf("%s:%d", instanceAddr, instancePort),
Addr: net.JoinHostPort(instanceAddr, strconv.Itoa(instancePort)),
HeartbeatPeriod: cfg.Common.HeartbeatPeriod,
HeartbeatTimeout: cfg.Common.HeartbeatTimeout,
TokensObservePeriod: cfg.ObservePeriod,
Expand Down
5 changes: 3 additions & 2 deletions pkg/distributor/distributor_ring.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package distributor

import (
"fmt"
"net"
"strconv"

"github.com/go-kit/log"
"github.com/grafana/dskit/ring"
Expand All @@ -26,7 +27,7 @@ func toBasicLifecyclerConfig(cfg util.CommonRingConfig, logger log.Logger) (ring

return ring.BasicLifecyclerConfig{
ID: cfg.InstanceID,
Addr: fmt.Sprintf("%s:%d", instanceAddr, instancePort),
Addr: net.JoinHostPort(instanceAddr, strconv.Itoa(instancePort)),
HeartbeatPeriod: cfg.HeartbeatPeriod,
HeartbeatTimeout: cfg.HeartbeatTimeout,
TokensObservePeriod: 0,
Expand Down
4 changes: 3 additions & 1 deletion pkg/experiment/metastore/discovery/kuberesolver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ package discovery

import (
"fmt"
"net"
"net/url"
"strconv"
"strings"
"sync"

Expand Down Expand Up @@ -103,7 +105,7 @@ func convertEndpoints(e kuberesolver2.Endpoints, ti targetInfo) []Server {
raftServerId := fmt.Sprintf("%s.%s.%s.svc.cluster.local.:%d", podName, ti.service, ti.namespace, port.Port)

servers = append(servers, Server{
ResolvedAddress: fmt.Sprintf("%s:%d", addr.IP, port.Port),
ResolvedAddress: net.JoinHostPort(addr.IP, strconv.Itoa(port.Port)),
Raft: raft.Server{
ID: raft.ServerID(raftServerId),
Address: raft.ServerAddress(raftServerId),
Expand Down
5 changes: 3 additions & 2 deletions pkg/scheduler/schedulerdiscovery/ring.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
package schedulerdiscovery

import (
"fmt"
"net"
"strconv"

"github.com/go-kit/log"
"github.com/grafana/dskit/kv"
Expand Down Expand Up @@ -42,7 +43,7 @@ func toBasicLifecyclerConfig(cfg util.CommonRingConfig, logger log.Logger) (ring

return ring.BasicLifecyclerConfig{
ID: cfg.InstanceID,
Addr: fmt.Sprintf("%s:%d", instanceAddr, instancePort),
Addr: net.JoinHostPort(instanceAddr, strconv.Itoa(instancePort)),
HeartbeatPeriod: cfg.HeartbeatPeriod,
HeartbeatTimeout: cfg.HeartbeatTimeout,
TokensObservePeriod: 0,
Expand Down
29 changes: 26 additions & 3 deletions pkg/scheduler/schedulerdiscovery/ring_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
package schedulerdiscovery

import (
"fmt"
"net"
"strconv"
"testing"
"time"

Expand All @@ -22,7 +23,7 @@ func TestRingConfig_DefaultConfigToBasicLifecyclerConfig(t *testing.T) {

expected := ring.BasicLifecyclerConfig{
ID: cfg.SchedulerRing.InstanceID,
Addr: fmt.Sprintf("%s:%d", cfg.SchedulerRing.InstanceAddr, cfg.SchedulerRing.InstancePort),
Addr: net.JoinHostPort(cfg.SchedulerRing.InstanceAddr, strconv.Itoa(cfg.SchedulerRing.InstancePort)),
HeartbeatPeriod: cfg.SchedulerRing.HeartbeatPeriod,
HeartbeatTimeout: cfg.SchedulerRing.HeartbeatTimeout,
TokensObservePeriod: 0,
Expand Down Expand Up @@ -50,7 +51,7 @@ func TestRingConfig_CustomConfigToBasicLifecyclerConfig(t *testing.T) {
// ring config
expected := ring.BasicLifecyclerConfig{
ID: "test",
Addr: "1.2.3.4:10",
Addr: net.JoinHostPort(cfg.SchedulerRing.InstanceAddr, strconv.Itoa(cfg.SchedulerRing.InstancePort)),
HeartbeatPeriod: 1 * time.Second,
HeartbeatTimeout: 10 * time.Second,
TokensObservePeriod: 0,
Expand All @@ -62,3 +63,25 @@ func TestRingConfig_CustomConfigToBasicLifecyclerConfig(t *testing.T) {
require.NoError(t, err)
assert.Equal(t, expected, actual)
}

func TestRingConfig_AddressFamilies(t *testing.T) {
cfg := Config{}
flagext.DefaultValues(&cfg)

t.Run("IPv4", func(t *testing.T) {
cfg.SchedulerRing.InstanceAddr = "1.2.3.4"
cfg.SchedulerRing.InstancePort = 10
actual, err := toBasicLifecyclerConfig(cfg.SchedulerRing, log.NewNopLogger())
require.NoError(t, err)
assert.Equal(t, "1.2.3.4:10", actual.Addr)
})

t.Run("IPv6", func(t *testing.T) {
cfg.SchedulerRing.InstanceAddr = "::1"
cfg.SchedulerRing.InstancePort = 10
cfg.SchedulerRing.EnableIPv6 = true
actual, err := toBasicLifecyclerConfig(cfg.SchedulerRing, log.NewNopLogger())
require.NoError(t, err)
assert.Equal(t, "[::1]:10", actual.Addr)
})
}
5 changes: 3 additions & 2 deletions pkg/storegateway/gateway_ring.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ package storegateway

import (
"flag"
"fmt"
"net"
"strconv"
"time"

"github.com/go-kit/log"
Expand Down Expand Up @@ -109,7 +110,7 @@ func (cfg *RingConfig) ToLifecyclerConfig(logger log.Logger) (ring.BasicLifecycl

return ring.BasicLifecyclerConfig{
ID: cfg.Ring.InstanceID,
Addr: fmt.Sprintf("%s:%d", instanceAddr, instancePort),
Addr: net.JoinHostPort(instanceAddr, strconv.Itoa(instancePort)),
Zone: cfg.InstanceZone,
HeartbeatPeriod: cfg.Ring.HeartbeatPeriod,
HeartbeatTimeout: cfg.Ring.HeartbeatTimeout,
Expand Down
4 changes: 3 additions & 1 deletion pkg/validation/exporter/ring.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import (
"context"
"flag"
"fmt"
"net"
"strconv"
"time"

"github.com/go-kit/log"
Expand Down Expand Up @@ -74,7 +76,7 @@ func (c *RingConfig) toBasicLifecyclerConfig(logger log.Logger) (ring.BasicLifec

return ring.BasicLifecyclerConfig{
ID: c.Ring.InstanceID,
Addr: fmt.Sprintf("%s:%d", instanceAddr, instancePort),
Addr: net.JoinHostPort(instanceAddr, strconv.Itoa(instancePort)),
HeartbeatPeriod: c.Ring.HeartbeatPeriod,
HeartbeatTimeout: c.Ring.HeartbeatTimeout,
TokensObservePeriod: 0,
Expand Down
Loading