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

[ Agent ] [ App ] - fix mysql init bugs - 4

Browse Source
This commit is contained in:
zeaslity
2023-11-28 11:37:40 +08:00
parent 7d6a6d50a0
commit d9cec27b6f
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -508,6 +508,11 @@ func (op *AgentOsOperator) loadMysqlInitScript(funcArgs []string) (bool, []strin
log.DebugF("[loadMysqlInitScript] - start to load jackeyLove file from %s", jackeyLove) log.DebugF("[loadMysqlInitScript] - start to load jackeyLove file from %s", jackeyLove)
jackeyLoveLocalPrefix := "/root/wdd/jackeylove/" jackeyLoveLocalPrefix := "/root/wdd/jackeylove/"
PureResultSingleExecute([]string{
"rm",
"-f",
jackeyLoveLocalPrefix,
})
BasicCreateFolder(jackeyLoveLocalPrefix) BasicCreateFolder(jackeyLoveLocalPrefix)
jackeyLoveFolder := strings.Split(jackeyLove, ".tar")[0] jackeyLoveFolder := strings.Split(jackeyLove, ".tar")[0]
@@ -546,7 +551,12 @@ func (op *AgentOsOperator) loadMysqlInitScript(funcArgs []string) (bool, []strin
// sort for numeric order // sort for numeric order
sortFileNames(jackeyLoveFileList) sortFileNames(jackeyLoveFileList)
log.InfoF("[loadMysqlInitScript] - all jackey love files are => %v", jackeyLoveFileList) var jackeyLoveFileAbsolutePath []string
for _, jackeyLoveFile := range jackeyLoveFileList {
jackeyLoveFileAbsolutePath = append(jackeyLoveFileAbsolutePath, jackeyLoveLocalPrefix+jackeyLoveFile)
}
log.InfoF("[loadMysqlInitScript] - all jackey love files are => %v", jackeyLoveFileAbsolutePath)
// dispatch mysql execution command // dispatch mysql execution command
jackeyLoveIP := funcArgs[0] jackeyLoveIP := funcArgs[0]
@@ -556,14 +566,13 @@ func (op *AgentOsOperator) loadMysqlInitScript(funcArgs []string) (bool, []strin
"[loadMysqlInitScript]- ip config error ！", "[loadMysqlInitScript]- ip config error ！",
} }
} }
load, result := MysqlSqlFileLoad(jackeyLoveIP, jackeyLoveFileList) load, result := MysqlSqlFileLoad(jackeyLoveIP, jackeyLoveFileAbsolutePath)
if !load { if !load {
return false, result return false, result
} }
return true, []string{ return true, append(jackeyLoveFileAbsolutePath, "[loadMysqlInitScript] - execute success !")
"[loadMysqlInitScript] - execute success !",
}
} }
func sortFileNames(fileNames []string) { func sortFileNames(fileNames []string) {