*: Save Xenon's metadata to persistent storage. radondb#406

runkecheng · Mar 15, 2022 · 39dccf5 · 39dccf5
1 parent 49384da
commit 39dccf5
Show file tree

Hide file tree

Showing 12 changed files with 48 additions and 10 deletions.
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.XenonMetaDataSubPath,
 			},
 		)
 	}

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{
+		persistenceVolumeMounts = append(persistenceVolumeMounts, 
+		corev1.VolumeMount{
 			Name:      utils.DataVolumeName,
 			MountPath: utils.DataVolumeMountPath,
-		})
+			SubPath:   utils.MysqlDataSubPath,
+		},
+		corev1.VolumeMount{
+			Name:      utils.DataVolumeName,
+			MountPath: utils.XenonDataVolumeMountPath,
+			SubPath:   utils.XenonMetaDataSubPath,
+		},
+	)
 		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
@@ -110,6 +110,11 @@ func (c *xenon) getVolumeMounts() []corev1.VolumeMount {
 			Name:      utils.ScriptsVolumeName,
 			MountPath: utils.ScriptsVolumeMountPath,
 		},
+		{
+			Name:      utils.DataVolumeName,
+			MountPath: utils.XenonDataVolumeMountPath,
+			SubPath:  utils.XenonMetaDataSubPath,
+		},		
 		{
 			Name:      utils.XenonVolumeName,
 			MountPath: utils.XenonVolumeMountPath,

diff --git a/mysqlcluster/container/xenon_test.go b/mysqlcluster/container/xenon_test.go
@@ -130,6 +130,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(xenonMetaDataPath, uid, gid); err != nil {
+			return fmt.Errorf("failed to chown %s: %s", xenonMetaDataPath, err)
+		}
 	}
 
 	// copy appropriate my.cnf from config-map to config mount.

diff --git a/sidecar/util.go b/sidecar/util.go
@@ -46,6 +46,8 @@ var (
 	// dataPath is the mysql data path.
 	dataPath = utils.DataVolumeMountPath
 
+	xenonMetaDataPath = 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"
+	XenonMetaDataSubPath	 = "xenon"
 
 	// Volume timezone name.
 	SysLocalTimeZone = "localtime"