This is an automated email from the ASF dual-hosted git repository.
zhongxjian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-kubernetes.git
The following commit(s) were added to refs/heads/master by this push:
new 4adc52c3 [horus] Optimizing the output log (#439)
4adc52c3 is described below
commit 4adc52c36bde439d2842c105073fee748d35a3d5
Author: mfordjody <[email protected]>
AuthorDate: Tue Oct 8 07:58:29 2024 +0800
[horus] Optimizing the output log (#439)
---
app/horus/core/horuser/metrics.go | 2 +-
app/horus/core/horuser/node_downtime.go | 8 ++++----
app/horus/core/horuser/node_drain.go | 17 +++++++++--------
app/horus/core/horuser/node_modular.go | 18 ++++++++++--------
app/horus/core/horuser/node_uncordon.go | 18 +++++++++---------
app/horus/core/horuser/pod_evict.go | 13 ++++++++-----
app/horus/core/horuser/pod_remove.go | 14 +++++++-------
app/horus/core/horuser/pod_stagnation.go | 15 +++++++--------
app/horus/core/horuser/query.go | 6 +++---
9 files changed, 58 insertions(+), 53 deletions(-)
diff --git a/app/horus/core/horuser/metrics.go
b/app/horus/core/horuser/metrics.go
index 82bfc017..977cd2d9 100644
--- a/app/horus/core/horuser/metrics.go
+++ b/app/horus/core/horuser/metrics.go
@@ -141,7 +141,7 @@ func (h *Horuser) Collect(ch chan<- prometheus.Metric) {
}
klog.Info("horus metrics collect db get pod success.")
if len(pods) == 0 {
- klog.Infof("horus metrics collect db zero err:%v", err)
+ klog.Errorf("horus metrics collect db zero err:%v", err)
return
}
for _, v := range pods {
diff --git a/app/horus/core/horuser/node_downtime.go
b/app/horus/core/horuser/node_downtime.go
index 6da2a5d8..51b66a4c 100644
--- a/app/horus/core/horuser/node_downtime.go
+++ b/app/horus/core/horuser/node_downtime.go
@@ -68,7 +68,7 @@ func (h *Horuser) DownTimeNodes(clusterName, addr string) {
defer cancelFirst()
klog.Info("DownTimeNodes Query Start.")
- klog.Infof("clusterName:%v", clusterName)
+ klog.Infof("clusterName:%v\n", clusterName)
nodeDownTimeRes := make(map[string]int)
cq := len(h.cc.NodeDownTime.AbnormalityQL)
@@ -77,7 +77,7 @@ func (h *Horuser) DownTimeNodes(clusterName, addr string) {
res, err := h.InstantQuery(addr, ql, clusterName,
h.cc.NodeDownTime.PromQueryTimeSecond)
if err != nil {
klog.Errorf("downtimeNodes InstantQuery err:%v", err)
- klog.Infof("clusterName:%v", clusterName)
+ klog.Infof("clusterName:%v\n", clusterName)
continue
}
@@ -161,10 +161,10 @@ func (h *Horuser) DownTimeNodes(clusterName, addr string)
{
write.FirstDate = firstDate
_, err = write.Add()
if err != nil {
- klog.Errorf("DownTimeNodes abnormal cordonNode
AddOrGetOne err:%v", err)
+ klog.Errorf("DownTimeNodes abnormal cordonNode AddOrGet
err:%v", err)
klog.Infof("clusterName:%v nodeName:%v", clusterName,
nodeName)
}
- klog.Info("DownTimeNodes abnormal cordonNode AddOrGetOne
success.")
+ klog.Info("DownTimeNodes abnormal cordonNode AddOrGet success.")
klog.Infof("clusterName:%v nodeName:%v", clusterName, nodeName)
}
}
diff --git a/app/horus/core/horuser/node_drain.go
b/app/horus/core/horuser/node_drain.go
index ff098b8f..fd01562e 100644
--- a/app/horus/core/horuser/node_drain.go
+++ b/app/horus/core/horuser/node_drain.go
@@ -26,8 +26,8 @@ import (
func (h *Horuser) Drain(nodeName, clusterName string) (err error) {
kubeClient := h.kubeClientMap[clusterName]
if kubeClient == nil {
- klog.Errorf("node Drain kubeClient by clusterName empty.")
- klog.Infof("nodeName:%v,clusterName:%v", nodeName, clusterName)
+ klog.Error("node Drain kubeClient by clusterName empty.")
+ klog.Infof("nodeName:%v\n,clusterName:%v\n", nodeName,
clusterName)
return err
}
@@ -37,12 +37,13 @@ func (h *Horuser) Drain(nodeName, clusterName string) (err
error) {
var podNamespace string
pod, err := kubeClient.CoreV1().Pods(podNamespace).List(ctxFirst,
listOpts)
if err != nil {
- klog.Errorf("node Drain err:%v nodeName:%v clusterName:%v",
err, nodeName, clusterName)
+ klog.Errorf("node Drain err:%v", err)
+ klog.Infof("nodeName:%v\n clusterName:%v\n", nodeName,
clusterName)
return err
}
if len(pod.Items) == 0 {
- klog.Errorf("Cannot find pod on node.")
- klog.Infof("nodeName:%v,clusterName:%v", nodeName, clusterName)
+ klog.Error("Unable to find pod on node..")
+ klog.Infof("nodeName:%v,clusterName:%v\n", nodeName,
clusterName)
}
count := len(pod.Items)
for items, pods := range pod.Items {
@@ -53,18 +54,18 @@ func (h *Horuser) Drain(nodeName, clusterName string) (err
error) {
break
}
}
- klog.Errorf("node Drain evict pod result items:%d count:%v
nodeName:%v clusterName:%v podName:%v podNamespace:%v", items+1, count,
nodeName, clusterName, pods.Name, pods.Namespace)
+ klog.Errorf("node Drain evict pod result items:%d count:%v
nodeName:%v\n clusterName:%v\n podName:%v\n podNamespace:%v\n", items+1, count,
nodeName, clusterName, pods.Name, pods.Namespace)
if ds {
continue
}
err = h.Evict(pods.Name, pods.Namespace, clusterName)
if err != nil {
- klog.Errorf("node Drain evict pod err:%v items:%d
count:%v nodeName:%v clusterName:%v podName:%v podNamespace:%v", err, items+1,
count, nodeName, clusterName, pods.Name, pods.Namespace)
+ klog.Errorf("node Drain evict pod err:%v items:%d
count:%v nodeName:%v\n clusterName:%v\n podName:%v\n podNamespace:%v\n", err,
items+1, count, nodeName, clusterName, pods.Name, pods.Namespace)
return err
}
err = h.Finalizer(clusterName, pods.Name, pods.Namespace)
if err != nil {
- klog.Errorf("node Drain finalizer pod err:%v items:%d
count:%v nodeName:%v clusterName:%v podName:%v podNamespace:%v", err, items+1,
count, nodeName, clusterName, pods.Name, pods.Namespace)
+ klog.Errorf("node Drain finalizer pod err:%v items:%d
count:%v nodeName:%v\n clusterName:%v\n podName:%v\n podNamespace:%v\n", err,
items+1, count, nodeName, clusterName, pods.Name, pods.Namespace)
return err
}
diff --git a/app/horus/core/horuser/node_modular.go
b/app/horus/core/horuser/node_modular.go
index 6ad3beba..162fbfc7 100644
--- a/app/horus/core/horuser/node_modular.go
+++ b/app/horus/core/horuser/node_modular.go
@@ -36,7 +36,8 @@ func (h *Horuser) CustomizeModular(ctx context.Context) {
var wg sync.WaitGroup
for clusterName, addr := range h.cc.PromMultiple {
if _, exists := h.cc.CustomModular.KubeMultiple[clusterName];
!exists {
- klog.Infof("CustomizeModular config disable
clusterName: %v", clusterName)
+ klog.Info("CustomizeModular config disable.")
+ klog.Infof("clusterName: %v\n", clusterName)
continue
}
wg.Add(1)
@@ -50,12 +51,12 @@ func (h *Horuser) CustomizeModular(ctx context.Context) {
func (h *Horuser) CustomizeModularOnCluster(clusterName, addr string) {
klog.Infof("CustomizeModularOnCluster Start clusterName:%v",
clusterName)
- for moduleName, checkql := range h.cc.CustomModular.AbnormalityQL {
- ql := checkql
+ for moduleName, abnormalityQL := range h.cc.CustomModular.AbnormalityQL
{
+ ql := abnormalityQL
vecs, err := h.InstantQuery(addr, ql, clusterName,
h.cc.CustomModular.PromQueryTimeSecond)
if err != nil {
klog.Errorf("CustomizeModularOnCluster InstantQuery
err:%v", err)
- klog.Infof("clusterName:%v ql: %v", clusterName, ql)
+ klog.Infof("clusterName:%v abnormalityQL: %v",
clusterName, ql)
return
}
count := len(vecs)
@@ -100,19 +101,19 @@ func (h *Horuser) CustomizeModularNodes(clusterName,
moduleName, nodeName, ip st
pass, _ := write.Check()
if pass {
- klog.Infof("CustomizeModularNodes already existing
clusterName:%v nodeName:%v moduleName:%v", clusterName, nodeName, moduleName)
+ klog.Infof("CustomizeModularNodes already existing
clusterName:%v\n nodeName:%v\n moduleName:%v\n", clusterName, nodeName,
moduleName)
return
}
_, err = write.AddOrGet()
if err != nil {
klog.Errorf("CustomizeModularNodes AddOrGet err:%v", err)
- klog.Infof("moduleName:%v nodeName:%v", moduleName,
write.NodeName)
+ klog.Infof("moduleName:%v nodeName:%v\n", moduleName,
write.NodeName)
}
res := "Success"
if err != nil {
- res = fmt.Sprintf("failed:%v", err)
+ res = fmt.Sprintf("result failed:%v", err)
klog.Errorf("Cordon failed:%v", res)
}
msg := fmt.Sprintf("\n【集群:%v】\n【发现 %s 达到禁止调度条件】\n【禁止调度节点:%v】\n 【处理结果:
%v】\n 【今日操作次数:%v】\n",
@@ -129,5 +130,6 @@ func (h *Horuser) CustomizeModularNodes(clusterName,
moduleName, nodeName, ip st
return
}
- klog.Infof("CustomizeModularNodes AddOrGet success moduleName:%v
nodeName:%v", moduleName, write.NodeName)
+ klog.Infof("CustomizeModularNodes AddOrGet success.")
+ klog.Infof("moduleName:%v nodeName:%v\n", moduleName, write.NodeName)
}
diff --git a/app/horus/core/horuser/node_uncordon.go
b/app/horus/core/horuser/node_uncordon.go
index f9fe7aef..b6f9cc17 100644
--- a/app/horus/core/horuser/node_uncordon.go
+++ b/app/horus/core/horuser/node_uncordon.go
@@ -23,8 +23,8 @@ import (
func (h *Horuser) UnCordon(nodeName, clusterName string) (err error) {
kubeClient := h.kubeClientMap[clusterName]
if kubeClient == nil {
- klog.Errorf("node UnCordon kubeClient by clusterName empty.")
- klog.Infof("nodeName:%v,clusterName:%v", nodeName, clusterName)
+ klog.Error("node UnCordon kubeClient by clusterName empty.")
+ klog.Infof("nodeName:%v\n,clusterName:%v\n", nodeName,
clusterName)
return err
}
@@ -32,22 +32,22 @@ func (h *Horuser) UnCordon(nodeName, clusterName string)
(err error) {
defer cancelFirst()
node, err := kubeClient.CoreV1().Nodes().Get(ctxFirst, nodeName,
v1.GetOptions{})
if err != nil {
- klog.Errorf("node UnCordon get err nodeName:%v clusterName:%v",
nodeName, clusterName)
+ klog.Errorf("node UnCordon get err:%v", err)
+ klog.Infof("nodeName:%v\n clusterName:%v\n", nodeName,
clusterName)
return err
}
node.Spec.Unschedulable = false
- //if node.Spec.Unschedulable != true {
- // klog.Infof("Node %v is already uncordoned.", nodeName)
- // return
- //}
+
ctxSecond, cancelSecond := h.GetK8sContext()
defer cancelSecond()
node, err = kubeClient.CoreV1().Nodes().Update(ctxSecond, node,
v1.UpdateOptions{})
if err != nil {
- klog.Errorf("node UnCordon update err nodeName:%v
clusterName:%v", nodeName, clusterName)
+ klog.Errorf("node UnCordon update err:%v", err)
+ klog.Infof("nodeName:%v\n clusterName:%v\n", nodeName,
clusterName)
return err
}
- klog.Infof("node UnCordon success nodeName:%v clusterName:%v",
nodeName, clusterName)
+ klog.Info("node UnCordon success.")
+ klog.Infof("nodeName:%v\n clusterName:%v\n", nodeName, clusterName)
return nil
}
diff --git a/app/horus/core/horuser/pod_evict.go
b/app/horus/core/horuser/pod_evict.go
index 6b147bc2..3b63de81 100644
--- a/app/horus/core/horuser/pod_evict.go
+++ b/app/horus/core/horuser/pod_evict.go
@@ -23,8 +23,8 @@ import (
func (h *Horuser) Evict(podName, podNamespace, clusterName string) (err error)
{
kubeClient := h.kubeClientMap[clusterName]
if kubeClient == nil {
- klog.Errorf("pod Evict kubeClient by clusterName empty.")
- klog.Infof("podName:%v podNamespace:%v clusterName:%v",
podName, podNamespace, clusterName)
+ klog.Error("pod Evict kubeClient by clusterName empty.")
+ klog.Infof("podName:%v\n podNamespace:%v\n clusterName:%v\n",
podName, podNamespace, clusterName)
return err
}
@@ -32,7 +32,8 @@ func (h *Horuser) Evict(podName, podNamespace, clusterName
string) (err error) {
defer cancelFirst()
_, err = kubeClient.CoreV1().Pods(podNamespace).Get(ctxFirst, podName,
v1.GetOptions{})
if err != nil {
- klog.Errorf("pod Evict get err clusterName:%v podName:%v
podNamespace:%v", clusterName, podName, podNamespace)
+ klog.Errorf("pod Evict get err:%v", err)
+ klog.Infof("clusterName:%v\n podName:%v\n podNamespace:%v\n",
clusterName, podName, podNamespace)
return err
}
ctxSecond, cancelSecond := h.GetK8sContext()
@@ -44,10 +45,12 @@ func (h *Horuser) Evict(podName, podNamespace, clusterName
string) (err error) {
PropagationPolicy: &propagationPolicy,
})
if err != nil {
- klog.Errorf("pod Evict delete err clusterName:%v podName:%v
podNamespace:%v", clusterName, podName, podNamespace)
+ klog.Error("pod Evict delete failed err:%v", err)
+ klog.Infof("clusterName:%v\n podName:%v\n podNamespace:%v\n",
clusterName, podName, podNamespace)
return err
}
- klog.Infof("pod Evict delete success clusterName:%v podName:%v
podNamespace:%v", clusterName, podName, podNamespace)
+ klog.Info("pod Evict delete success.")
+ klog.Infof("clusterName:%v\n podName:%v\n podNamespace:%v\n",
clusterName, podName, podNamespace)
return nil
}
diff --git a/app/horus/core/horuser/pod_remove.go
b/app/horus/core/horuser/pod_remove.go
index 18448f43..91251bb2 100644
--- a/app/horus/core/horuser/pod_remove.go
+++ b/app/horus/core/horuser/pod_remove.go
@@ -32,8 +32,8 @@ type RemoveJsonValue struct {
func (h *Horuser) Finalizer(clusterName, podName, podNamespace string) error {
kubeClient := h.kubeClientMap[clusterName]
if kubeClient == nil {
- klog.Errorf("Finalizer kubeClient by clusterName empty.")
- klog.Infof("clusterName:%v podName:%v", clusterName, podName)
+ klog.Error("Finalizer kubeClient by clusterName empty.")
+ klog.Infof("clusterName:%v\n podName:%v\n", clusterName,
podName)
return nil
}
finalizer := RemoveJsonValue{
@@ -67,11 +67,11 @@ func (h *Horuser) Terminating(clusterName string, oldPod
*corev1.Pod) bool {
return true
}
-func (h *Horuser) Fetch(clusterName, fieldSelector string) ([]corev1.Pod,
error) {
+func (h *Horuser) Retrieve(clusterName, fieldSelector string) ([]corev1.Pod,
error) {
kubeClient := h.kubeClientMap[clusterName]
if kubeClient == nil {
- klog.Errorf("Fetch kubeClient by clusterName empty.")
- klog.Infof("clusterName:%v", clusterName)
+ klog.Error("Retrieve kubeClient by clusterName empty.")
+ klog.Infof("clusterName:%v\n", clusterName)
return nil, nil
}
ctx, cancel := h.GetK8sContext()
@@ -79,8 +79,8 @@ func (h *Horuser) Fetch(clusterName, fieldSelector string)
([]corev1.Pod, error)
list := v1.ListOptions{FieldSelector: fieldSelector}
pods, err := kubeClient.CoreV1().Pods("").List(ctx, list)
if err != nil {
- klog.Errorf("Fetch list pod err:%v", err)
- klog.Infof("clusterName:%v fieldSelector:%v", clusterName,
fieldSelector)
+ klog.Errorf("Retrieve list pod err:%v", err)
+ klog.Infof("clusterName:%v\n fieldSelector:%v", clusterName,
fieldSelector)
}
return pods.Items, err
}
diff --git a/app/horus/core/horuser/pod_stagnation.go
b/app/horus/core/horuser/pod_stagnation.go
index 45ce344f..0f648c16 100644
--- a/app/horus/core/horuser/pod_stagnation.go
+++ b/app/horus/core/horuser/pod_stagnation.go
@@ -53,15 +53,15 @@ func (h *Horuser) PodStagnationClean(ctx context.Context) {
}
func (h *Horuser) PodsOnCluster(clusterName string) {
- pods, err := h.Fetch(clusterName,
h.cc.PodStagnationCleaner.FieldSelector)
+ pods, err := h.Retrieve(clusterName,
h.cc.PodStagnationCleaner.FieldSelector)
if err != nil {
- klog.Errorf("Failed to fetch pods on cluster:%v", err)
- klog.Infof("clusterName:%v", clusterName)
+ klog.Errorf("Failed to retrieve pods on err:%v", err)
+ klog.Infof("clusterName:%v\n", clusterName)
return
}
count := len(pods)
if count == 0 {
- klog.Infof("PodsOnCluster no abnomal clusterName:%v",
clusterName)
+ klog.Infof("PodsOnCluster no abnomal clusterName:%v\n",
clusterName)
return
}
wp := workerpool.New(10)
@@ -86,7 +86,7 @@ func (h *Horuser) PodSingle(pod corev1.Pod, clusterName
string) {
if len(pod.Finalizers) > 0 {
time.Sleep(time.Duration(h.cc.PodStagnationCleaner.DoubleSecond) * time.Second)
if !h.Terminating(clusterName, &pod) {
- klog.Infof("Pod %s is still terminating,
skipping.", pod.Name)
+ klog.Infof("Pod %s is still terminating
skipping.", pod.Name)
return
}
err := h.Finalizer(clusterName, pod.Name, pod.Namespace)
@@ -102,14 +102,14 @@ func (h *Horuser) PodSingle(pod corev1.Pod, clusterName
string) {
if len(pod.Finalizers) == 0 && pod.Name != "" {
err := h.Evict(pod.Name, pod.Namespace, clusterName)
if err != nil {
- klog.Errorf("Failed to evict pod %s: %v", pod.Name, err)
+ klog.Errorf("Failed to evict pod %s err:%v", pod.Name,
err)
return
}
klog.Infof("Evicted pod %s successfully", pod.Name)
}
res := "Success"
if err != nil {
- res = fmt.Sprintf("failed:%v", err)
+ res = fmt.Sprintf("result failed:%v", err)
}
today := time.Now().Format("2006-01-02")
msg := fmt.Sprintf("\n【集群：%v】\n【Pod：%v】\n【Namespace：%v】\n【清除
finalizer:%v】\n", clusterName, pod.Name, pod.Namespace, res)
@@ -125,6 +125,5 @@ func (h *Horuser) PodSingle(pod corev1.Pod, clusterName
string) {
}
_, err = write.AddOrGet()
klog.Errorf("write AddOrGet err:%v", err)
- klog.Infof("podName:%v", pod.Name)
return
}
diff --git a/app/horus/core/horuser/query.go b/app/horus/core/horuser/query.go
index 1b1114b7..3147cdd6 100644
--- a/app/horus/core/horuser/query.go
+++ b/app/horus/core/horuser/query.go
@@ -27,13 +27,13 @@ import (
func (h *Horuser) InstantQuery(address, ql, clusterName string,
timeWindowsSecond int64) (model.Vector, error) {
client, err := apiV1.NewClient(apiV1.Config{Address: address})
if err != nil {
- klog.Errorf("prometheus InstantQuery creating NewClient
error:%v", err)
+ klog.Errorf("InstantQuery creating NewClient err:%v", err)
return nil, err
}
promClient := h.cc.PromMultiple[clusterName]
if promClient == "" && address == "" {
- klog.Errorf("prometheus get PromMultiple empty")
- klog.Infof("clusterName:%v ql:%v", clusterName, ql)
+ klog.Error("PromMultiple empty.")
+ klog.Infof("clusterName:%v\n ql:%v", clusterName, ql)
return nil, err
}
