Merge pull request #332 from acekingke/fixTimeZone

andyli029 · web-flow · commit dc65bf2a0628 · 2021-12-09T15:56:16.000+08:00
mysqlcluster, utils: The time zone of the container and the mysql are…
diff --git a/mysqlcluster/container/backup.go b/mysqlcluster/container/backup.go
@@ -139,5 +139,9 @@ func (c *backupSidecar) getVolumeMounts() []corev1.VolumeMount {
 			Name:      utils.LogsVolumeName,
 			MountPath: utils.LogsVolumeMountPath,
 		},
+		{
+			Name:      utils.SysLocalTimeZone,
+			MountPath: utils.SysLocalTimeZoneMountPath,
+		},
 	}
 }
diff --git a/mysqlcluster/container/init_mysql.go b/mysqlcluster/container/init_mysql.go
@@ -124,5 +124,9 @@ func (c *initMysql) getVolumeMounts() []corev1.VolumeMount {
 			Name:      utils.InitFileVolumeName,
 			MountPath: utils.InitFileVolumeMountPath,
 		},
+		{
+			Name:      utils.SysLocalTimeZone,
+			MountPath: utils.SysLocalTimeZoneMountPath,
+		},
 	}
 }
diff --git a/mysqlcluster/container/init_mysql_test.go b/mysqlcluster/container/init_mysql_test.go
@@ -67,6 +67,10 @@ var (
 			Name:      utils.InitFileVolumeName,
 			MountPath: utils.InitFileVolumeMountPath,
 		},
+		{
+			Name:      utils.SysLocalTimeZone,
+			MountPath: utils.SysLocalTimeZoneMountPath,
+		},
 	}
 	optFalse      = false
 	optTrue       = true
diff --git a/mysqlcluster/container/init_sidecar.go b/mysqlcluster/container/init_sidecar.go
@@ -182,6 +182,10 @@ func (c *initSidecar) getVolumeMounts() []corev1.VolumeMount {
 			Name:      utils.InitFileVolumeName,
 			MountPath: utils.InitFileVolumeMountPath,
 		},
+		{
+			Name:      utils.SysLocalTimeZone,
+			MountPath: utils.SysLocalTimeZoneMountPath,
+		},
 	}
 
 	if c.Spec.MysqlOpts.InitTokuDB {
diff --git a/mysqlcluster/container/init_sidecar_test.go b/mysqlcluster/container/init_sidecar_test.go
@@ -290,6 +290,10 @@ var (
 			Name:      utils.InitFileVolumeName,
 			MountPath: utils.InitFileVolumeMountPath,
 		},
+		{
+			Name:      utils.SysLocalTimeZone,
+			MountPath: utils.SysLocalTimeZoneMountPath,
+		},
 	}
 	initSidecarCase = EnsureContainer("init-sidecar", &testInitSidecarCluster)
 )
@@ -432,7 +436,7 @@ func TestGetInitSidecarVolumeMounts(t *testing.T) {
 			MysqlCluster: &testToKuDBMysqlCluster,
 		}
 		tokudbCase := EnsureContainer("init-sidecar", &testTokuDBCluster)
