From 0bc94edd810da29387dad42cbb0a71cb48e3b309 Mon Sep 17 00:00:00 2001 From: mhf Date: Fri, 4 Nov 2022 14:32:39 +0800 Subject: [PATCH] fix/modelarts task --- pkg/compute/tasks/modelarts_pool_change_config_task.go | 4 +++- pkg/compute/tasks/modelarts_pool_create_task.go | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkg/compute/tasks/modelarts_pool_change_config_task.go b/pkg/compute/tasks/modelarts_pool_change_config_task.go index a4d7356fd3..597360885e 100644 --- a/pkg/compute/tasks/modelarts_pool_change_config_task.go +++ b/pkg/compute/tasks/modelarts_pool_change_config_task.go @@ -61,7 +61,9 @@ func (self *ModelartsPoolChangeConfigTask) OnInit(ctx context.Context, obj db.IS self.taskFailed(ctx, pool, errors.Wrapf(err, "iMp.ChangeConfig")) return } - err = cloudprovider.WaitStatusWithDelay(iMp, api.MODELARTS_POOL_STATUS_RUNNING, 30*time.Second, 15*time.Second, 30*time.Minute) + // withDelay + time.Sleep(30 * time.Second) + err = cloudprovider.WaitMultiStatus(iMp, []string{api.MODELARTS_POOL_STATUS_RUNNING, api.MODELARTS_POOL_STATUS_CHANGE_CONFIG_FAILED}, 15*time.Second, 2*time.Hour) if err != nil { self.taskFailed(ctx, pool, errors.Wrapf(err, "WaitStatusWithDelay")) return diff --git a/pkg/compute/tasks/modelarts_pool_create_task.go b/pkg/compute/tasks/modelarts_pool_create_task.go index 51127ebbd3..b290bdb883 100644 --- a/pkg/compute/tasks/modelarts_pool_create_task.go +++ b/pkg/compute/tasks/modelarts_pool_create_task.go @@ -69,7 +69,10 @@ func (self *ModelartsPoolCreateTask) OnInit(ctx context.Context, obj db.IStandal self.taskFailed(ctx, pool, errors.Wrapf(err, "db.SetExternalId")) return } - err = cloudprovider.WaitStatusWithDelay(ipool, api.MODELARTS_POOL_STATUS_RUNNING, 30*time.Second, 15*time.Second, 30*time.Minute) + + // withDelay + time.Sleep(30 * time.Second) + err = cloudprovider.WaitMultiStatus(ipool, []string{api.MODELARTS_POOL_STATUS_RUNNING, api.MODELARTS_POOL_STATUS_CREATE_FAILED}, 15*time.Second, 2*time.Hour) if err != nil { self.taskFailed(ctx, pool, errors.Wrapf(err, "db.WaitStatusWithDelay")) return