Skip to content

Commit d35a415

Browse files
authored
Merge pull request #473 from acekingke/SupportIPV6
mysqlcluster, sidecar: Support ipv6 address. #441
2 parents ce2ba5a + 3fadc5c commit d35a415

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

sidecar/config.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,13 @@ type Config struct {
134134
func NewInitConfig() *Config {
135135
// check mysql version is supported or not and then get parse mysql semver version
136136
var mysqlSemVer semver.Version
137+
137138
if ver := getEnvValue("MYSQL_VERSION"); ver == utils.InvalidMySQLVersion {
138139
panic("invalid mysql version, currently we only support 5.7 or 8.0")
139140
} else {
140-
mysqlSemVer, err := semver.Parse(ver)
141+
var err error
142+
// Do not use := here, it will alloc a new semver.Version every time.
143+
mysqlSemVer, err = semver.Parse(ver)
141144
if err != nil {
142145
log.Info("semver get from MYSQL_VERSION is invalid", "semver: ", mysqlSemVer)
143146
panic(err)
@@ -314,7 +317,8 @@ func (cfg *Config) buildXenonConf() []byte {
314317
}
315318

316319
hostName := fmt.Sprintf("%s.%s.%s", cfg.HostName, cfg.ServiceName, cfg.NameSpace)
317-
320+
// Because go-sql-driver will translate localhost to 127.0.0.1 or ::1, but never set the hostname
321+
// so the host is set to "127.0.0.1" in config file.
318322
str := fmt.Sprintf(`{
319323
"log": {
320324
"level": "INFO"
@@ -337,7 +341,7 @@ func (cfg *Config) buildXenonConf() []byte {
337341
"admin": "root",
338342
"ping-timeout": %d,
339343
"passwd": "%s",
340-
"host": "localhost",
344+
"host": "127.0.0.1",
341345
"version": "%s",
342346
"master-sysvars": "%s",
343347
"slave-sysvars": "%s",

0 commit comments

Comments
 (0)