cherry pick #35881 to release-6.1

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
pingcap · Jul 5, 2022 · a1fecea · a1fecea
1 parent 40f19cb
commit a1fecea
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/br/pkg/lightning/common/util.go b/br/pkg/lightning/common/util.go
@@ -21,9 +21,11 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"net"
 	"net/http"
 	"net/url"
 	"os"
+	"strconv"
 	"strings"
 	"syscall"
 	"time"
@@ -57,8 +59,9 @@ type MySQLConnectParam struct {
 }
 
 func (param *MySQLConnectParam) ToDSN() string {
-	dsn := fmt.Sprintf("%s:%s@tcp(%s:%d)/?charset=utf8mb4&sql_mode='%s'&maxAllowedPacket=%d&tls=%s",
-		param.User, param.Password, param.Host, param.Port,
+	hostPort := net.JoinHostPort(param.Host, strconv.Itoa(param.Port))
+	dsn := fmt.Sprintf("%s:%s@tcp(%s)/?charset=utf8mb4&sql_mode='%s'&maxAllowedPacket=%d&tls=%s",
+		param.User, param.Password, hostPort,
 		param.SQLMode, param.MaxAllowedPacket, param.TLS)
 
 	for k, v := range param.Vars {

diff --git a/br/pkg/lightning/common/util_test.go b/br/pkg/lightning/common/util_test.go
@@ -99,6 +99,9 @@ func TestToDSN(t *testing.T) {
 		},
 	}
 	require.Equal(t, "root:123456@tcp(127.0.0.1:4000)/?charset=utf8mb4&sql_mode='strict'&maxAllowedPacket=1234&tls=cluster&tidb_distsql_scan_concurrency='1'", param.ToDSN())
+
+	param.Host = "::1"
+	require.Equal(t, "root:123456@tcp([::1]:4000)/?charset=utf8mb4&sql_mode='strict'&maxAllowedPacket=1234&tls=cluster&tidb_distsql_scan_concurrency='1'", param.ToDSN())
 }
 
 type mockDriver struct {