mysqlcluster: fix the bug for replace config items #562 (#563)

acekingke · web-flow · commit dadc46fd484a · 2022-06-30T17:23:05.000+08:00
diff --git a/mysqlcluster/syncer/mysql_cm.go b/mysqlcluster/syncer/mysql_cm.go
@@ -99,6 +99,13 @@ func buildMysqlConf(c *mysqlcluster.MysqlCluster) (string, error) {
 	for k, v := range c.Spec.MysqlOpts.MysqlConf {
 		if sec.HasKey(k) {
 			sec.Key(k).SetValue(v)
+		} else { // Not in sec.
+			if _, ok := pluginConfigs[k]; !ok { // Not in pluginconfig.
+				// Add it to sec
+				if _, err := sec.NewKey(k, v); err != nil {
+					return "", fmt.Errorf("failed to add key to config section: %s", err)
+				}
+			}
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,13 @@ func buildMysqlConf(c *mysqlcluster.MysqlCluster) (string, error) {`
`99`	`99`	`for k, v := range c.Spec.MysqlOpts.MysqlConf {`
`100`	`100`	`if sec.HasKey(k) {`
`101`	`101`	`sec.Key(k).SetValue(v)`
	`102`	`+ } else { // Not in sec.`
	`103`	`+ if _, ok := pluginConfigs[k]; !ok { // Not in pluginconfig.`
	`104`	`+ // Add it to sec`
	`105`	`+ if _, err := sec.NewKey(k, v); err != nil {`
	`106`	`+ return "", fmt.Errorf("failed to add key to config section: %s", err)`
	`107`	`+ }`
	`108`	`+ }`
`102`	`109`	`}`
`103`	`110`	`}`
`104`	`111`