commit

src/package/infra/application.yaml

@@ -54,7 +54,8 @@ k8s:
 #  vtd-command: /Controller/config/docker_cloud_algContest.ini
   vtd-command-pjisuv: /Controller/config/docker_cloud.ini
   vtd-command-pjibot: /Controller/config/docker_cloud_robot.ini
-  callback-uri: http://10.14.86.127:9081/project/task/callback
+  callback-uri-cicv: http://10.14.86.127:9081/project/task/callback
+  callback-uri-pji: http://10.14.86.147:9081/project/task/callback
   platform-type: 2
 
 docker:

src/package/infra/handler/old_interface_adapter.go

@@ -24,6 +24,7 @@ func State(c *gin.Context) {
 	taskId := c.Query("taskId")
 	state := c.Query("state")
 	podName := c.Query("podName")
+	callbackUri := ""
 	if taskId == "" || state == "" || podName == "" {
 		infra.GlobalLogger.Error("任务状态接口请求参数错误，需要GET请求和【taskId】【state】【podName】三个参数。")
 		c.JSON(http.StatusBadRequest, entity.HttpResult{Status: false, Code: "1003", Message: "请求参数格式错误。"})
@@ -45,6 +46,11 @@ func State(c *gin.Context) {
 				infra.GlobalLogger.Error(err)
 			}
 			if cache.Task.Info.TaskId == taskId {
+				if cache.Env == "cicv" {
+					callbackUri = infra.ApplicationYaml.K8s.CallbackUriCicv
+				} else {
+					callbackUri = infra.ApplicationYaml.K8s.CallbackUriPji
+				}
 				// 1 获取任务id关联的节点
 				nodeName, _ := infra.GlobalRedisClient.Get(global.KeyTaskToNode + ":" + taskId).Result()
 				// 2 归还并行度
@@ -55,7 +61,7 @@ func State(c *gin.Context) {
 					if node.Hostname == nodeName {
 						newParallelism := node.Parallelism + 1
 						node.Parallelism = newParallelism
-						infra.GlobalLogger.Infof("归还1个并行度，剩余并行度为：【%v】", newParallelism)
+						infra.GlobalLogger.Infof("任务【%v】归还1个并行度，剩余并行度为：【%v】", taskId, newParallelism)
 						nodeJson, _ := infra.GpuNodeToJson(node)
 						_, _ = infra.GlobalRedisClient.LSet(global.KeyGpuNodeList, int64(i), nodeJson).Result()
 					}
@@ -96,7 +102,7 @@ func State(c *gin.Context) {
 	_, err := util.PostJsonResponseJson(
 		//"http://1.202.169.139:8081/project/task/callback",
 		//"http://10.14.86.127:9081/project/task/callback",
-		infra.ApplicationYaml.K8s.CallbackUri,
+		callbackUri,
 		map[string]string{
 			"taskId": taskId,
 			"state":  state,

src/package/infra/i_application.go

@@ -71,7 +71,8 @@ type K8sStruct struct {
 	VtdImage                 string `yaml:"vtd-image"`
 	VtdCommandPjisuv         string `yaml:"vtd-command-pjisuv"`
 	VtdCommandPjibot         string `yaml:"vtd-command-pjibot"`
-	CallbackUri              string `yaml:"callback-uri"`
+	CallbackUriCicv          string `yaml:"callback-uri-cicv"`
+	CallbackUriPji           string `yaml:"callback-uri-pji"`
 	PlatformType             string `yaml:"platform-type"`
 }
 type DockerStruct struct {