Revert "feat: replace fmt.Sprintf with net.JoinHostPort" (#2649)

Revert "feat: replace fmt.Sprintf with net.JoinHostPort (#2642)"

This reverts commit a6863f9b19.

client/config/deprecated.go

@@ -19,13 +19,12 @@ package config
 import (
 	"errors"
 	"fmt"
-	"net"
 	"strings"
 )
 
 var DefaultSupernodesValue = &SupernodesValue{
 	Nodes: []string{
-		net.JoinHostPort(DefaultSchedulerIP, fmt.Sprint(DefaultSchedulerPort)),
+		fmt.Sprintf("%s:%d", DefaultSchedulerIP, DefaultSchedulerPort),
 	},
 }
 
@@ -55,7 +54,7 @@ func (sv *SupernodesValue) Set(value string) error {
 			return errors.New("invalid nodes")
 		}
 		if len(vv) == 1 {
-			node = net.JoinHostPort(node, fmt.Sprint(DefaultSchedulerPort))
+			node = fmt.Sprintf("%s:%d", node, DefaultSchedulerPort)
 		}
 		sv.Nodes = append(sv.Nodes, node)
 	}

client/config/dynconfig_manager.go

@@ -104,12 +104,12 @@ func (d *dynconfigManager) GetResolveSchedulerAddrs() ([]resolver.Address, error
 		var addr string
 		if ip, ok := ip.FormatIP(scheduler.GetIp()); ok {
 			// Check health with ip address.
-			target := net.JoinHostPort(ip, fmt.Sprint(scheduler.GetPort()))
+			target := fmt.Sprintf("%s:%d", ip, scheduler.GetPort())
 			if err := healthclient.Check(context.Background(), target, dialOptions...); err != nil {
 				logger.Warnf("scheduler ip address %s is unreachable: %s", addr, err.Error())
 
 				// Check health with host address.
-				target = net.JoinHostPort(scheduler.GetHostname(), fmt.Sprint(scheduler.GetPort()))
+				target = fmt.Sprintf("%s:%d", scheduler.GetHostname(), scheduler.GetPort())
 				if err := healthclient.Check(context.Background(), target, dialOptions...); err != nil {
 					logger.Warnf("scheduler host address %s is unreachable: %s", addr, err.Error())
 				} else {

client/config/flags.go

@@ -19,7 +19,6 @@ package config
 import (
 	"errors"
 	"fmt"
-	"net"
 	"strconv"
 	"strings"
 	"time"
@@ -60,7 +59,7 @@ func (nv *NetAddrsValue) Set(value string) error {
 		return errors.New("invalid net address")
 	}
 	if len(vv) == 1 {
-		value = net.JoinHostPort(value, fmt.Sprint(DefaultSchedulerPort))
+		value = fmt.Sprintf("%s:%d", value, DefaultSchedulerPort)
 	}
 
 	if !nv.isSet && len(*nv.n) > 0 {

client/daemon/objectstorage/objectstorage.go

@@ -656,7 +656,7 @@ func (o *objectStorage) importObjectToSeedPeers(ctx context.Context, bucketName,
 	for _, scheduler := range schedulers {
 		for _, seedPeer := range scheduler.SeedPeers {
 			if o.config.Host.AdvertiseIP.String() != seedPeer.Ip && seedPeer.ObjectStoragePort > 0 {
-				seedPeerHosts = append(seedPeerHosts, net.JoinHostPort(seedPeer.Ip, fmt.Sprint(seedPeer.ObjectStoragePort)))
+				seedPeerHosts = append(seedPeerHosts, fmt.Sprintf("%s:%d", seedPeer.Ip, seedPeer.ObjectStoragePort))
 			}
 		}
 	}

client/daemon/peer/peertask_manager.go

@@ -23,7 +23,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"net"
 	"sync"
 
 	"github.com/go-http-utils/headers"
@@ -487,7 +486,7 @@ func (ptm *peerTaskManager) AnnouncePeerTask(ctx context.Context, meta storage.P
 	if err != nil {
 		return err
 	}
-	piecePacket.DstAddr = net.JoinHostPort(ptm.PeerHost.Ip, fmt.Sprint(ptm.PeerHost.DownPort))
+	piecePacket.DstAddr = fmt.Sprintf("%s:%d", ptm.PeerHost.Ip, ptm.PeerHost.DownPort)
 
 	// Announce peer task to scheduler
 	if err := ptm.SchedulerClient.AnnounceTask(ctx, &schedulerv1.AnnounceTaskRequest{

client/daemon/peer/peertask_piecetask_synchronizer.go

@@ -21,7 +21,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"net"
 	"sync"
 	"time"
 
@@ -259,7 +258,7 @@ func (s *pieceTaskSynchronizer) start(request *commonv1.PieceTaskRequest, dstPee
 
 	netAddr := &dfnet.NetAddr{
 		Type: dfnet.TCP,
-		Addr: net.JoinHostPort(formatIP, fmt.Sprint(dstPeer.RpcPort)),
+		Addr: fmt.Sprintf("%s:%d", formatIP, dstPeer.RpcPort),
 	}
 
 	credentialOpt := grpc.WithTransportCredentials(s.peerTaskConductor.GRPCCredentials)

client/daemon/proxy/proxy_sni.go

@@ -112,7 +112,7 @@ func (proxy *Proxy) handleTLSConn(clientConn net.Conn, port int) {
 			req.URL.Scheme = schemaHTTPS
 			req.URL.Host = serverName
 			if port != portHTTPS {
-				req.URL.Host = net.JoinHostPort(serverName, fmt.Sprint(port))
+				req.URL.Host = fmt.Sprintf("%s:%d", serverName, port)
 			}
 			if proxy.dumpHTTPContent {
 				if out, e := httputil.DumpRequest(req, false); e == nil {

client/daemon/rpcserver/rpcserver.go

@@ -131,7 +131,7 @@ func (s *server) ServeDownload(listener net.Listener) error {
 }
 
 func (s *server) ServePeer(listener net.Listener) error {
-	s.uploadAddr = net.JoinHostPort(s.peerHost.Ip, fmt.Sprint(s.peerHost.DownPort))
+	s.uploadAddr = fmt.Sprintf("%s:%d", s.peerHost.Ip, s.peerHost.DownPort)
 	return s.peerServer.Serve(listener)
 }
 

manager/config/config.go

@@ -672,7 +672,7 @@ func (cfg *Config) Validate() error {
 func (cfg *Config) Convert() error {
 	// TODO Compatible with deprecated fields host and port.
 	if len(cfg.Database.Redis.Addrs) == 0 && cfg.Database.Redis.Host != "" && cfg.Database.Redis.Port > 0 {
-		cfg.Database.Redis.Addrs = []string{net.JoinHostPort(cfg.Database.Redis.Host, fmt.Sprint(cfg.Database.Redis.Port))}
+		cfg.Database.Redis.Addrs = []string{fmt.Sprintf("%s:%d", cfg.Database.Redis.Host, cfg.Database.Redis.Port)}
 	}
 
 	if cfg.Server.GRPC.AdvertiseIP == nil {

manager/database/mysql.go

@@ -18,7 +18,6 @@ package database
 
 import (
 	"fmt"
-	"net"
 	"time"
 
 	"github.com/docker/go-connections/tlsconfig"
@@ -91,7 +90,7 @@ func formatMysqlDSN(cfg *config.MysqlConfig) (string, error) {
 	mysqlCfg := mysql.Config{
 		User:                 cfg.User,
 		Passwd:               cfg.Password,
-		Addr:                 net.JoinHostPort(cfg.Host, fmt.Sprint(cfg.Port)),
+		Addr:                 fmt.Sprintf("%s:%d", cfg.Host, cfg.Port),
 		Net:                  "tcp",
 		DBName:               cfg.DBName,
 		Loc:                  time.Local,

pkg/rpc/server_listen.go

@@ -53,7 +53,7 @@ func ListenWithPortRange(listen string, startPort, endPort int) (net.Listener, i
 
 	for port := startPort; port <= endPort; port++ {
 		logger.Debugf("start to listen port: %s:%d", ip, port)
-		listener, err := net.Listen("tcp", net.JoinHostPort(ip, fmt.Sprint(port)))
+		listener, err := net.Listen("tcp", fmt.Sprintf("%s:%d", ip, port))
 		if err == nil && listener != nil {
 			return listener, listener.Addr().(*net.TCPAddr).Port, nil
 		}

scheduler/config/config.go

@@ -653,7 +653,7 @@ func (cfg *Config) Convert() error {
 
 	// TODO Compatible with deprecated fields host and port of redis of job.
 	if len(cfg.Database.Redis.Addrs) == 0 && len(cfg.Job.Redis.Addrs) == 0 && cfg.Job.Redis.Host != "" && cfg.Job.Redis.Port > 0 {
-		cfg.Database.Redis.Addrs = []string{net.JoinHostPort(cfg.Job.Redis.Host, fmt.Sprint(cfg.Job.Redis.Port))}
+		cfg.Database.Redis.Addrs = []string{fmt.Sprintf("%s:%d", cfg.Job.Redis.Host, cfg.Job.Redis.Port)}
 	}
 
 	// TODO Compatible with deprecated fields master name of redis of job.

scheduler/config/dynconfig.go

@@ -181,7 +181,7 @@ func (d *dynconfig) GetResolveSeedPeerAddrs() ([]resolver.Address, error) {
 		var addr string
 		if ip, ok := ip.FormatIP(seedPeer.GetIp()); ok {
 			// Check health with ip address.
-			target := net.JoinHostPort(ip, fmt.Sprint(seedPeer.GetPort()))
+			target := fmt.Sprintf("%s:%d", ip, seedPeer.GetPort())
 			if err := healthclient.Check(context.Background(), target, dialOptions...); err != nil {
 				logger.Warnf("seed peer ip address %s is unreachable: %s", addr, err.Error())
 

scheduler/resource/peer.go

@@ -21,7 +21,6 @@ import (
 	"crypto/tls"
 	"fmt"
 	"io"
-	"net"
 	"net/http"
 	"net/url"
 	"regexp"
@@ -448,7 +447,7 @@ func (p *Peer) DownloadTinyFile() ([]byte, error) {
 	// Download path: ${host}:${port}/download/${taskIndex}/${taskID}?peerId=${peerID}
 	targetURL := url.URL{
 		Scheme:   p.Config.Task.DownloadTiny.Scheme,
-		Host:     net.JoinHostPort(p.Host.IP, fmt.Sprint(p.Host.DownloadPort)),
+		Host:     fmt.Sprintf("%s:%d", p.Host.IP, p.Host.DownloadPort),
 		Path:     fmt.Sprintf("download/%s/%s", p.Task.ID[:3], p.Task.ID),
 		RawQuery: fmt.Sprintf("peerId=%s", p.ID),
 	}

scheduler/resource/seed_peer_client.go

@@ -21,7 +21,6 @@ package resource
 import (
 	"context"
 	"fmt"
-	"net"
 	reflect "reflect"
 
 	"google.golang.org/grpc"
@@ -92,7 +91,7 @@ func newSeedPeerClient(dynconfig config.DynconfigInterface, hostManager HostMana
 func (sc *seedPeerClient) Addrs() []string {
 	var addrs []string
 	for _, seedPeer := range sc.data.Scheduler.SeedPeers {
-		addrs = append(addrs, net.JoinHostPort(seedPeer.Ip, fmt.Sprint(seedPeer.Port)))
+		addrs = append(addrs, fmt.Sprintf("%s:%d", seedPeer.Ip, seedPeer.Port))
 	}
 
 	return addrs
@@ -163,7 +162,7 @@ func seedPeersToNetAddrs(seedPeers []*managerv2.SeedPeer) []dfnet.NetAddr {
 	for _, seedPeer := range seedPeers {
 		netAddrs = append(netAddrs, dfnet.NetAddr{
 			Type: dfnet.TCP,
-			Addr: net.JoinHostPort(seedPeer.Ip, fmt.Sprint(seedPeer.Port)),
+			Addr: fmt.Sprintf("%s:%d", seedPeer.Ip, seedPeer.Port),
 		})
 	}
 

scheduler/scheduler.go

@@ -347,7 +347,7 @@ func (s *Server) Serve() error {
 		return errors.New("format ip failed")
 	}
 
-	listener, err := net.Listen("tcp", net.JoinHostPort(ip, fmt.Sprint(s.config.Server.Port)))
+	listener, err := net.Listen("tcp", fmt.Sprintf("%s:%d", ip, s.config.Server.Port))
 	if err != nil {
 		logger.Fatalf("net listener failed to start: %s", err.Error())
 	}

scheduler/service/service_v1.go

@@ -22,7 +22,6 @@ import (
 	"fmt"
 	"io"
 	"math"
-	"net"
 	"strings"
 	"time"
 
@@ -1016,7 +1015,7 @@ func (v *V1) registerSmallTask(ctx context.Context, peer *resource.Peer) (*sched
 		DirectPiece: &schedulerv1.RegisterResult_SinglePiece{
 			SinglePiece: &schedulerv1.SinglePiece{
 				DstPid:    candidateParent.ID,
-				DstAddr:   net.JoinHostPort(candidateParent.Host.IP, fmt.Sprint(candidateParent.Host.DownloadPort)),
+				DstAddr:   fmt.Sprintf("%s:%d", candidateParent.Host.IP, candidateParent.Host.DownloadPort),
 				PieceInfo: pieceInfo,
 			},
 		},

test/tools/stress/main.go

@@ -128,7 +128,7 @@ loop:
 }
 
 func debug() {
-	debugAddr := net.JoinHostPort(ip.IPv4.String(), fmt.Sprint(18066))
+	debugAddr := fmt.Sprintf("%s:%d", ip.IPv4.String(), 18066)
 	viewer.SetConfiguration(viewer.WithAddr(debugAddr))
 	if err := statsview.New().Start(); err != nil {
 		log.Println("stat view start failed", err)

trainer/trainer.go

@@ -126,7 +126,7 @@ func (s *Server) Serve() error {
 		return errors.New("format ip failed")
 	}
 
-	listener, err := net.Listen("tcp", net.JoinHostPort(ip, fmt.Sprint(s.config.Server.Port)))
+	listener, err := net.Listen("tcp", fmt.Sprintf("%s:%d", ip, s.config.Server.Port))
 	if err != nil {
 		logger.Fatalf("net listener failed to start: %s", err.Error())
 	}