-		tokuDBVolumeMounts := make([]corev1.VolumeMount, 5, 6)
+		tokuDBVolumeMounts := make([]corev1.VolumeMount, 6, 7)
 		copy(tokuDBVolumeMounts, defaultInitsidecarVolumeMounts)
 		tokuDBVolumeMounts = append(tokuDBVolumeMounts, corev1.VolumeMount{
 			Name:      utils.SysVolumeName,
@@ -448,7 +452,7 @@ func TestGetInitSidecarVolumeMounts(t *testing.T) {
 			MysqlCluster: &testPersistenceMysqlCluster,
 		}
 		persistenceCase := EnsureContainer("init-sidecar", &testPersistenceCluster)
-		persistenceVolumeMounts := make([]corev1.VolumeMount, 5, 6)
+		persistenceVolumeMounts := make([]corev1.VolumeMount, 6, 7)
 		copy(persistenceVolumeMounts, defaultInitsidecarVolumeMounts)
 		persistenceVolumeMounts = append(persistenceVolumeMounts, corev1.VolumeMount{
 			Name:      utils.DataVolumeName,
diff --git a/mysqlcluster/container/mysql.go b/mysqlcluster/container/mysql.go
@@ -134,5 +134,9 @@ func (c *mysql) getVolumeMounts() []corev1.VolumeMount {
 			Name:      utils.LogsVolumeName,
 			MountPath: utils.LogsVolumeMountPath,
 		},
+		{
+			Name:      utils.SysLocalTimeZone,
+			MountPath: utils.SysLocalTimeZoneMountPath,
+		},
 	}
 }
diff --git a/mysqlcluster/container/mysql_test.go b/mysqlcluster/container/mysql_test.go
@@ -24,6 +24,7 @@ import (
 
 	mysqlv1alpha1 "github.com/radondb/radondb-mysql-kubernetes/api/v1alpha1"
 	"github.com/radondb/radondb-mysql-kubernetes/mysqlcluster"
+	"github.com/radondb/radondb-mysql-kubernetes/utils"
 )
 
 var (
@@ -149,6 +150,10 @@ func TestGetMysqlVolumeMounts(t *testing.T) {
 			Name:      "logs",
 			MountPath: "/var/log/mysql",
 		},
+		{
+			Name:      utils.SysLocalTimeZone,
+			MountPath: "/etc/localtime",
+		},
 	}
 	assert.Equal(t, volumeMounts, mysqlCase.VolumeMounts)
 }
diff --git a/mysqlcluster/container/xenon.go b/mysqlcluster/container/xenon.go
@@ -114,5 +114,9 @@ func (c *xenon) getVolumeMounts() []corev1.VolumeMount {
 			Name:      utils.XenonVolumeName,
 			MountPath: utils.XenonVolumeMountPath,
 		},
+		{
+			Name:      utils.SysLocalTimeZone,
+			MountPath: utils.SysLocalTimeZoneMountPath,
+		},
 	}
 }
diff --git a/mysqlcluster/container/xenon_test.go b/mysqlcluster/container/xenon_test.go
@@ -25,6 +25,7 @@ import (
 
 	mysqlv1alpha1 "github.com/radondb/radondb-mysql-kubernetes/api/v1alpha1"
 	"github.com/radondb/radondb-mysql-kubernetes/mysqlcluster"
+	"github.com/radondb/radondb-mysql-kubernetes/utils"
 )
 
 var (
@@ -132,6 +133,10 @@ func TestGetXenonVolumeMounts(t *testing.T) {
 			Name:      "xenon",
 			MountPath: "/etc/xenon",
 		},
+		{
+			Name:      utils.SysLocalTimeZone,
+			MountPath: "/etc/localtime",
+		},
 	}
 	assert.Equal(t, volumeMounts, xenonCase.VolumeMounts)
 }
diff --git a/mysqlcluster/mysqlcluster.go b/mysqlcluster/mysqlcluster.go
@@ -221,6 +221,14 @@ func (c *MysqlCluster) EnsureVolumes() []corev1.Volume {
 				EmptyDir: &corev1.EmptyDirVolumeSource{},
 			},
 		},
+		corev1.Volume{
+			Name: utils.SysLocalTimeZone,
+			VolumeSource: corev1.VolumeSource{
+				HostPath: &corev1.HostPathVolumeSource{
+					Path: utils.SysLocalTimeZoneHostPath,
+				},
+			},
+		},
 	)
 
 	return volumes
diff --git a/mysqlcluster/mysqlcluster_test.go b/mysqlcluster/mysqlcluster_test.go
@@ -283,6 +283,14 @@ func TestEnsureVolumes(t *testing.T) {
 				EmptyDir: &corev1.EmptyDirVolumeSource{},
 			},
 		},
