Small changes of code

Author: AMecea

cmd/mysql-operator-sidecar/main.go

@@ -31,7 +31,7 @@ import (
 var log = logf.Log.WithName("sidecar")
 
 func main() {
-	stopCh := signals.SetupSignalHandler()
+	stop := signals.SetupSignalHandler()
 
 	cmd := &cobra.Command{
 		Use:   "mysql-operator-sidecar",
@@ -57,7 +57,7 @@ func main() {
 	logf.SetLogger(logf.ZapLogger(debug))
 
 	// init configs
-	cfg := sidecar.NewConfig(stopCh)
+	cfg := sidecar.NewConfig()
 
 	confCmd := &cobra.Command{
 		Use:   "init-configs",
@@ -89,7 +89,7 @@ func main() {
 		Use:   "run",
 		Short: "Configs mysql users, replication, and serve backups.",
 		Run: func(cmd *cobra.Command, args []string) {
-			err := sidecar.RunSidecarCommand(cfg)
+			err := sidecar.RunSidecarCommand(cfg, stop)
 			if err != nil {
 				log.Error(err, "run command failed")
 				os.Exit(1)

pkg/sidecar/appconf.go

@@ -19,6 +19,7 @@ package sidecar
 import (
 	"fmt"
 	"os"
+	"path"
 	"strconv"
 
 	"github.com/go-ini/ini"
@@ -33,41 +34,45 @@ const (
 // RunConfigCommand generates my.cnf, client.cnf and 10-dynamic.cnf files.
 func RunConfigCommand(cfg *Config) error {
 	log.Info("configuring server", "host", cfg.Hostname, "role", cfg.NodeRole())
+	var err error
 
-	if err := copyFile(mountConfigDir+"/my.cnf", configDir+"/my.cnf"); err != nil {
+	if err = copyFile(mountConfigDir+"/my.cnf", configDir+"/my.cnf"); err != nil {
 		return fmt.Errorf("copy file my.cnf: %s", err)
 	}
 
+	if err = os.Mkdir(confDPath, os.FileMode(0755)); err != nil {
+		if !os.IsExist(err) {
+			return fmt.Errorf("error mkdir %s/conf.d: %s", configDir, err)
+		}
+	}
+
 	uPass := pkgutil.RandomString(rStrLen)
 	reportHost := cfg.FQDNForServer(cfg.ServerID)
 
-	var dynCFG, utilityCFG, clientCFG *ini.File
-	var err error
+	var identityCFG, utilityCFG, clientCFG *ini.File
 
-	if dynCFG, err = getDynamicConfigs(cfg.ServerID, reportHost); err != nil {
+	// mysql server identity configs
+	if identityCFG, err = getIdentityConfigs(cfg.ServerID, reportHost); err != nil {
 		return fmt.Errorf("failed to get dynamic configs: %s", err)
 	}
-
-	if err = os.Mkdir(confDPath, os.FileMode(0755)); err != nil {
-		if !os.IsExist(err) {
-			return fmt.Errorf("error mkdir %s/conf.d: %s", configDir, err)
-		}
-	}
-	if err = dynCFG.SaveTo(confDPath + "/10-dynamic.cnf"); err != nil {
+	if err = identityCFG.SaveTo(path.Join(confDPath, "10-identity.cnf")); err != nil {
 		return fmt.Errorf("failed to save configs: %s", err)
 	}
+
+	// mysql server utility user configs
 	if utilityCFG, err = getUtilityUserConfigs(utilityUser, uPass); err != nil {
 		return fmt.Errorf("failed to configure utility user: %s", err)
 	}
-	if err = utilityCFG.SaveTo(confDPath + "/10-utility-user.cnf"); err != nil {
+	if err = utilityCFG.SaveTo(path.Join(confDPath, "10-utility-user.cnf")); err != nil {
 		return fmt.Errorf("failed to configure utility user: %s", err)
 	}
 
+	// mysql client connect credentials
 	if clientCFG, err = getClientConfigs(utilityUser, uPass); err != nil {
 		return fmt.Errorf("failed to get client configs: %s", err)
 	}
 
-	if err = clientCFG.SaveTo(configDir + "/client.cnf"); err != nil {
+	if err = clientCFG.SaveTo(path.Join(configDir, "client.cnf")); err != nil {
 		return fmt.Errorf("failed to save configs: %s", err)
 	}
 
@@ -95,7 +100,7 @@ func getClientConfigs(user, pass string) (*ini.File, error) {
 	return cfg, nil
 }
 
-func getDynamicConfigs(id int, reportHost string) (*ini.File, error) {
+func getIdentityConfigs(id int, reportHost string) (*ini.File, error) {
 	cfg := ini.Empty()
 	mysqld := cfg.Section("mysqld")
 

pkg/sidecar/apphelper.go

@@ -33,7 +33,7 @@ const (
 
 // RunSidecarCommand is the main command, and represents the runtime helper that
 // configures the mysql server
-func RunSidecarCommand(cfg *Config) error {
+func RunSidecarCommand(cfg *Config, stop <-chan struct{}) error {
 	log.Info("start initialization")
 
 	// wait for mysql to be ready
@@ -84,7 +84,7 @@ func RunSidecarCommand(cfg *Config) error {
 	}
 
 	log.V(1).Info("start http server")
-	srv := newServer(cfg)
+	srv := newServer(cfg, stop)
 	return srv.ListenAndServe()
 }
 
@@ -262,19 +262,17 @@ func getGTIDFrom(reader io.Reader) (string, error) {
 	scanner := bufio.NewScanner(reader)
 	scanner.Split(bufio.ScanWords)
 
-	count := 0
 	gtid := ""
-	for scanner.Scan() {
-		if count == 2 {
+	for i := 0; scanner.Scan(); i++ {
+		if i == 2 {
 			gtid = scanner.Text()
 		}
-		count++
 	}
 
 	if err := scanner.Err(); err != nil {
 		return "", err
 	} else if len(gtid) == 0 {
-		return "", fmt.Errorf("failed to read GTID reached EOF")
+		return "", io.EOF
 	}
 
 	return gtid, nil

pkg/sidecar/configs.go

@@ -43,9 +43,6 @@ const (
 
 // Config contains information related with the pod.
 type Config struct {
-	// Stop represents the shutdown channel
-	Stop <-chan struct{}
-
 	// Hostname represents the pod hostname
 	Hostname string
 	// ClusterName is the MySQL cluster name
@@ -128,9 +125,8 @@ func (cfg *Config) NodeRole() NodeRole {
 }
 
 // NewConfig returns a pointer to Config configured from environment variables
-func NewConfig(stop <-chan struct{}) *Config {
+func NewConfig() *Config {
 	cfg := &Config{
-		Stop:        stop,
 		Hostname:    getEnvValue("HOSTNAME"),
 		ClusterName: getEnvValue("MY_CLUSTER_NAME"),
 		Namespace:   getEnvValue("MY_NAMESPACE"),

pkg/sidecar/server.go

@@ -30,7 +30,7 @@ type server struct {
 	http.Server
 }
 
-func newServer(cfg *Config) *server {
+func newServer(cfg *Config, stop <-chan struct{}) *server {
 	mux := http.NewServeMux()
 	srv := &server{
 		cfg: cfg,
@@ -46,7 +46,7 @@ func newServer(cfg *Config) *server {
 
 	// Shutdown gracefully the http server
 	go func() {
-		<-cfg.Stop // wait for stop signal
+		<-stop // wait for stop signal
 		if err := srv.Shutdown(context.Background()); err != nil {
 			log.Error(err, "failed to stop http server")