opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge from release/2.4.0 -> release/2.5.0

Browse Source 
* commit 'c44a7f8407cca4db2a97caa93908966a1565d7f4':
  全量同步后立即更新cloudaccount状态
This commit is contained in:
邱剑
2019-02-15 19:58:38 +08:00
parent 3731a28a3a c44a7f8407
commit 713fa7d7bb
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/cloudaccounts.go
+3
View File
@@ -329,10 +329,13 @@ func (self *SCloudaccount) StartSyncCloudProviderInfoTask(ctx context.Context, u
taskItems = append(taskItems, &cloudProviders[i])
}
}
originState := self.Status
self.MarkStartSync(userCred)
task, err := taskman.TaskManager.NewParallelTask(ctx, "CloudAccountSyncInfoTask", taskItems, userCred, params, "", "", nil)
if err != nil {
log.Errorf("CloudAccountSyncInfoTask newTask error %s", err)
self.SetStatus(userCred, originState, err.Error())
} else {
task.ScheduleRun(nil)
}
pkg/compute/tasks/cloud_account_sync_task.go
+2 -4
View File
@@ -33,15 +33,13 @@ func (self *CloudAccountSyncInfoTask) OnInit(ctx context.Context, objs []db.ISta
self.SetStageFailed(ctx, "cloudprovide fail to get valid cloudaccount")
return
}
account.MarkStartSync(self.UserCred)
} else {
account.SetStatus(self.UserCred, models.CLOUD_PROVIDER_CONNECTED, "")
self.SetStageComplete(ctx, nil)
self.SetStageFailed(ctx, "no cloudprovider for sync")
return
}
if _, err := account.GetSubAccounts(); err != nil {
account.SetStatus(self.UserCred, models.CLOUD_PROVIDER_DISCONNECTED, "")
account.SetStatus(self.UserCred, models.CLOUD_PROVIDER_DISCONNECTED, err.Error())
self.SetStageFailed(ctx, err.Error())
return
}