From 012e0c1b498f65e7d625ae490d7341ea7476ea08 Mon Sep 17 00:00:00 2001 From: runkecheng <1131648942@qq.com> Date: Wed, 1 Jun 2022 16:40:44 +0800 Subject: [PATCH] fix(cluster,status): Reduce useless log output #508 1. status.go: adjust the log level(ERROR->DEBUG) 2. statefulset.go: remove unnecessary output items fix: #508 --- mysqlcluster/syncer/statefulset.go | 6 +++--- mysqlcluster/syncer/status.go | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mysqlcluster/syncer/statefulset.go b/mysqlcluster/syncer/statefulset.go index 75d4caf5..05e04a88 100644 --- a/mysqlcluster/syncer/statefulset.go +++ b/mysqlcluster/syncer/statefulset.go @@ -482,9 +482,9 @@ func (s *StatefulSetSyncer) applyNWait(ctx context.Context, pod *corev1.Pod) err s.log.Info("pod is already updated", "pod name", pod.Name) } else { s.Status.State = apiv1alpha1.ClusterUpdateState - s.log.Info("updating pod", "pod", pod.Name, "key", s.Unwrap()) + s.log.Info("updating pod", "pod", pod.Name) if pod.DeletionTimestamp != nil { - s.log.Info("pod is being deleted", "pod", pod.Name, "key", s.Unwrap()) + s.log.Info("pod is being deleted", "pod", pod.Name) } else { // If healthy is always `yes`, retry() will exit in advance, which may // cause excessive nodes are deleted at the same time, details: issue#310. @@ -510,7 +510,7 @@ func (s *StatefulSetSyncer) applyNWait(ctx context.Context, pod *corev1.Pod) err return false, err } if ordinal >= int(*s.Spec.Replicas) { - s.log.Info("replicas were changed, should skip", "pod", pod.Name) + s.log.Info("replicas were changed, should skip", "pod", pod.Name) return true, nil } diff --git a/mysqlcluster/syncer/status.go b/mysqlcluster/syncer/status.go index 7f1d4cb0..18ad9b0c 100644 --- a/mysqlcluster/syncer/status.go +++ b/mysqlcluster/syncer/status.go @@ -240,7 +240,7 @@ func (s *StatusSyncer) updateNodeStatus(ctx context.Context, cli client.Client, node.Message = "" if err := s.updateNodeRaftStatus(node); err != nil { - s.log.Error(err, "failed to get/update node raft status", "node", node.Name) + s.log.V(1).Info("failed to get/update node raft status", "node", node.Name, "error", err) node.Message = err.Error() } @@ -249,18 +249,18 @@ func (s *StatusSyncer) updateNodeStatus(ctx context.Context, cli client.Client, s.cli, s.MysqlCluster.GetClusterKey(), utils.OperatorUser, host)) defer closeConn() if err != nil { - s.log.Error(err, "failed to connect the mysql", "node", node.Name) + s.log.V(1).Info("failed to connect the mysql", "node", node.Name, "error", err) node.Message = err.Error() } else { isLagged, isReplicating, err = internal.CheckSlaveStatusWithRetry(sqlRunner, checkNodeStatusRetry) if err != nil { - s.log.Error(err, "failed to check slave status", "node", node.Name) + s.log.V(1).Info("failed to check slave status", "node", node.Name, "error", err) node.Message = err.Error() } isReadOnly, err = internal.CheckReadOnly(sqlRunner) if err != nil { - s.log.Error(err, "failed to check read only", "node", node.Name) + s.log.V(1).Info("failed to check read only", "node", node.Name, "error", err) node.Message = err.Error() } @@ -281,7 +281,7 @@ func (s *StatusSyncer) updateNodeStatus(ctx context.Context, cli client.Client, s.updateNodeCondition(node, int(apiv1alpha1.IndexReadOnly), isReadOnly) if err = s.updatePodLabel(ctx, &pod, node); err != nil { - s.log.Error(err, "failed to update labels", "pod", pod.Name, "namespace", pod.Namespace) + s.log.V(1).Info("failed to update labels", "pod", pod.Name, "error", err) } }