Fix how node role is determined.

AMecea · AMecea · commit f8db55014c9a · 2019-03-12T14:50:52.000+02:00
diff --git a/pkg/sidecar/configs.go b/pkg/sidecar/configs.go
@@ -117,7 +117,7 @@ func (cfg *Config) MasterFQDN() string {
 
 // NodeRole returns the role of the current node
 func (cfg *Config) NodeRole() NodeRole {
-	if cfg.Hostname == cfg.MasterFQDN() {
+	if cfg.FQDNForServer(cfg.ServerID) == cfg.MasterFQDN() {
 		return MasterNode
 	}
 
@@ -154,7 +154,7 @@ func NewConfig() *Config {
 
 	var err error
 	if cfg.MysqlDSN, err = getMySQLConnectionString(); err != nil {
-		log.Error(err, "get mysql dsn")
+		log.Info("failed to get mysql DSN string", "error", err)
 	}
 
 	return cfg

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ func (cfg *Config) MasterFQDN() string {`
`117`	`117`
`118`	`118`	`// NodeRole returns the role of the current node`
`119`	`119`	`func (cfg *Config) NodeRole() NodeRole {`
`120`		`- if cfg.Hostname == cfg.MasterFQDN() {`
	`120`	`+ if cfg.FQDNForServer(cfg.ServerID) == cfg.MasterFQDN() {`
`121`	`121`	`return MasterNode`
`122`	`122`	`}`
`123`	`123`
`@@ -154,7 +154,7 @@ func NewConfig() *Config {`
`154`	`154`
`155`	`155`	`var err error`
`156`	`156`	`if cfg.MysqlDSN, err = getMySQLConnectionString(); err != nil {`
`157`		`- log.Error(err, "get mysql dsn")`
	`157`	`+ log.Info("failed to get mysql DSN string", "error", err)`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`return cfg`