*: add errorlog to file

Author: acekingke

api/v1alpha1/mysqlcluster_types.go

@@ -290,6 +290,11 @@ type PodPolicy struct {
 	// +optional
 	// +kubebuilder:default:=false
 	AuditLogTail bool `json:"auditLogTail,omitempty"`
+
+	// ErrorLogTail represents if tail the mysql error log.
+	// +optional
+	// +kubebuilder:default:=false
+	ErrorLogTail bool `json:"errorLogTail,omitempty"`
 }
 
 // Persistence is the desired spec for storing mysql data. Only one of its

api/v1beta1/mysqlcluster_conversion.go

@@ -79,6 +79,8 @@ func Convert_v1alpha1_MysqlClusterSpec_To_v1beta1_MysqlClusterSpec(in *v1alpha1.
 	out.Backup.Image = in.PodPolicy.SidecarImage
 	out.Backup.Resources = in.PodPolicy.ExtraResources
 	out.Log.SlowLogTail = in.PodPolicy.SlowLogTail
+	out.Log.AuditLogTail = in.PodPolicy.AuditLogTail
+	out.Log.ErrorLogTail = in.PodPolicy.ErrorLogTail
 	out.Tolerations = in.PodPolicy.Tolerations
 	out.PriorityClassName = in.PodPolicy.PriorityClassName
 	out.Log.BusyboxImage = in.PodPolicy.BusyboxImage
@@ -137,13 +139,15 @@ func Convert_v1beta1_MysqlClusterSpec_To_v1alpha1_MysqlClusterSpec(in *MysqlClus
 	out.Persistence.Size = FormatQuantity(in.Storage.Resources.Requests[corev1.ResourceStorage])
 	out.Persistence.AccessModes = in.Storage.AccessModes
 	out.XenonOpts = v1alpha1.XenonOpts(in.Xenon)
-	// //TODO in.Backup
+
 	out.PodPolicy.ExtraResources = in.Backup.Resources
 	out.PodPolicy.SidecarImage = in.Backup.Image
 	out.MetricsOpts.Image = in.Monitoring.Exporter.Image
 	out.MetricsOpts.Resources = in.Monitoring.Exporter.Resources
 	out.MysqlOpts.Image = in.Image
 	out.PodPolicy.SlowLogTail = in.Log.SlowLogTail
+	out.PodPolicy.AuditLogTail = in.Log.AuditLogTail
+	out.PodPolicy.ErrorLogTail = in.Log.ErrorLogTail
 	out.PodPolicy.BusyboxImage = in.Log.BusyboxImage
 	out.MetricsOpts.Enabled = in.Monitoring.Exporter.Enabled
 	out.PodPolicy.ImagePullPolicy = in.ImagePullPolicy

api/v1beta1/mysqlcluster_types.go

@@ -459,6 +459,11 @@ type LogOpts struct {
 	// +kubebuilder:default:=false
 	AuditLogTail bool `json:"auditLogTail,omitempty"`
 
+	// ErrorLogTail represents if tail the mysql error log.
+	// +optional
+	// +kubebuilder:default:=false
+	ErrorLogTail bool `json:"errorLogTail,omitempty"`
+
 	//Log container resources of a MySQL container.
 	Resources corev1.ResourceRequirements `json:"resources,omitempty"`
 }

charts/mysql-operator/templates/mysql.radondb.com_mysqlclusters.yaml

@@ -1207,6 +1207,10 @@ spec:
                     default: busybox:1.32
                     description: The busybox image.
                     type: string
+                  errorLogTail:
+                    default: false
+                    description: ErrorLogTail represents if tail the mysql error log.
+                    type: boolean
                   extraResources:
                     default:
                       requests:
@@ -3529,6 +3533,10 @@ spec:
                     default: false
                     description: AuditLogTail represents if tail the mysql audit log.
                     type: boolean
+                  errorLogTail:
+                    default: false
+                    description: ErrorLogTail represents if tail the mysql error log.
+                    type: boolean
                   image:
                     default: busybox:1.32
                     description: To specify the image that will be used for log container.

config/crd/bases/mysql.radondb.com_mysqlclusters.yaml

@@ -1189,6 +1189,10 @@ spec:
                     default: busybox:1.32
                     description: The busybox image.
                     type: string
+                  errorLogTail:
+                    default: false
+                    description: ErrorLogTail represents if tail the mysql error log.
+                    type: boolean
                   extraResources:
                     default:
                       requests:
@@ -3511,6 +3515,10 @@ spec:
                     default: false
                     description: AuditLogTail represents if tail the mysql audit log.
                     type: boolean
+                  errorLogTail:
+                    default: false
+                    description: ErrorLogTail represents if tail the mysql error log.
+                    type: boolean
                   image:
                     default: busybox:1.32
                     description: To specify the image that will be used for log container.

mysqlcluster/container/container.go

@@ -78,6 +78,8 @@ func EnsureContainer(name string, c *mysqlcluster.MysqlCluster) corev1.Container
 		ctr = &slowLog{c, name}
 	case utils.ContainerAuditLogName:
 		ctr = &auditLog{c, name}
+	case utils.ContainerErrorLogName:
+		ctr = &errorLog{c, name}
 	case utils.ContainerBackupName:
 		ctr = &backupSidecar{c, name}
 	}

mysqlcluster/container/errorlog.go

@@ -0,0 +1,89 @@
+/*
+Copyright 2021 RadonDB.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package container
+
+import (
+	corev1 "k8s.io/api/core/v1"
+
+	"github.com/radondb/radondb-mysql-kubernetes/mysqlcluster"
+	"github.com/radondb/radondb-mysql-kubernetes/utils"
+)
+
+// errorLog used for auditlog container.
+type errorLog struct {
+	*mysqlcluster.MysqlCluster
+
+	// The name of the auditlog container.
+	name string
+}
+
+// getName get the container name.
+func (c *errorLog) getName() string {
+	return c.name
+}
+
+// getImage get the container image.
+func (c *errorLog) getImage() string {
+	return c.Spec.PodPolicy.BusyboxImage
+}
+
+// getCommand get the container command.
+func (c *errorLog) getCommand() []string {
+	logsName := "/mysql-error.log"
+	return []string{"sh", "-c", "while true; do if [ -f " + utils.LogsVolumeMountPath + logsName + " ] ; then break; fi;sleep 1; done; " +
+		"tail -f " + utils.LogsVolumeMountPath + logsName}
+}
+
+// getEnvVars get the container env.
+func (c *errorLog) getEnvVars() []corev1.EnvVar {
+	return nil
+}
+
+// getLifecycle get the container lifecycle.
+func (c *errorLog) getLifecycle() *corev1.Lifecycle {
+	return nil
+}
+
+// getResources get the container resources.
+func (c *errorLog) getResources() corev1.ResourceRequirements {
+	return c.Spec.PodPolicy.ExtraResources
+}
+
+// getPorts get the container ports.
+func (c *errorLog) getPorts() []corev1.ContainerPort {
+	return nil
+}
+
+// getLivenessProbe get the container livenessProbe.
+func (c *errorLog) getLivenessProbe() *corev1.Probe {
+	return nil
+}
+
+// getReadinessProbe get the container readinessProbe.
+func (c *errorLog) getReadinessProbe() *corev1.Probe {
+	return nil
+}
+
+// getVolumeMounts get the container volumeMounts.
+func (c *errorLog) getVolumeMounts() []corev1.VolumeMount {
+	return []corev1.VolumeMount{
+		{
+			Name:      utils.LogsVolumeName,
+			MountPath: utils.LogsVolumeMountPath,
+		},
+	}
+}

mysqlcluster/mysqlcluster.go

@@ -427,6 +427,9 @@ func (c *MysqlCluster) EnsureMysqlConf() {
 		}
 
 	}
+	if c.Spec.PodPolicy.ErrorLogTail {
+		c.Spec.MysqlOpts.MysqlConf["log-error"] = utils.LogsVolumeMountPath + "/mysql-error.log"
+	}
 }
 
 // sizeToBytes parses a string formatted by ByteSize as bytes.

mysqlcluster/syncer/statefulset.go

@@ -441,7 +441,11 @@ func (s *StatefulSetSyncer) ensurePodSpec() corev1.PodSpec {
 	if s.Spec.PodPolicy.AuditLogTail {
 		containers = append(containers, container.EnsureContainer(utils.ContainerAuditLogName, s.MysqlCluster))
 	}
+	if s.Spec.PodPolicy.ErrorLogTail {
+		// 1.create errorLog
+		containers = append(containers, container.EnsureContainer(utils.ContainerErrorLogName, s.MysqlCluster))
 
+	}
 	return corev1.PodSpec{
 		InitContainers:     initContainers,
 		Containers:         containers,

utils/constants.go

@@ -46,6 +46,7 @@ const (
 	ContainerMetricsName   = "metrics"
 	ContainerSlowLogName   = "slowlog"
 	ContainerAuditLogName  = "auditlog"
+	ContainerErrorLogName  = "errorlog"
 	ContainerBackupName    = "backup"
 	ContainerBackupJobName = "backup-job"