Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion lib/util/sys/sys.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package sys

import "net"

func GetLocalIP() string {
func GetGlobalUnicastIP() string {
addrs, err := net.InterfaceAddrs()
if err == nil {
for _, address := range addrs {
Expand Down
10 changes: 8 additions & 2 deletions pkg/manager/infosync/info.go
Original file line number Diff line number Diff line change
Expand Up @@ -160,15 +160,21 @@ func (is *InfoSyncer) getTopologyInfo(cfg *config.Config) (*TopologyInfo, error)
s = ""
}
dir := path.Dir(s)
ip := sys.GetLocalIP()
_, port, err := net.SplitHostPort(cfg.Proxy.Addr)
ip, port, err := net.SplitHostPort(cfg.Proxy.Addr)
if err != nil {
return nil, errors.WithStack(err)
}
_, statusPort, err := net.SplitHostPort(cfg.API.Addr)
if err != nil {
return nil, errors.WithStack(err)
}
// reporting a non unicast IP makes no sense, try to find one
// loopback/linklocal-unicast are not global unicast IP, but are valid local unicast IP
if pip := net.ParseIP(ip); ip == "" || pip.Equal(net.IPv4bcast) || pip.IsUnspecified() || pip.IsMulticast() {
if v := sys.GetGlobalUnicastIP(); v != "" {
ip = v
}
}
return &TopologyInfo{
Version: versioninfo.TiProxyVersion,
GitHash: versioninfo.TiProxyGitHash,
Expand Down
39 changes: 39 additions & 0 deletions pkg/manager/infosync/info_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"context"
"encoding/json"
"fmt"
"net"
"net/url"
"path"
"strings"
Expand All @@ -16,6 +17,7 @@ import (
tidbinfo "github.com/pingcap/tidb/domain/infosync"
"github.com/pingcap/tiproxy/lib/config"
"github.com/pingcap/tiproxy/lib/util/logger"
"github.com/pingcap/tiproxy/lib/util/sys"
"github.com/pingcap/tiproxy/lib/util/waitgroup"
"github.com/pingcap/tiproxy/pkg/manager/cert"
"github.com/stretchr/testify/require"
Expand Down Expand Up @@ -178,6 +180,43 @@ func TestFetchTiDBTopology(t *testing.T) {
}
}

func TestGetTopology(t *testing.T) {
ts := newEtcdTestSuite(t)
t.Cleanup(ts.close)
for _, cas := range []struct {
ip string
port string
non_unicast bool
}{
{":34", "34", true},
{"0.0.0.0:34", "34", true},
{"255.255.255.255:34", "34", true},
{"239.255.255.255:34", "34", true},
{"[FF02::1:FF47]:34", "34", true},
{"127.0.0.1:34", "34", false},
{"[F02::1:FF47]:34", "34", false},
{"192.0.0.1:6049", "6049", false},
} {
is, err := ts.is.getTopologyInfo(&config.Config{
Proxy: config.ProxyServer{
Addr: cas.ip,
},
API: config.API{
Addr: cas.ip,
},
})
require.NoError(t, err)
ip, _, err := net.SplitHostPort(cas.ip)
require.NoError(t, err)
if cas.non_unicast {
ip = sys.GetGlobalUnicastIP()
}
require.Equal(t, ip, is.IP)
require.Equal(t, cas.port, is.Port)
require.Equal(t, cas.port, is.StatusPort)
}
}

// Test that fetching retries when etcd server is down until the server is up again.
func TestEtcdServerDown4Fetch(t *testing.T) {
ts := newEtcdTestSuite(t)
Expand Down