zeaslity/ProjectOctopus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ Agent ] [ Base ] - nfs-server bug fixs

Browse Source
This commit is contained in:
zeaslity
2023-11-22 09:24:10 +08:00
parent 86be29cb74
commit 58047df50b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
agent-go/executor/AppFunction.go
View File

@@ -365,7 +365,7 @@ func (op *AgentOsOperator) deployTestNFS(funcArgs []string) (bool, []string) {
result = append(result, "NFS 文件写入 异常！！") result = append(result, "NFS 文件写入 异常！！")
} }
if !CheckPodStatusTimeout("test-pod ", "default", 30) { if !CheckPodStatusTimeout("test-pod", "default", 30) {
return false, []string{ return false, []string{
"[deployTestNFS] - test pod create failed !", "[deployTestNFS] - test pod create failed !",
} }

6
agent-go/executor/K8sFunction.go
View File

@@ -77,14 +77,14 @@ func CheckPodStatusTimeout(specificPod string, supreme string, waitTimeOut int)
for { for {
select { select {
case <-timeout: case <-timeout:
log.ErrorF("[CheckPodStatusTimeout] - 命名空间: %s, Pod名称: %s, 状态: 失败!\n", supreme, specificPod) log.ErrorF("[CheckPodStatusTimeout] - 命名空间: [%s], Pod名称: [%s], 状态: 失败!\n", supreme, specificPod)
return false return false
case <-tick: case <-tick:
pod, err := k8sClient.CoreV1().Pods(supreme).Get(context.TODO(), specificPod, metav1.GetOptions{}) pod, err := k8sClient.CoreV1().Pods(supreme).Get(context.TODO(), specificPod, metav1.GetOptions{})
if err != nil { if err != nil {
log.ErrorF("[CheckPodStatusTimeout] - 获取Pod信息失败: %v\n", err) log.ErrorF("[CheckPodStatusTimeout] - 获取Pod信息失败: %s", err.Error())
} else { } 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 { if pod.Status.Phase == corev1.PodRunning || pod.Status.Phase == corev1.PodSucceeded {
return true return true
} }