Revert "Merge pull request #413 from runkecheng/save_xenon_metadata"

runkecheng · runkecheng · commit 3375b1c410c8 · 2022-04-12T11:03:15.000+08:00
This reverts commit a6386c7, reversing changes made to f6932c6.
diff --git a/mysqlcluster/container/backup.go b/mysqlcluster/container/backup.go
@@ -134,7 +134,6 @@ 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
@@ -116,7 +116,6 @@ 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,7 +59,6 @@ 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,12 +202,6 @@ 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,18 +455,10 @@ 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,
-				SubPath:   utils.MysqlDataSubPath,
-			},
-			corev1.VolumeMount{
-				Name:      utils.DataVolumeName,
-				MountPath: utils.XenonDataVolumeMountPath,
-				SubPath:   utils.XenonDataSubPath,
-			},
-		)
+		persistenceVolumeMounts = append(persistenceVolumeMounts, corev1.VolumeMount{
+			Name:      utils.DataVolumeName,
+			MountPath: utils.DataVolumeMountPath,
+		})
 		assert.Equal(t, persistenceVolumeMounts, persistenceCase.VolumeMounts)
 	}
 }
diff --git a/mysqlcluster/container/mysql.go b/mysqlcluster/container/mysql.go
@@ -141,7 +141,6 @@ 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,7 +147,6 @@ 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,11 +114,6 @@ 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,11 +134,6 @@ 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
@@ -134,10 +134,6 @@ 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,8 +45,6 @@ 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
@@ -101,17 +101,14 @@ const (
 	InitFileVolumeName = "init-mysql"
 
 	// volumes mount path.
-	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"
+	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"
 
 	// Volume timezone name.
 	SysLocalTimeZone = "localtime"

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