+		{
+			Name: utils.SysLocalTimeZone,
+			VolumeSource: corev1.VolumeSource{
+				HostPath: &corev1.HostPathVolumeSource{
+					Path: utils.SysLocalTimeZoneHostPath,
+				},
+			},
+		},
 	}
 	// when disable Persistence
 	{
diff --git a/utils/constants.go b/utils/constants.go
@@ -108,6 +108,15 @@ const (
 	XenonVolumeMountPath    = "/etc/xenon"
 	InitFileVolumeMountPath = "/docker-entrypoint-initdb.d"
 
+	// Volume timezone name.
+	SysLocalTimeZone = "localtime"
+
+	// Volume host path for time zone.
+	SysLocalTimeZoneHostPath = "/etc/localtime"
+
+	// Volume mount path for time zone.
+	SysLocalTimeZoneMountPath = "/etc/localtime"
+
 	// The path to the client MySQL client configuration.
 	// The file used to liveness and readiness check.
 	ConfClientPath = "/etc/mysql/client.conf"

Original file line number	Diff line number	Diff line change
`@@ -139,5 +139,9 @@ func (c *backupSidecar) getVolumeMounts() []corev1.VolumeMount {`
`139`	`139`	`Name: utils.LogsVolumeName,`
`140`	`140`	`MountPath: utils.LogsVolumeMountPath,`
`141`	`141`	`},`
	`142`	`+ {`
	`143`	`+ Name: utils.SysLocalTimeZone,`
	`144`	`+ MountPath: utils.SysLocalTimeZoneMountPath,`
	`145`	`+ },`
`142`	`146`	`}`
`143`	`147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -124,5 +124,9 @@ func (c *initMysql) getVolumeMounts() []corev1.VolumeMount {`
`124`	`124`	`Name: utils.InitFileVolumeName,`
`125`	`125`	`MountPath: utils.InitFileVolumeMountPath,`
`126`	`126`	`},`
	`127`	`+ {`
	`128`	`+ Name: utils.SysLocalTimeZone,`
	`129`	`+ MountPath: utils.SysLocalTimeZoneMountPath,`
	`130`	`+ },`
`127`	`131`	`}`
`128`	`132`	`}`
Original file line number	Diff line number	Diff line change
`@@ -134,5 +134,9 @@ func (c *mysql) getVolumeMounts() []corev1.VolumeMount {`
`134`	`134`	`Name: utils.LogsVolumeName,`
`135`	`135`	`MountPath: utils.LogsVolumeMountPath,`
`136`	`136`	`},`
	`137`	`+ {`
	`138`	`+ Name: utils.SysLocalTimeZone,`
	`139`	`+ MountPath: utils.SysLocalTimeZoneMountPath,`
	`140`	`+ },`
`137`	`141`	`}`
`138`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ import (`
`24`	`24`
`25`	`25`	`mysqlv1alpha1 "github.com/radondb/radondb-mysql-kubernetes/api/v1alpha1"`
`26`	`26`	`"github.com/radondb/radondb-mysql-kubernetes/mysqlcluster"`
	`27`	`+ "github.com/radondb/radondb-mysql-kubernetes/utils"`
`27`	`28`	`)`
`28`	`29`
`29`	`30`	`var (`
`@@ -149,6 +150,10 @@ func TestGetMysqlVolumeMounts(t *testing.T) {`
`149`	`150`	`Name: "logs",`
`150`	`151`	`MountPath: "/var/log/mysql",`
`151`	`152`	`},`
	`153`	`+ {`
	`154`	`+ Name: utils.SysLocalTimeZone,`
	`155`	`+ MountPath: "/etc/localtime",`
	`156`	`+ },`
`152`	`157`	`}`
`153`	`158`	`assert.Equal(t, volumeMounts, mysqlCase.VolumeMounts)`
`154`	`159`	`}`
Original file line number	Diff line number	Diff line change
`@@ -114,5 +114,9 @@ func (c *xenon) getVolumeMounts() []corev1.VolumeMount {`
`114`	`114`	`Name: utils.XenonVolumeName,`
`115`	`115`	`MountPath: utils.XenonVolumeMountPath,`
`116`	`116`	`},`
	`117`	`+ {`
	`118`	`+ Name: utils.SysLocalTimeZone,`
	`119`	`+ MountPath: utils.SysLocalTimeZoneMountPath,`
	`120`	`+ },`
`117`	`121`	`}`
`118`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ import (`
`25`	`25`
`26`	`26`	`mysqlv1alpha1 "github.com/radondb/radondb-mysql-kubernetes/api/v1alpha1"`
`27`	`27`	`"github.com/radondb/radondb-mysql-kubernetes/mysqlcluster"`
	`28`	`+ "github.com/radondb/radondb-mysql-kubernetes/utils"`
`28`	`29`	`)`
`29`	`30`
`30`	`31`	`var (`
`@@ -132,6 +133,10 @@ func TestGetXenonVolumeMounts(t *testing.T) {`
`132`	`133`	`Name: "xenon",`
`133`	`134`	`MountPath: "/etc/xenon",`
`134`	`135`	`},`
	`136`	`+ {`
	`137`	`+ Name: utils.SysLocalTimeZone,`
	`138`	`+ MountPath: "/etc/localtime",`
	`139`	`+ },`
`135`	`140`	`}`
`136`	`141`	`assert.Equal(t, volumeMounts, xenonCase.VolumeMounts)`
`137`	`142`	`}`