Merge branch 'master' into test

nm/task_msg.go

@@ -151,7 +151,7 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
 			return
 		}
 		log.Infof("Started container with ID %s", containerId)
-		time.Sleep(time.Second * 45)
+		time.Sleep(time.Second * 70)
 		running, internalIp, internalPort = t.foundImageIsRunning(imageId)
 		if running {
 			isMatch := strings.HasPrefix(taskCmd.ImageName, models.ReplicateImageNameSuffix)
@@ -445,7 +445,11 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
 				t.ExecTaskIdIsSuccess.Store(taskMsg.TaskId, true)
 				return
 			}
+			if taskExecResult.TaskHttpStatusCode == http.StatusConflict {
+				taskExecResult.TaskExecError = fmt.Sprintf("%s,Container Http Code:%d", "Already running a prediction", post.StatusCode)
+			} else {
 				taskExecResult.TaskExecError = fmt.Sprintf("%s,Container Http Code:%d,body:%s", "Container is exec failed", post.StatusCode, string(all))
+			}
 		} else {
 			taskExecResult.TaskExecError = fmt.Sprintf("%s,Container Http Code:%d,body:%s", "Container resp body is nil", post.StatusCode, "")
 		}
@@ -689,6 +693,7 @@ func (t *TaskHandler) checkIsStopContainer(taskCmd *models.TaskCmd) {
 			if container.Image == oldTaskImageName && container.State == "running" {
 				t.DockerOp.StopContainer(container.ID)
 				log.WithField("Image name", container.Image).Info("Stopping container")
+				//t.DockerOp.RunningImages[oldTaskImageName] = false
 				break
 			}
 		}

operate/docker.go

@@ -30,6 +30,7 @@ type DockerOp struct {
 	ModelsInfo             []*models.ModelInfo
 	ModelTaskIdIndexesChan chan []uint64
 	ReportTaskIds          []uint64
+	//RunningImages          map[string]bool
 }
 
 func init() {
@@ -53,6 +54,7 @@ func NewDockerOp() *DockerOp {
 		UsedExternalPort:       make(map[int64]bool, 0),
 		ModelTaskIdIndexesChan: make(chan []uint64, 0),
 		ReportTaskIds:          make([]uint64, 0),
+		//RunningImages:          make(map[string]bool, 0),
 	}
 }