From 07bedcda4d95d8d509d2e99caeec7bbd42ee85f2 Mon Sep 17 00:00:00 2001
From: tzwang <wtz1003@sina.com>
Date: Tue, 31 Oct 2023 15:24:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=98=E7=AE=97=E8=81=94=E5=8A=A8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 0af7b90c9109000228f809ddd63ce133e97bbde0
---
 api/internal/storeLink/octopus.go    |  8 ++++++--
 api/internal/storeLink/shuguangai.go |  4 +---
 api/internal/storeLink/storeLink.go  | 15 ++++++++++-----
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/api/internal/storeLink/octopus.go b/api/internal/storeLink/octopus.go
index 157e7298..e20f56e6 100644
--- a/api/internal/storeLink/octopus.go
+++ b/api/internal/storeLink/octopus.go
@@ -5,8 +5,10 @@ import (
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/api/internal/svc"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/models"
 	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils"
+	"gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils/timeutils"
 	"gitlink.org.cn/jcce-pcm/pcm-participant-octopus/octopus"
 	"strings"
+	"time"
 )
 
 type OctopusLink struct {
@@ -20,7 +22,7 @@ type OctopusLink struct {
 const (
 	IMG_NAME_PREFIX    = "oct_"
 	IMG_VERSION_PREFIX = "version_"
-	TASK_NAME_PREFIX   = "trainJob_"
+	TASK_NAME_PREFIX   = "trainJob"
 	RESOURCE_POOL      = "common-pool"
 )
 
@@ -120,11 +122,13 @@ func (o *OctopusLink) SubmitTask(imageId string, cmd string, params []string, re
 		prms = append(prms, &p)
 	}
 
+	dateStr := timeutils.UnixTimeToString(time.Now().Unix())
+
 	req := &octopus.CreateTrainJobReq{
 		Platform: o.participant.Name,
 		Params: &octopus.CreateTrainJobParam{
 			ImageId:      imageId,
-			Name:         TASK_NAME_PREFIX + utils.RandomString(7),
+			Name:         TASK_NAME_PREFIX + UNDERSCORE + utils.RandomString(7) + UNDERSCORE + dateStr,
 			ResourcePool: RESOURCE_POOL,
 			Config: []*octopus.Config{
 				{
diff --git a/api/internal/storeLink/shuguangai.go b/api/internal/storeLink/shuguangai.go
index ef786cff..2383a015 100644
--- a/api/internal/storeLink/shuguangai.go
+++ b/api/internal/storeLink/shuguangai.go
@@ -23,8 +23,6 @@ const (
 	WORKER_NUMBER                   = 1
 	WORKER_CPU_NUMBER               = 5
 	WORKER_GPU_NUMBER               = 1
-	PY_PARAM_PREFIX                 = "--"
-	SPACE                           = " "
 	SHUGUANGAI_CUSTOM_RESOURCE_ID   = "WodTB2rJ8SobMgQ1nrtR245jxOrsovFi"
 	SHUGUANGAI_CUSTOM_RESOURCE_NAME = "1*DCU, CPU:5, 内存:10GB"
 )
@@ -87,7 +85,7 @@ func (s *ShuguangAi) SubmitTask(imageId string, cmd string, params []string, res
 
 	req := &hpcAC.SubmitPytorchTaskReq{
 		Params: &hpcAC.SubmitPytorchTaskParams{
-			TaskName:      TASK_PYTORCH_PREFIX + "_" + utils.RandomString(7) + dateStr,
+			TaskName:      TASK_PYTORCH_PREFIX + UNDERSCORE + utils.RandomString(7) + UNDERSCORE + dateStr,
 			WorkPath:      WorkPath,
 			IsDistributed: false,
 			IsHvd:         false,
diff --git a/api/internal/storeLink/storeLink.go b/api/internal/storeLink/storeLink.go
index e30d64f5..9e5376e6 100644
--- a/api/internal/storeLink/storeLink.go
+++ b/api/internal/storeLink/storeLink.go
@@ -25,6 +25,9 @@ type Linkage interface {
 }
 
 const (
+	PY_PARAM_PREFIX     = "--"
+	SPACE               = " "
+	UNDERSCORE          = "_"
 	COMMA               = ","
 	TYPE_OCTOPUS        = "1"
 	TYPE_MODELARTS      = "2"
@@ -248,11 +251,13 @@ func ConvertType[T any](in *T, participant *models.StorelinkCenter) (interface{}
 		inresp := (interface{})(in).(*hpcAC.GetPytorchTaskResp)
 		if inresp.Code == "0" {
 			resp.Success = true
-			resp.Task.TaskId = inresp.Data.Id
-			resp.Task.TaskName = inresp.Data.TaskName
-			resp.Task.TaskStatus = inresp.Data.Status
-			resp.Task.StartedAt = timeutils.StringToUnixTime(inresp.Data.StartTime)
-			resp.Task.CompletedAt = timeutils.StringToUnixTime(inresp.Data.EndTime)
+			var task types.TaskSl
+			task.TaskId = inresp.Data.Id
+			task.TaskName = inresp.Data.TaskName
+			task.TaskStatus = inresp.Data.Status
+			task.StartedAt = timeutils.StringToUnixTime(inresp.Data.StartTime)
+			task.CompletedAt = timeutils.StringToUnixTime(inresp.Data.EndTime)
+			resp.Task = &task
 		} else {
 			resp.Success = false
 			resp.ErrorMsg = inresp.Msg