diff --git a/agent-go/executor/AppFunction.go b/agent-go/executor/AppFunction.go index bda9d6a..72ba807 100644 --- a/agent-go/executor/AppFunction.go +++ b/agent-go/executor/AppFunction.go @@ -312,6 +312,13 @@ func (op *AgentOsOperator) deployNFS(funcArgs []string) (bool, []string) { return false, strings } + // check running status + if !CheckDeploymentStatusTimeout("nfs-client-provisioner", "kube-system", 60) { + return false, []string{ + "[deployNFS] - nfs running error !", + } + } + // 成功启动 return true, []string{ "NFS部署成功!", @@ -354,14 +361,19 @@ func (op *AgentOsOperator) deployTestNFS(funcArgs []string) (bool, []string) { } // 测试文件是否存在 - if !BasicFileExists(nfsDataPath + "/test-pod*/NFS-CREATE-SUCCESS") { - result = append(result, "NFS 测试功能 异常!!") - return false, result + if !BasicFileExists(nfsDataPath + "/default-test-claim-pvc*/NFS-CREATE-SUCCESS") { + result = append(result, "NFS 文件写入 异常!!") + } + + if !CheckPodStatusTimeout("test-pod ", "default", 30) { + return false, []string{ + "[deployTestNFS] - test pod create failed !", + } } // 成功启动 return true, []string{ - "NFS 测试功能正常!", + "[deployTestNFS] - NFS 测试功能正常!", } } diff --git a/agent-go/executor/BasicFunction.go b/agent-go/executor/BasicFunction.go index 3c2d089..0bec954 100644 --- a/agent-go/executor/BasicFunction.go +++ b/agent-go/executor/BasicFunction.go @@ -399,7 +399,7 @@ func BasicAppendSourceToFile(sourceFile, targetFile string) bool { // 打开源文件 source, err := os.Open(sourceFile) if err != nil { - log.ErrorF("[BasicAppendSourceToFile] - error open source file => %s", sourceFile) + log.ErrorF("[BasicAppendSourceToFile] - error open source file => %s, error is %s", sourceFile, err.Error()) return false } defer source.Close() @@ -407,7 +407,7 @@ func BasicAppendSourceToFile(sourceFile, targetFile string) bool { // 打开目标文件,如果不存在则创建,如果存在则在末尾追加 target, err := os.OpenFile(targetFile, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644) if err != nil { - log.ErrorF("[BasicAppendSourceToFile] - error open target file => %s", sourceFile) + log.ErrorF("[BasicAppendSourceToFile] - error open target file => %s, error is %s", sourceFile, err.Error()) return false } defer target.Close() @@ -428,14 +428,14 @@ func BasicAppendContentToFile(content string, targetFile string) bool { // 打开文件用于追加。如果文件不存在,将会创建一个新文件。 file, err := os.OpenFile(targetFile, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644) if err != nil { - log.ErrorF("[BasicAppendContentToFile] - Error opening file: %s", err.Error()) + log.ErrorF("[BasicAppendContentToFile] - Error opening file: %s , error is %s", targetFile, err.Error()) return false } defer file.Close() // 确保文件最终被关闭 // 写入内容到文件 if _, err := file.WriteString(content); err != nil { - log.ErrorF("[BasicAppendContentToFile] - Error writing to file: %s", err.Error()) + log.ErrorF("[BasicAppendContentToFile] - Error writing to file: %s , error is %s", targetFile, err.Error()) return false } @@ -448,7 +448,7 @@ func BasicAppendNullToFile(targetFile string) bool { // 使用os.O_TRUNC清空文件内容 file, err := os.OpenFile(targetFile, os.O_TRUNC|os.O_WRONLY, 0644) if err != nil { - log.ErrorF("[BasicAppendNullToFile] - Error opening file: %s", err.Error()) + log.ErrorF("[BasicAppendNullToFile] - Error opening file: %s, error is %s", targetFile, err.Error()) return false } defer file.Close() // 确保在函数退出前关闭文件 diff --git a/agent-go/executor/FunctionalExecutor.go b/agent-go/executor/FunctionalExecutor.go index e339b4a..c3fc508 100644 --- a/agent-go/executor/FunctionalExecutor.go +++ b/agent-go/executor/FunctionalExecutor.go @@ -264,7 +264,7 @@ func HardCodeCommandExecutor(hardCodeCommand string) (bool, []string) { resultOk = false } - log.DebugF("hard code command of %v result are => %v", hardCodeCommand, resultSlice) + log.DebugF("hard code command of [ %s ] result are => %v", hardCodeCommand, resultSlice) return resultOk, resultSlice } diff --git a/agent-go/executor/K8sFunction.go b/agent-go/executor/K8sFunction.go index c59cb17..1c6f23a 100644 --- a/agent-go/executor/K8sFunction.go +++ b/agent-go/executor/K8sFunction.go @@ -85,7 +85,7 @@ func CheckPodStatusTimeout(specificPod string, supreme string, waitTimeOut int) log.ErrorF("[CheckPodStatusTimeout] - 获取Pod信息失败: %v\n", err) } else { log.DebugF("[CheckPodStatusTimeout] - 命名空间: %s, Pod名称: %s, 状态: %s\n", supreme, pod.Name, pod.Status.Phase) - if pod.Status.Phase == "Running" { + if pod.Status.Phase == corev1.PodRunning || pod.Status.Phase == corev1.PodSucceeded { return true } } diff --git a/server/src/main/java/io/wdd/func/auto/service/AppFuncScheduler.java b/server/src/main/java/io/wdd/func/auto/service/AppFuncScheduler.java index bee2162..6da99c9 100644 --- a/server/src/main/java/io/wdd/func/auto/service/AppFuncScheduler.java +++ b/server/src/main/java/io/wdd/func/auto/service/AppFuncScheduler.java @@ -95,7 +95,7 @@ public class AppFuncScheduler { List appFunctionEnumList = List.of( // AppFunctionEnum.DEPLOY_RKE - AppFunctionEnum.DEPLOY_K8S_DASHBOARD + AppFunctionEnum.DEPLOY_TEST_NFS ); diff --git a/server/src/main/java/io/wdd/func/auto/service/BaseFuncScheduler.java b/server/src/main/java/io/wdd/func/auto/service/BaseFuncScheduler.java index fa97d1c..ad19621 100644 --- a/server/src/main/java/io/wdd/func/auto/service/BaseFuncScheduler.java +++ b/server/src/main/java/io/wdd/func/auto/service/BaseFuncScheduler.java @@ -131,7 +131,7 @@ public class BaseFuncScheduler { } List masterNodeDurationTaskList = List.of( - BaseFunctionEnum.MODIFY_DOCKER_CONFIG + BaseFunctionEnum.INSTALL_NFS_SERVER_ONLINE // BaseFunctionEnum.INSTALL_DOCKER, // BaseFunctionEnum.INSTALL_DOCKER_COMPOSE, // BaseFunctionEnum.INSTALL_HARBOR