From 58047df50b7685875c12db57ea265e634bdd201a Mon Sep 17 00:00:00 2001 From: zeaslity Date: Wed, 22 Nov 2023 09:24:10 +0800 Subject: [PATCH] [ Agent ] [ Base ] - nfs-server bug fixs --- agent-go/executor/AppFunction.go | 2 +- agent-go/executor/K8sFunction.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/agent-go/executor/AppFunction.go b/agent-go/executor/AppFunction.go index 72ba807..2464571 100644 --- a/agent-go/executor/AppFunction.go +++ b/agent-go/executor/AppFunction.go @@ -365,7 +365,7 @@ func (op *AgentOsOperator) deployTestNFS(funcArgs []string) (bool, []string) { result = append(result, "NFS 文件写入 异常！！") } - if !CheckPodStatusTimeout("test-pod ", "default", 30) { + if !CheckPodStatusTimeout("test-pod", "default", 30) { return false, []string{ "[deployTestNFS] - test pod create failed !", } diff --git a/agent-go/executor/K8sFunction.go b/agent-go/executor/K8sFunction.go index 1c6f23a..eec51cd 100644 --- a/agent-go/executor/K8sFunction.go +++ b/agent-go/executor/K8sFunction.go @@ -77,14 +77,14 @@ func CheckPodStatusTimeout(specificPod string, supreme string, waitTimeOut int) for { select { case <-timeout: - log.ErrorF("[CheckPodStatusTimeout] - 命名空间: %s, Pod名称: %s, 状态: 失败!\n", supreme, specificPod) + log.ErrorF("[CheckPodStatusTimeout] - 命名空间: [%s], Pod名称: [%s], 状态: 失败!\n", supreme, specificPod) return false case <-tick: pod, err := k8sClient.CoreV1().Pods(supreme).Get(context.TODO(), specificPod, metav1.GetOptions{}) if err != nil { - log.ErrorF("[CheckPodStatusTimeout] - 获取Pod信息失败: %v\n", err) + log.ErrorF("[CheckPodStatusTimeout] - 获取Pod信息失败: %s", err.Error()) } else { - log.DebugF("[CheckPodStatusTimeout] - 命名空间: %s, Pod名称: %s, 状态: %s\n", supreme, pod.Name, pod.Status.Phase) + log.DebugF("[CheckPodStatusTimeout] - 命名空间: [%s], Pod名称: [%s], 状态: [%s]\n", supreme, pod.Name, pod.Status.Phase) if pod.Status.Phase == corev1.PodRunning || pod.Status.Phase == corev1.PodSucceeded { return true }