Merge pull request #413 from runkecheng/save_xenon_metadata

andyli029 · web-flow · commit a6386c7b8215 · 2022-03-29T11:43:01.000+08:00
*: Save Xenon's metadata to persistent storage. #406
diff --git a/mysqlcluster/container/backup.go b/mysqlcluster/container/backup.go
@@ -134,6 +134,7 @@ func (c *backupSidecar) getVolumeMounts() []corev1.VolumeMount {
 		{
 			Name:      utils.DataVolumeName,
 			MountPath: utils.DataVolumeMountPath,
+			SubPath:   utils.MysqlDataSubPath,
 		},
 		{
 			Name:      utils.LogsVolumeName,
diff --git a/mysqlcluster/container/init_mysql.go b/mysqlcluster/container/init_mysql.go
@@ -115,6 +115,7 @@ func (c *initMysql) getVolumeMounts() []corev1.VolumeMount {
 		{
 			Name:      utils.DataVolumeName,
 			MountPath: utils.DataVolumeMountPath,
+			SubPath:   utils.MysqlDataSubPath,
 		},
 		{
 			Name:      utils.LogsVolumeName,
diff --git a/mysqlcluster/container/init_mysql_test.go b/mysqlcluster/container/init_mysql_test.go
@@ -59,6 +59,7 @@ var (
 		{
 			Name:      utils.DataVolumeName,
 			MountPath: utils.DataVolumeMountPath,
+			SubPath:   utils.MysqlDataSubPath,
 		},
 		{
 			Name:      utils.LogsVolumeName,
diff --git a/mysqlcluster/container/init_sidecar.go b/mysqlcluster/container/init_sidecar.go
@@ -202,6 +202,12 @@ func (c *initSidecar) getVolumeMounts() []corev1.VolumeMount {
 			corev1.VolumeMount{
 				Name:      utils.DataVolumeName,
 				MountPath: utils.DataVolumeMountPath,
+				SubPath:   utils.MysqlDataSubPath,
+			},
+			corev1.VolumeMount{
+				Name:      utils.DataVolumeName,
+				MountPath: utils.XenonDataVolumeMountPath,
+				SubPath:   utils.XenonDataSubPath,
 			},
 		)
 	}
diff --git a/mysqlcluster/container/init_sidecar_test.go b/mysqlcluster/container/init_sidecar_test.go
@@ -455,10 +455,18 @@ func TestGetInitSidecarVolumeMounts(t *testing.T) {
 		persistenceCase := EnsureContainer("init-sidecar", &testPersistenceCluster)
 		persistenceVolumeMounts := make([]corev1.VolumeMount, 6, 7)
 		copy(persistenceVolumeMounts, defaultInitsidecarVolumeMounts)
-		persistenceVolumeMounts = append(persistenceVolumeMounts, corev1.VolumeMount{
-			Name:      utils.DataVolumeName,
-			MountPath: utils.DataVolumeMountPath,
-		})
+		persistenceVolumeMounts = append(persistenceVolumeMounts,
+			corev1.VolumeMount{
+				Name:      utils.DataVolumeName,
+				MountPath: utils.DataVolumeMountPath,
+				SubPath:   utils.MysqlDataSubPath,
+			},
+			corev1.VolumeMount{
+				Name:      utils.DataVolumeName,
+				MountPath: utils.XenonDataVolumeMountPath,
+				SubPath:   utils.XenonDataSubPath,
+			},
+		)
 		assert.Equal(t, persistenceVolumeMounts, persistenceCase.VolumeMounts)
 	}
 }
diff --git a/mysqlcluster/container/mysql.go b/mysqlcluster/container/mysql.go
@@ -141,6 +141,7 @@ func (c *mysql) getVolumeMounts() []corev1.VolumeMount {
 		{
 			Name:      utils.DataVolumeName,
 			MountPath: utils.DataVolumeMountPath,
+			SubPath:   utils.MysqlDataSubPath,
 		},
 		{
 			Name:      utils.LogsVolumeName,
diff --git a/mysqlcluster/container/mysql_test.go b/mysqlcluster/container/mysql_test.go
@@ -147,6 +147,7 @@ func TestGetMysqlVolumeMounts(t *testing.T) {
 		{
 			Name:      "data",
 			MountPath: "/var/lib/mysql",
+			SubPath:   "mysql",
 		},
 		{
 			Name:      "logs",
diff --git a/mysqlcluster/container/xenon.go b/mysqlcluster/container/xenon.go
@@ -114,6 +114,11 @@ func (c *xenon) getVolumeMounts() []corev1.VolumeMount {
 			Name:      utils.ScriptsVolumeName,
 			MountPath: utils.ScriptsVolumeMountPath,
 		},
+		{
+			Name:      utils.DataVolumeName,
+			MountPath: utils.XenonDataVolumeMountPath,
+			SubPath:   utils.XenonDataSubPath,
+		},
 		{
 			Name:      utils.XenonVolumeName,
 			MountPath: utils.XenonVolumeMountPath,
diff --git a/mysqlcluster/container/xenon_test.go b/mysqlcluster/container/xenon_test.go
@@ -134,6 +134,11 @@ func TestGetXenonVolumeMounts(t *testing.T) {
 			Name:      "scripts",
 			MountPath: "/scripts",
 		},
+		{
+			Name:      "data",
+			MountPath: "/var/lib/xenon",
+			SubPath:   "xenon",
+		},
 		{
 			Name:      "xenon",
 			MountPath: "/etc/xenon",
diff --git a/sidecar/init.go b/sidecar/init.go
@@ -133,6 +133,10 @@ func runInitCommand(cfg *Config) error {
 		if err = os.Chown(dataPath, uid, gid); err != nil {
 			return fmt.Errorf("failed to chown %s: %s", dataPath, err)
 		}
+		// chown -R mysql:mysql /var/lib/xenon.
+		if err = os.Chown(xenonDataPath, uid, gid); err != nil {
+			return fmt.Errorf("failed to chown %s: %s", xenonDataPath, err)
+		}
 	}
 
 	// copy appropriate my.cnf from config-map to config mount.
diff --git a/sidecar/util.go b/sidecar/util.go
@@ -45,6 +45,8 @@ var (
 
 	// dataPath is the mysql data path.
 	dataPath = utils.DataVolumeMountPath
+	// xenonMetaDataPath is the xenon metadata path.
+	xenonDataPath = utils.XenonDataVolumeMountPath
 
 	// // scriptsPath is the scripts path used for xenon.
 	// scriptsPath = utils.ScriptsVolumeMountPath
diff --git a/utils/constants.go b/utils/constants.go
@@ -99,14 +99,17 @@ const (
 	InitFileVolumeName = "init-mysql"
 
 	// volumes mount path.
-	ConfVolumeMountPath     = "/etc/mysql"
-	ConfMapVolumeMountPath  = "/mnt/config-map"
-	LogsVolumeMountPath     = "/var/log/mysql"
-	DataVolumeMountPath     = "/var/lib/mysql"
-	SysVolumeMountPath      = "/host-sys"
-	ScriptsVolumeMountPath  = "/scripts"
-	XenonVolumeMountPath    = "/etc/xenon"
-	InitFileVolumeMountPath = "/docker-entrypoint-initdb.d"
+	ConfVolumeMountPath      = "/etc/mysql"
+	ConfMapVolumeMountPath   = "/mnt/config-map"
+	LogsVolumeMountPath      = "/var/log/mysql"
+	DataVolumeMountPath      = "/var/lib/mysql"
+	XenonDataVolumeMountPath = "/var/lib/xenon"
+	SysVolumeMountPath       = "/host-sys"
+	ScriptsVolumeMountPath   = "/scripts"
+	XenonVolumeMountPath     = "/etc/xenon"
+	InitFileVolumeMountPath  = "/docker-entrypoint-initdb.d"
+	MysqlDataSubPath         = "mysql"
+	XenonDataSubPath         = "xenon"
 
 	// Volume timezone name.
 	SysLocalTimeZone = "localtime"

Original file line number	Diff line number	Diff line change
`@@ -134,6 +134,7 @@ func (c *backupSidecar) getVolumeMounts() []corev1.VolumeMount {`
`134`	`134`	`{`
`135`	`135`	`Name: utils.DataVolumeName,`
`136`	`136`	`MountPath: utils.DataVolumeMountPath,`
	`137`	`+ SubPath: utils.MysqlDataSubPath,`
`137`	`138`	`},`
`138`	`139`	`{`
`139`	`140`	`Name: utils.LogsVolumeName,`
Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,7 @@ func (c *initMysql) getVolumeMounts() []corev1.VolumeMount {`
`115`	`115`	`{`
`116`	`116`	`Name: utils.DataVolumeName,`
`117`	`117`	`MountPath: utils.DataVolumeMountPath,`
	`118`	`+ SubPath: utils.MysqlDataSubPath,`
`118`	`119`	`},`
`119`	`120`	`{`
`120`	`121`	`Name: utils.LogsVolumeName,`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ var (`
`59`	`59`	`{`
`60`	`60`	`Name: utils.DataVolumeName,`
`61`	`61`	`MountPath: utils.DataVolumeMountPath,`
	`62`	`+ SubPath: utils.MysqlDataSubPath,`
`62`	`63`	`},`
`63`	`64`	`{`
`64`	`65`	`Name: utils.LogsVolumeName,`
Original file line number	Diff line number	Diff line change
`@@ -202,6 +202,12 @@ func (c *initSidecar) getVolumeMounts() []corev1.VolumeMount {`
`202`	`202`	`corev1.VolumeMount{`
`203`	`203`	`Name: utils.DataVolumeName,`
`204`	`204`	`MountPath: utils.DataVolumeMountPath,`
	`205`	`+ SubPath: utils.MysqlDataSubPath,`
	`206`	`+ },`
	`207`	`+ corev1.VolumeMount{`
	`208`	`+ Name: utils.DataVolumeName,`
	`209`	`+ MountPath: utils.XenonDataVolumeMountPath,`
	`210`	`+ SubPath: utils.XenonDataSubPath,`
`205`	`211`	`},`
`206`	`212`	`)`
`207`	`213`	`}`
Original file line number	Diff line number	Diff line change
`@@ -141,6 +141,7 @@ func (c *mysql) getVolumeMounts() []corev1.VolumeMount {`
`141`	`141`	`{`
`142`	`142`	`Name: utils.DataVolumeName,`
`143`	`143`	`MountPath: utils.DataVolumeMountPath,`
	`144`	`+ SubPath: utils.MysqlDataSubPath,`
`144`	`145`	`},`
`145`	`146`	`{`
`146`	`147`	`Name: utils.LogsVolumeName,`
Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,7 @@ func TestGetMysqlVolumeMounts(t *testing.T) {`
`147`	`147`	`{`
`148`	`148`	`Name: "data",`
`149`	`149`	`MountPath: "/var/lib/mysql",`
	`150`	`+ SubPath: "mysql",`
`150`	`151`	`},`
`151`	`152`	`{`
`152`	`153`	`Name: "logs",`
Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,10 @@ func runInitCommand(cfg *Config) error {`
`133`	`133`	`if err = os.Chown(dataPath, uid, gid); err != nil {`
`134`	`134`	`return fmt.Errorf("failed to chown %s: %s", dataPath, err)`
`135`	`135`	`}`
	`136`	`+ // chown -R mysql:mysql /var/lib/xenon.`
	`137`	`+ if err = os.Chown(xenonDataPath, uid, gid); err != nil {`
	`138`	`+ return fmt.Errorf("failed to chown %s: %s", xenonDataPath, err)`
	`139`	`+ }`
`136`	`140`	`}`
`137`	`141`
`138`	`142`	`// copy appropriate my.cnf from config-map to config mount.`