zhangweiii
/
pcm-hpc
forked from JointCloud/pcm-hpc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

停止提交作业

This commit is contained in:
zhangwei 2024-11-06 19:06:03 +08:00
parent c6d63a3131
commit fd72bcb7e8
3 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cron/task_status.go
View File

@ -1,10 +1,26 @@
package cron
func updateTaskStatus() {
//// 从core端获取任务信息
//httpClient := resty.New().R()
//
//result, _ := httpClient.SetHeader("Content-Type", "application/json").
//result, err := httpClient.SetHeader("Content-Type", "application/json").
// SetQueryParam("adapterId", strconv.FormatInt(AdapterId, 10)).
// Get(CoreUrl + "/pcm/v1/hpc/job")
//var hpcJobResp coreClient.HpcInfo
// Get(CoreUrl + "/pcm/v1/core/pullTaskInfo")
//if err != nil {
// return
//}
//var resp coreClient.PullTaskInfoResp
//err = json.Unmarshal(result.Body(), &resp)
//if err != nil {
// return
//}
//if resp.HpcInfoList != nil && len(resp.HpcInfoList) != 0 {
// for _, slurmClient := range cronPCM.SlurmClients {
// job, err := slurmClient.Job(slurm.JobOptions{})
// if err != nil {
// return
// }
// job.ListDbJob()
// }
//}
}

21
cron/taskcron.go
View File

@ -84,27 +84,6 @@ func PullTaskInfo() {
clientInfo, _ := slurmClient.GetClientInfo()
clientClusterId, _ := strconv.Atoi(clientInfo.ClusterId)
if hpcInfo.ClusterId == int64(clientClusterId) {
jober, _ := slurmClient.Job(slurm.JobOptions{})
submitReq := slurm.JobOptions{
Script: hpcInfo.CmdScript,
Job: &slurm.JobProperties{
Account: hpcInfo.Account,
Name: hpcInfo.Name,
NTasks: 1,
CurrentWorkingDirectory: hpcInfo.WorkDir,
Partition: hpcInfo.Partition,
Environment: map[string]string{"PATH": "/volume/home/nudt_ysz/intel/oneapi/vtune/2024.2/bin64:/volume/home/nudt_ysz/intel/oneapi/mpi/2021.13/bin:/volume/home/nudt_ysz/intel/oneapi/mkl/2024.2/bin/:/volume/home/nudt_ysz/intel/oneapi/dpcpp-ct/2024.2/bin:/volume/home/nudt_ysz/intel/oneapi/dev-utilities/2024.2/bin:/volume/home/nudt_ysz/intel/oneapi/debugger/2024.2/opt/debugger/bin:/volume/home/nudt_ysz/intel/oneapi/compiler/2024.2/bin:/volume/home/nudt_ysz/intel/oneapi/advisor/2024.2/bin64:/volume/software/app/Miniconda3-py39/bin:/volume/software/app/Miniconda3-py39/condabin:/volume/software/app/modules-5.4.0/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin",
"LD_LIBRARY_PATH": "/volume/home/nudt_ysz/intel/oneapi/tbb/2021.13/env/../lib/intel64/gcc4.8:/volume/home/nudt_ysz/intel/oneapi/mpi/2021.13/opt/mpi/libfabric/lib:/volume/home/nudt_ysz/intel/oneapi/mpi/2021.13/lib:/volume/home/nudt_ysz/intel/oneapi/mkl/2024.2/lib:/volume/home/nudt_ysz/intel/oneapi/ippcp/2021.12/lib/:/volume/home/nudt_ysz/intel/oneapi/ipp/2021.12/lib:/volume/home/nudt_ysz/intel/oneapi/dpl/2022.6/lib:/volume/home/nudt_ysz/intel/oneapi/dnnl/2024.2/lib:/volume/home/nudt_ysz/intel/oneapi/debugger/2024.2/opt/debugger/lib:/volume/home/nudt_ysz/intel/oneapi/dal/2024.6/lib:/volume/home/nudt_ysz/intel/oneapi/compiler/2024.2/opt/compiler/lib:/volume/home/nudt_ysz/intel/oneapi/compiler/2024.2/lib:/volume/home/nudt_ysz/intel/oneapi/ccl/2021.13/lib/"},
},
}
submitReq.Job.StandardOutput = submitReq.Job.CurrentWorkingDirectory + "/%j.out"
submitReq.Job.StandardError = submitReq.Job.CurrentWorkingDirectory + "/%j.err"
submitJobResp, err := jober.SubmitJob(submitReq)
if err != nil {
log.Print(err)
continue
}
hpcInfo.JobId = strconv.Itoa(submitJobResp.JobId)
oldHpcInfoList = append(oldHpcInfoList, *hpcInfo)
hpcInfo.Status = "Running"
}

8
slurm/job_impl.go
View File

@ -27,14 +27,18 @@ func newJob(client *client, options *JobOptions) (*job, error) {
}
return job, nil
}
func (j *job) ListJob() string {
func (j *job) ListJob() (getJobResp GetJobResp, err error) {
httpClient := resty.New().R()
result, _ := httpClient.SetHeader("Content-Type", "application/json").
SetHeader("X-SLURM-USER-NAME", j.client.restUsername).
SetHeader("X-SLURM-USER-TOKEN", j.client.token).
Get(j.client.url + "/slurm/" + j.client.clientVersion + "/jobs")
return result.String()
json.Unmarshal(result.Body(), &getJobResp)
if len(getJobResp.Errors) > 0 {
return getJobResp, errors.New(getJobResp.Errors[0].Error)
}
return getJobResp, nil
}
func (j *job) GetJob(getJobReq GetJobReq) (getJobResp GetJobResp, err error) {