Merge pull request #217 from swanchain/fix-rejected-status

Fix the issue of updating the rejected status of a task

Author: Normalnoise

internal/computing/cron_task.go

@@ -250,7 +250,7 @@ func (task *CronTask) watchExpiredTask() {
 			}
 		}()
 
-		jobList, err := NewJobService().GetJobList(models.UN_DELETEED_FLAG, -1)
+		jobList, err := NewJobService().GetJobListByNoRejectStatus()
 		if err != nil {
 			logs.GetLogger().Errorf("failed to get job data, error: %+v", err)
 			return

internal/computing/ecp_image_service.go

@@ -233,7 +233,7 @@ func (imageJob *ImageJobService) DeployJob(c *gin.Context) {
 	var envs []string
 	var needResource container.Resources
 	if len(job.Resource.Gpus) > 0 {
-		envs = append(envs, fmt.Sprintf("CUDA_VISIBLE_DEVICES=%s", strings.Join(indexs, ",")))
+		envs = append(envs, fmt.Sprintf("NVIDIA_VISIBLE_DEVICES=%s", strings.Join(indexs, ",")))
 		needResource = container.Resources{
 			CPUQuota: needCpu * 100000,
 			Memory:   job.Resource.Memory,
@@ -351,8 +351,13 @@ func (imageJob *ImageJobService) DeployJob(c *gin.Context) {
 		}
 	} else {
 		var gNameStr string
-		for _, g := range job.Resource.Gpus {
-			gNameStr += g.GPUModel + "="
+		if len(job.Resource.Gpus) > 0 {
+			for _, g := range job.Resource.Gpus {
+				if g.GPUModel == "" || g.GPU == 0 {
+					continue
+				}
+				gNameStr += g.GPUModel + "="
+			}
 		}
 
 		if err = NewEcpJobService().SaveEcpJobEntity(&models.EcpJobEntity{

internal/computing/entity_service.go

@@ -84,8 +84,8 @@ func (taskServ TaskService) GetTaskListNoRewardForFilC2() (list []*models.TaskEn
 }
 
 func (taskServ TaskService) GetTaskListNoRewardForMining() (list []*models.TaskEntity, err error) {
-	err = taskServ.Model(&models.TaskEntity{}).Where("uuid !='' and (status !=? or status !=? or status !=?) ", models.TASK_TIMEOUT_STATUS,
-		models.TASK_VERIFYFAILED_STATUS, models.TASK_VERIFIED_STATUS).Find(&list).Error
+	err = taskServ.Model(&models.TaskEntity{}).Where("uuid !='' and (status !=? or status !=? or status !=? or status !=?) ", models.TASK_TIMEOUT_STATUS,
+		models.TASK_VERIFYFAILED_STATUS, models.TASK_VERIFIED_STATUS, models.TASK_REJECTED_STATUS).Find(&list).Error
 	if err != nil {
 		return nil, err
 	}
@@ -172,6 +172,18 @@ func (jobServ JobService) GetJobList(status int, tailNum int) (list []*models.Jo
 	return
 }
 
+func (jobServ JobService) GetJobListByNoRejectStatus() (list []*models.JobEntity, err error) {
+	err = jobServ.Model(&models.JobEntity{}).Where("delete_at=? and status >=0", models.UN_DELETEED_FLAG).Find(&list).Error
+	if err != nil {
+		return nil, err
+	}
+
+	for i, j := 0, len(list)-1; i < j; i, j = i+1, j-1 {
+		list[i], list[j] = list[j], list[i]
+	}
+	return
+}
+
 func (jobServ JobService) UpdateJobReward(taskUuid string, amount string) (err error) {
 	return jobServ.Model(&models.JobEntity{}).Where("task_uuid=?", taskUuid).Update("reward", amount).Error
 }

internal/computing/ubi_service.go

@@ -1006,14 +1006,13 @@ func doFilC2Task(c *gin.Context, zkTask models.ZkTaskReq, taskEntity *models.Tas
 				Memory: needMemory * 1024 * 1024 * 1024,
 			}
 		} else {
-			//gpuEnv, ok := os.LookupEnv("RUST_GPU_TOOLS_CUSTOM_GPU")
-			//if ok {
-			//	env = append(env, "RUST_GPU_TOOLS_CUSTOM_GPU="+gpuEnv)
-			//}
-
 			var useIndexs []string
 			if len(indexs) > 0 {
 				if gpuName != "" {
+					gpuEnv, ok := os.LookupEnv("RUST_GPU_TOOLS_CUSTOM_GPU")
+					if ok {
+						env = append(env, "RUST_GPU_TOOLS_CUSTOM_GPU="+gpuEnv)
+					}
 					useIndexs = append(useIndexs, defaultIndex)
 				} else {
 					for i := 0; i < needGpuNum; i++ {
@@ -1809,6 +1808,9 @@ func syncTaskStatusForSequencerService() error {
 		}
 
 		for _, item := range group.Items {
+			if item.Status == models.TASK_REJECTED_STATUS {
+				continue
+			}
 			var taskAddress = item.SequenceTaskAddr
 			if t, ok := taskMap[item.Id]; ok {
 				item.Reward = "0.00"