diff --git a/adaptor/PCM-HPC/PCM-AC/rpc/internal/logic/cronlogic.go b/adaptor/PCM-HPC/PCM-AC/rpc/internal/logic/cronlogic.go index 01e5f279..32f646e1 100644 --- a/adaptor/PCM-HPC/PCM-AC/rpc/internal/logic/cronlogic.go +++ b/adaptor/PCM-HPC/PCM-AC/rpc/internal/logic/cronlogic.go @@ -14,12 +14,12 @@ func InitCron(svc *svc.ServiceContext) { submitJobLogic := NewSubmitJobLogic(context.Background(), svc) listLogic := NewListJobLogic(context.Background(), svc) svc.Cron.AddFunc("*/5 * * * * ?", func() { - syncInfoReq := pcmcoreclient.SyncInfoReq{ + // 查询core端分发下来的任务列表 + infoReq := pcmcoreclient.InfoListReq{ Kind: "hpc", ServiceName: "ac", } - // 查询core端分发下来的任务列表 - infoList, err := queryCoreInfoList(svc) + infoList, err := svc.PcmCoreRpc.InfoList(context.Background(), &infoReq) if err != nil { logx.Error(err) return @@ -27,8 +27,7 @@ func InitCron(svc *svc.ServiceContext) { // 提交任务 submitJob(infoList, submitJobLogic) // 查询运行中的任务列表同步信息 - listReq := hpcAC.ListJobReq{} - listJob, err := listLogic.ListJob(&listReq) + listJob, err := listLogic.ListJob(&hpcAC.ListJobReq{}) if err != nil { logx.Error(err) return @@ -45,7 +44,11 @@ func InitCron(svc *svc.ServiceContext) { } // 同步信息到core端 if len(infoList.HpcInfoList) != 0 { - syncInfoReq.HpcInfoList = infoList.HpcInfoList + syncInfoReq := pcmcoreclient.SyncInfoReq{ + Kind: "hpc", + ServiceName: "ac", + HpcInfoList: infoList.HpcInfoList, + } svc.PcmCoreRpc.SyncInfo(context.Background(), &syncInfoReq) } }) @@ -77,21 +80,9 @@ func submitJob(infoList *pcmcoreclient.InfoListResp, submitJobLogic *SubmitJobLo infoList.HpcInfoList[index].Status = "Pending" infoList.HpcInfoList[index].JobId = jobResult.Data } else { - infoList.HpcInfoList[index].Result = "Failed" + infoList.HpcInfoList[index].Status = "Failed" infoList.HpcInfoList[index].Result = jobResult.Msg } } } } - -func queryCoreInfoList(svc *svc.ServiceContext) (*pcmcoreclient.InfoListResp, error) { - infoReq := pcmcoreclient.InfoListReq{ - Kind: "hpc", - ServiceName: "ac", - } - infoList, err := svc.PcmCoreRpc.InfoList(context.Background(), &infoReq) - if err != nil { - return nil, err - } - return infoList, nil -} diff --git a/adaptor/PCM-HPC/PCM-TH/rpc/internal/logic/cronlogic.go b/adaptor/PCM-HPC/PCM-TH/rpc/internal/logic/cronlogic.go index c966cb41..7b754721 100644 --- a/adaptor/PCM-HPC/PCM-TH/rpc/internal/logic/cronlogic.go +++ b/adaptor/PCM-HPC/PCM-TH/rpc/internal/logic/cronlogic.go @@ -16,12 +16,12 @@ func InitCron(svc *svc.ServiceContext) { submitJobLogic := NewSubmitJobLogic(context.Background(), svc) listLogic := NewListJobLogic(context.Background(), svc) svc.Cron.AddFunc("*/5 * * * * ?", func() { - syncInfoReq := pcmcoreclient.SyncInfoReq{ + // 查询core端分发下来的任务列表 + infoReq := pcmcoreclient.InfoListReq{ Kind: "hpc", ServiceName: "th", } - // 查询core端分发下来的任务列表 - infoList, err := queryCoreInfoList(svc) + infoList, err := svc.PcmCoreRpc.InfoList(context.Background(), &infoReq) if err != nil { logx.Error(err) return @@ -40,14 +40,18 @@ func InitCron(svc *svc.ServiceContext) { if job.Name == infoList.HpcInfoList[index].Name { infoList.HpcInfoList[index].JobId = strconv.Itoa(int(job.JobId)) infoList.HpcInfoList[index].StartTime = time.Unix(job.StartTime, 0).String() - infoList.HpcInfoList[index].RunningTime = time.Now().Sub(time.Unix(job.StartTime, 0)).Milliseconds() + infoList.HpcInfoList[index].RunningTime = int64(time.Now().Sub(time.Unix(job.StartTime, 0)).Seconds()) infoList.HpcInfoList[index].Status = enum.State(job.JobState).String() } } } // 同步信息到core端 if len(infoList.HpcInfoList) != 0 { - syncInfoReq.HpcInfoList = infoList.HpcInfoList + syncInfoReq := pcmcoreclient.SyncInfoReq{ + Kind: "hpc", + ServiceName: "th", + HpcInfoList: infoList.HpcInfoList, + } svc.PcmCoreRpc.SyncInfo(context.Background(), &syncInfoReq) } }) @@ -68,15 +72,3 @@ func submitJob(infoList *pcmcoreclient.InfoListResp, submitJobLogic *SubmitJobLo } } } - -func queryCoreInfoList(svc *svc.ServiceContext) (*pcmcoreclient.InfoListResp, error) { - infoReq := pcmcoreclient.InfoListReq{ - Kind: "hpc", - ServiceName: "th", - } - infoList, err := svc.PcmCoreRpc.InfoList(context.Background(), &infoReq) - if err != nil { - return nil, err - } - return infoList, nil -} diff --git a/adaptor/PCM-K8S/PCM-K8S-NATIVE/rpc/internal/logic/cronlogic.go b/adaptor/PCM-K8S/PCM-K8S-NATIVE/rpc/internal/logic/cronlogic.go index 999f79a0..eb21284a 100644 --- a/adaptor/PCM-K8S/PCM-K8S-NATIVE/rpc/internal/logic/cronlogic.go +++ b/adaptor/PCM-K8S/PCM-K8S-NATIVE/rpc/internal/logic/cronlogic.go @@ -14,11 +14,6 @@ import ( func InitCron(svc *svc.ServiceContext) { svc.Cron.AddFunc("*/5 * * * * ?", func() { - SyncInfoReq := pcmcoreclient.SyncInfoReq{ - Kind: "cloud", - ServiceName: "kubeNative", - } - // 查询core端分发下来的任务列表 infoReq := pcmcoreclient.InfoListReq{ Kind: "cloud", @@ -68,8 +63,15 @@ func InitCron(svc *svc.ServiceContext) { } } } - // 同步信息到core端 - SyncInfoReq.CloudInfoList = infoList.CloudInfoList - svc.PcmCoreRpc.SyncInfo(context.Background(), &SyncInfoReq) + if len(infoList.CloudInfoList) != 0 { + // 同步信息到core端 + SyncInfoReq := pcmcoreclient.SyncInfoReq{ + Kind: "cloud", + ServiceName: "kubeNative", + CloudInfoList: infoList.CloudInfoList, + } + svc.PcmCoreRpc.SyncInfo(context.Background(), &SyncInfoReq) + } + }) }