#2701

update

models/cloudbrain_spec.go

@@ -78,16 +78,17 @@ func InsertCloudbrainSpec(c CloudbrainSpec) (int64, error) {
 
 func GetCloudbrainSpecByID(cloudbrainId int64) (*CloudbrainSpec, error) {
 	r := &CloudbrainSpec{}
-	if _, err := x.Where("cloudbrain_id = ?", cloudbrainId).Get(r); err != nil {
+	if has, err := x.Where("cloudbrain_id = ?", cloudbrainId).Get(r); err != nil {
 		return nil, err
+	} else if !has {
+		return nil, nil
 	}
 	return r, nil
 }
 
-func FindNoSpecHistoricTask(page, pageSize int) ([]*Cloudbrain, error) {
+func FindCloudbrainTask(page, pageSize int) ([]*Cloudbrain, error) {
 	r := make([]*Cloudbrain, 0)
 	err := x.Unscoped().
-		Where(" 1=1 and not exists (select 1 from cloudbrain_spec  where cloudbrain.id = cloudbrain_spec.cloudbrain_id)").
 		Limit(pageSize, (page-1)*pageSize).
 		OrderBy("cloudbrain.id").
 		Find(&r)

routers/repo/cloudbrain.go

@@ -553,7 +553,7 @@ func CloudBrainRestart(ctx *context.Context) {
 		}
 
 		specOld, err := resource.GetCloudbrainSpec(task.ID)
-		if err != nil {
+		if err != nil || specOld == nil {
 			log.Error("CloudBrainRestart GetCloudbrainSpec error.task.id = %d", task.ID)
 			resultCode = "-1"
 			errorMsg = "Resource specification not support any more"
@@ -780,7 +780,6 @@ func prepareSpec4Show(ctx *context.Context, task *models.Cloudbrain) {
 		ctx.NotFound(ctx.Req.URL.RequestURI(), nil)
 		return
 	}
-
 	ctx.Data["Spec"] = s
 }
 

routers/repo/modelarts.go

@@ -491,7 +491,7 @@ func NotebookManage(ctx *context.Context) {
 				}
 			}
 			oldSpec, err := resource.GetCloudbrainSpec(task.ID)
-			if err != nil {
+			if err != nil || oldSpec == nil {
 				log.Error("NotebookManage GetCloudbrainSpec error.%v", err)
 				resultCode = "-1"
 				errorMsg = "Resource specification not available"

services/cloudbrain/resource/resource_specification.go

@@ -324,7 +324,6 @@ func RefreshHistorySpec(scopeAll bool, ids []int64) (int64, int64, error) {
 				continue
 			}
 			success++
-			time.Sleep(500 * time.Millisecond)
 		}
 
 	} else {
@@ -336,11 +335,11 @@ func RefreshHistorySpec(scopeAll bool, ids []int64) (int64, int64, error) {
 			return 0, 0, err
 		}
 		total = n
-		for i := 0; i < 1000; i++ {
-			list, err := models.FindNoSpecHistoricTask(page, pageSize)
+		for i := 0; i < 500; i++ {
+			list, err := models.FindCloudbrainTask(page, pageSize)
 			page++
 			if err != nil {
-				log.Error("FindNoSpecHistoricTask error.page=%d pageSize=%d  e=%v", page, pageSize, err)
+				log.Error("FindCloudbrainTask error.page=%d pageSize=%d  e=%v", page, pageSize, err)
 				return total, success, err
 			}
 			if len(list) == 0 {
@@ -348,13 +347,20 @@ func RefreshHistorySpec(scopeAll bool, ids []int64) (int64, int64, error) {
 				break
 			}
 			for _, task := range list {
+				s, err := GetCloudbrainSpec(task.ID)
+				if err != nil {
+					log.Error("RefreshHistorySpec GetCloudbrainSpec error.%v", err)
+					continue
+				}
+				if s != nil {
+					continue
+				}
 				err = RefreshOneHistorySpec(task)
 				if err != nil {
 					log.Error("RefreshOneHistorySpec error.%v", err)
 					continue
 				}
 				success++
-				time.Sleep(500 * time.Millisecond)
 			}
 			if len(list) < pageSize {
 				log.Info("RefreshHistorySpec. list < pageSize")