fix(commom): setStatus with notify hook (#19412)

Co-authored-by: 马鸿飞 <mahongfei@yunion.cn>
This commit is contained in:
gouqi11
2024-02-01 20:44:44 +08:00
committed by GitHub
parent 59dcb4260d
commit c7d6b053e5
425 changed files with 1117 additions and 1056 deletions
+1
View File
@@ -65,6 +65,7 @@ var (
ActionIsolatedDeviceCreate SAction = "isolated_device_create"
ActionIsolatedDeviceUpdate SAction = "isolated_device_update"
ActionIsolatedDeviceDelete SAction = "isolated_device_delete"
ActionStatusChanged SAction = "status_changed"
ResultFailed SResult = "failed"
ResultSucceed SResult = "succeed"
+16
View File
@@ -515,3 +515,19 @@ const (
// ACTION_ATTACH_CONTENT_EN = `{{- $d := .resource_details.action -}}
// Current log ID: {{ $d.id }}`
)
const (
STATUS_CHANGED_TITLE_CN = `{{- $d := .resource_details -}}
{{ $d.project }}项目的
{{ .resource_type_display }}{{ $d.name }}状态发生变更`
STATUS_CHANGED_TITLE_EN = `{{- $d := .resource_details -}}
{{ .resource_type }} {{ $d.name }} {{ if $d.project -}} in project {{ $d.project }} {{ end -}} status changed`
STATUS_CHANGED_CONTENT_CN = `{{- $d := .resource_details -}}
您在{{ $d.project }}项目的
{{- if $d.brand -}}
{{ $d.brand }}平台
{{- end -}}
{{ .resource_type_display }}{{ $d.name }}状态发生变更,原状态为:{{ $d.old_status }},变更后状态为{{$d.new_status }}`
STATUS_CHANGED_CONTENT_EN = `{{- $d := .resource_details -}}
Your {{ if $d.brand -}} {{ $d.brand }} {{ end -}} {{ .resource_type }} {{ $d.name }} status has changed,old status: {{ $d.old_status }},new_status: {{$d.new_status }}{{ if $d.project -}} in project {{ $d.project }} {{ end -}} `
)
+18 -2
View File
@@ -23,11 +23,13 @@ import (
)
var (
updateNotifyHook updateNotifyHookFunc
customizeNotifyHook customizeNotifyHookFunc
updateNotifyHook updateNotifyHookFunc
statusChangedNotifyHook statusChangedNotifyHookFunc
customizeNotifyHook customizeNotifyHookFunc
)
type updateNotifyHookFunc func(ctx context.Context, userCred mcclient.TokenCredential, obj IModel)
type statusChangedNotifyHookFunc func(ctx context.Context, userCred mcclient.TokenCredential, oldStatus, status string, obj IModel)
type customizeNotifyHookFunc func(ctx context.Context, userCred mcclient.TokenCredential, action string, obj IModel, moreDetails jsonutils.JSONObject)
func SetUpdateNotifyHook(f updateNotifyHookFunc) {
@@ -57,3 +59,17 @@ func CallCustomizeNotifyHook(ctx context.Context, userCred mcclient.TokenCredent
}
customizeNotifyHook(ctx, userCred, action, obj, customizeDetails)
}
func SetStatusChangedNotifyHook(f statusChangedNotifyHookFunc) {
if statusChangedNotifyHook != nil {
panic("updateNotifyHook already set")
}
statusChangedNotifyHook = f
}
func CallStatusChanegdNotifyHook(ctx context.Context, userCred mcclient.TokenCredential, oldStatis, newStatus string, obj IModel) {
if statusChangedNotifyHook == nil {
return
}
statusChangedNotifyHook(ctx, userCred, oldStatis, newStatus, obj)
}
+6 -5
View File
@@ -69,8 +69,8 @@ func (model SStatusResourceBase) GetProgress() float32 {
return model.Progress
}
func StatusBaseSetStatus(model IStatusBaseModel, userCred mcclient.TokenCredential, status string, reason string) error {
return statusBaseSetStatus(model, userCred, status, reason)
func StatusBaseSetStatus(ctx context.Context, model IStatusBaseModel, userCred mcclient.TokenCredential, status string, reason string) error {
return statusBaseSetStatus(ctx, model, userCred, status, reason)
}
func statusBaseSetProgress(model IStatusBaseModel, progress float32) error {
@@ -84,7 +84,7 @@ func statusBaseSetProgress(model IStatusBaseModel, progress float32) error {
return nil
}
func statusBaseSetStatus(model IStatusBaseModel, userCred mcclient.TokenCredential, status string, reason string) error {
func statusBaseSetStatus(ctx context.Context, model IStatusBaseModel, userCred mcclient.TokenCredential, status string, reason string) error {
if model.GetStatus() == status {
return nil
}
@@ -96,6 +96,7 @@ func statusBaseSetStatus(model IStatusBaseModel, userCred mcclient.TokenCredenti
if err != nil {
return errors.Wrap(err, "Update")
}
CallStatusChanegdNotifyHook(ctx, userCred, oldStatus, status, model)
if userCred != nil {
notes := fmt.Sprintf("%s=>%s", oldStatus, status)
if len(reason) > 0 {
@@ -111,11 +112,11 @@ func statusBaseSetStatus(model IStatusBaseModel, userCred mcclient.TokenCredenti
return nil
}
func StatusBasePerformStatus(model IStatusBaseModel, userCred mcclient.TokenCredential, input apis.PerformStatusInput) error {
func StatusBasePerformStatus(ctx context.Context, model IStatusBaseModel, userCred mcclient.TokenCredential, input apis.PerformStatusInput) error {
if len(input.Status) == 0 {
return httperrors.NewMissingParameterError("status")
}
err := statusBaseSetStatus(model, userCred, input.Status, input.Reason)
err := statusBaseSetStatus(ctx, model, userCred, input.Status, input.Reason)
if err != nil {
return errors.Wrap(err, "statusBaseSetStatus")
}
+3 -3
View File
@@ -49,15 +49,15 @@ func (self *SStatusDomainLevelResourceBase) GetIStatusDomainLevelModel() IStatus
// 更新资源状态
func (self *SStatusDomainLevelResourceBase) PerformStatus(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, input apis.PerformStatusInput) (jsonutils.JSONObject, error) {
err := StatusBasePerformStatus(self.GetIStatusDomainLevelModel(), userCred, input)
err := StatusBasePerformStatus(ctx, self.GetIStatusDomainLevelModel(), userCred, input)
if err != nil {
return nil, errors.Wrap(err, "StatusBasePerformStatus")
}
return nil, nil
}
func (model *SStatusDomainLevelResourceBase) SetStatus(userCred mcclient.TokenCredential, status string, reason string) error {
return statusBaseSetStatus(model.GetIStatusDomainLevelModel(), userCred, status, reason)
func (model *SStatusDomainLevelResourceBase) SetStatus(ctx context.Context, userCred mcclient.TokenCredential, status string, reason string) error {
return statusBaseSetStatus(ctx, model.GetIStatusDomainLevelModel(), userCred, status, reason)
}
func (manager *SStatusDomainLevelResourceBaseManager) ValidateCreateData(
+3 -3
View File
@@ -87,15 +87,15 @@ func (manager *SStatusInfrasResourceBaseManager) GetPropertyStatistics(ctx conte
// 更新资源状态
func (self *SStatusInfrasResourceBase) PerformStatus(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, input apis.PerformStatusInput) (jsonutils.JSONObject, error) {
err := StatusBasePerformStatus(self.GetIStatusInfrasModel(), userCred, input)
err := StatusBasePerformStatus(ctx, self.GetIStatusInfrasModel(), userCred, input)
if err != nil {
return nil, errors.Wrap(err, "StatusBasePerformStatus")
}
return nil, nil
}
func (model *SStatusInfrasResourceBase) SetStatus(userCred mcclient.TokenCredential, status string, reason string) error {
return statusBaseSetStatus(model.GetIStatusInfrasModel(), userCred, status, reason)
func (model *SStatusInfrasResourceBase) SetStatus(ctx context.Context, userCred mcclient.TokenCredential, status string, reason string) error {
return statusBaseSetStatus(ctx, model.GetIStatusInfrasModel(), userCred, status, reason)
}
func (manager *SStatusInfrasResourceBaseManager) ValidateCreateData(
@@ -47,8 +47,8 @@ func NewStatusDomainLevelUserResourceBaseManager(dt interface{}, tableName strin
}
}
func (model *SStatusDomainLevelUserResourceBase) SetStatus(userCred mcclient.TokenCredential, status string, reason string) error {
return statusBaseSetStatus(model, userCred, status, reason)
func (model *SStatusDomainLevelUserResourceBase) SetStatus(ctx context.Context, userCred mcclient.TokenCredential, status string, reason string) error {
return statusBaseSetStatus(ctx, model, userCred, status, reason)
}
func (manager *SStatusDomainLevelUserResourceBaseManager) ValidateCreateData(ctx context.Context, userCred mcclient.TokenCredential, ownerId mcclient.IIdentityProvider, query jsonutils.JSONObject, input apis.StatusDomainLevelUserResourceCreateInput) (apis.StatusDomainLevelUserResourceCreateInput, error) {
+3 -3
View File
@@ -87,15 +87,15 @@ func (manager *SStatusStandaloneResourceBaseManager) GetPropertyStatistics(ctx c
// 更新资源状态
func (self *SStatusStandaloneResourceBase) PerformStatus(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, input apis.PerformStatusInput) (jsonutils.JSONObject, error) {
err := StatusBasePerformStatus(self.GetIStatusStandaloneModel(), userCred, input)
err := StatusBasePerformStatus(ctx, self.GetIStatusStandaloneModel(), userCred, input)
if err != nil {
return nil, errors.Wrap(err, "StatusBasePerformStatus")
}
return nil, nil
}
func (model *SStatusStandaloneResourceBase) SetStatus(userCred mcclient.TokenCredential, status string, reason string) error {
return statusBaseSetStatus(model.GetIStatusStandaloneModel(), userCred, status, reason)
func (model *SStatusStandaloneResourceBase) SetStatus(ctx context.Context, userCred mcclient.TokenCredential, status string, reason string) error {
return statusBaseSetStatus(ctx, model.GetIStatusStandaloneModel(), userCred, status, reason)
}
func (model *SStatusStandaloneResourceBase) SetProgress(progress float32) error {
+1 -1
View File
@@ -560,7 +560,7 @@ func execITask(taskValue reflect.Value, task *STask, odata jsonutils.JSONObject,
}
statusObj, ok := obj.(db.IStatusStandaloneModel)
if ok {
db.StatusBaseSetStatus(statusObj, task.GetUserCred(), apis.STATUS_UNKNOWN, fmt.Sprintf("%v", r))
db.StatusBaseSetStatus(ctx, statusObj, task.GetUserCred(), apis.STATUS_UNKNOWN, fmt.Sprintf("%v", r))
}
notes := map[string]interface{}{
"Stack": string(debug.Stack()),
+15
View File
@@ -71,6 +71,21 @@ func init() {
},
})
})
db.SetStatusChangedNotifyHook(func(ctx context.Context, userCred mcclient.TokenCredential, oldStatus, newStatus string, obj db.IModel) {
_, ok := notifyDBHookResources.Load(obj.KeywordPlural())
if !ok {
return
}
EventNotify(ctx, userCred, SEventNotifyParam{
Obj: obj,
Action: api.ActionStatusChanged,
ObjDetailsDecorator: func(ctx context.Context, details *jsonutils.JSONDict) {
details.Set("old_status", jsonutils.NewString(oldStatus))
details.Set("new_status", jsonutils.NewString(newStatus))
},
})
})
}
func AddNotifyDBHookResources(keywordPlurals ...string) {
+4 -4
View File
@@ -227,7 +227,7 @@ func (self *SCloudgroup) StartCloudgroupDeleteTask(ctx context.Context, userCred
if err != nil {
return errors.Wrap(err, "NewTask")
}
self.SetStatus(userCred, api.CLOUD_GROUP_STATUS_DELETING, "")
self.SetStatus(ctx, userCred, api.CLOUD_GROUP_STATUS_DELETING, "")
task.ScheduleRun(nil)
return nil
}
@@ -490,7 +490,7 @@ func (self *SCloudgroup) StartCloudgroupSyncUsersTask(ctx context.Context, userC
if err != nil {
return errors.Wrap(err, "NewTask")
}
self.SetStatus(userCred, api.CLOUD_GROUP_STATUS_SYNC_USERS, "")
self.SetStatus(ctx, userCred, api.CLOUD_GROUP_STATUS_SYNC_USERS, "")
task.ScheduleRun(nil)
return nil
}
@@ -500,7 +500,7 @@ func (self *SCloudgroup) StartCloudgroupSyncstatusTask(ctx context.Context, user
if err != nil {
return errors.Wrap(err, "NewTask")
}
self.SetStatus(userCred, api.CLOUD_GROUP_STATUS_SYNC_STATUS, "")
self.SetStatus(ctx, userCred, api.CLOUD_GROUP_STATUS_SYNC_STATUS, "")
task.ScheduleRun(nil)
return nil
}
@@ -694,7 +694,7 @@ func (self *SCloudgroup) StartCloudgroupSyncPoliciesTask(ctx context.Context, us
if err != nil {
return errors.Wrap(err, "NewTask")
}
self.SetStatus(userCred, api.CLOUD_GROUP_STATUS_SYNC_POLICIES, "")
self.SetStatus(ctx, userCred, api.CLOUD_GROUP_STATUS_SYNC_POLICIES, "")
task.ScheduleRun(nil)
return nil
}
+2 -2
View File
@@ -207,7 +207,7 @@ func (self *SCloudgroupcache) StartCloudgroupcacheSyncstatusTask(ctx context.Con
if err != nil {
return errors.Wrap(err, "NewTask")
}
self.SetStatus(userCred, api.CLOUD_GROUP_CACHE_STATUS_SYNC_STATUS, "")
self.SetStatus(ctx, userCred, api.CLOUD_GROUP_CACHE_STATUS_SYNC_STATUS, "")
task.ScheduleRun(nil)
return nil
}
@@ -217,7 +217,7 @@ func (self *SCloudgroupcache) StartCloudgroupcacheDeleteTask(ctx context.Context
if err != nil {
return errors.Wrap(err, "NewTask")
}
self.SetStatus(userCred, api.CLOUD_GROUP_STATUS_DELETING, "")
self.SetStatus(ctx, userCred, api.CLOUD_GROUP_STATUS_DELETING, "")
task.ScheduleRun(nil)
return nil
}
+3 -3
View File
@@ -217,7 +217,7 @@ func (self *SCloudpolicy) StartCloudpolicyUpdateTask(ctx context.Context, userCr
if err != nil {
return errors.Wrap(err, "NewTask")
}
self.SetStatus(userCred, api.CLOUD_POLICY_STATUS_SYNCING, "update")
self.SetStatus(ctx, userCred, api.CLOUD_POLICY_STATUS_SYNCING, "update")
task.ScheduleRun(nil)
return nil
}
@@ -240,7 +240,7 @@ func (self *SCloudpolicy) StartCloudpolicyDeleteTask(ctx context.Context, userCr
if err != nil {
return errors.Wrap(err, "NewTask")
}
self.SetStatus(userCred, api.CLOUD_POLICY_STATUS_DELETING, "delete")
self.SetStatus(ctx, userCred, api.CLOUD_POLICY_STATUS_DELETING, "delete")
return task.ScheduleRun(nil)
}
@@ -373,7 +373,7 @@ func (self *SCloudpolicy) PerformCache(ctx context.Context, userCred mcclient.To
// 恢复权限组状态
func (self *SCloudpolicy) PerformSyncstatus(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, input api.CloudgroupSyncstatusInput) (jsonutils.JSONObject, error) {
self.SetStatus(userCred, api.CLOUD_POLICY_STATUS_AVAILABLE, "syncstatus")
self.SetStatus(ctx, userCred, api.CLOUD_POLICY_STATUS_AVAILABLE, "syncstatus")
return nil, nil
}
+1 -1
View File
@@ -123,7 +123,7 @@ func (self *SCloudrole) StartCloudroleDeleteTask(ctx context.Context, userCred m
if err != nil {
return errors.Wrap(err, "NewTask")
}
self.SetStatus(userCred, api.CLOUD_ROLE_STATUS_DELETING, "")
self.SetStatus(ctx, userCred, api.CLOUD_ROLE_STATUS_DELETING, "")
task.ScheduleRun(nil)
return nil
}
+6 -6
View File
@@ -766,7 +766,7 @@ func (self *SClouduser) StartClouduserDeleteTask(ctx context.Context, userCred m
if err != nil {
return errors.Wrap(err, "NewTask")
}
self.SetStatus(userCred, api.CLOUD_USER_STATUS_DELETING, "")
self.SetStatus(ctx, userCred, api.CLOUD_USER_STATUS_DELETING, "")
task.ScheduleRun(nil)
return nil
}
@@ -1309,7 +1309,7 @@ func (self *SClouduser) StartClouduserSyncstatusTask(ctx context.Context, userCr
if err != nil {
return errors.Wrap(err, "NewTask")
}
self.SetStatus(userCred, api.CLOUD_USER_STATUS_SYNC_STATUS, "")
self.SetStatus(ctx, userCred, api.CLOUD_USER_STATUS_SYNC_STATUS, "")
task.ScheduleRun(nil)
return nil
}
@@ -1328,7 +1328,7 @@ func (self *SClouduser) StartClouduserSyncTask(ctx context.Context, userCred mcc
if err != nil {
return errors.Wrap(err, "NewTask")
}
self.SetStatus(userCred, api.CLOUD_USER_STATUS_SYNC, "")
self.SetStatus(ctx, userCred, api.CLOUD_USER_STATUS_SYNC, "")
task.ScheduleRun(nil)
return nil
}
@@ -1338,7 +1338,7 @@ func (self *SClouduser) StartClouduserSyncPoliciesTask(ctx context.Context, user
if err != nil {
return errors.Wrap(err, "NewTask")
}
self.SetStatus(userCred, api.CLOUD_USER_STATUS_SYNC_POLICIES, "")
self.SetStatus(ctx, userCred, api.CLOUD_USER_STATUS_SYNC_POLICIES, "")
task.ScheduleRun(nil)
return nil
}
@@ -1348,7 +1348,7 @@ func (self *SClouduser) StartClouduserSyncGroupsTask(ctx context.Context, userCr
if err != nil {
return errors.Wrap(err, "NewTask")
}
self.SetStatus(userCred, api.CLOUD_USER_STATUS_SYNC_GROUPS, "")
self.SetStatus(ctx, userCred, api.CLOUD_USER_STATUS_SYNC_GROUPS, "")
task.ScheduleRun(nil)
return nil
}
@@ -1385,7 +1385,7 @@ func (self *SClouduser) StartClouduserResetPasswordTask(ctx context.Context, use
if err != nil {
return errors.Wrap(err, "NewTask")
}
self.SetStatus(userCred, api.CLOUD_USER_STATUS_RESET_PASSWORD, "")
self.SetStatus(ctx, userCred, api.CLOUD_USER_STATUS_RESET_PASSWORD, "")
task.ScheduleRun(nil)
return nil
}
+4 -4
View File
@@ -148,7 +148,7 @@ func (self *SSAMLProvider) StartSAMLProviderDeleteTask(ctx context.Context, user
if err != nil {
return errors.Wrap(err, "NewTask")
}
self.SetStatus(userCred, api.SAML_PROVIDER_STATUS_DELETING, "")
self.SetStatus(ctx, userCred, api.SAML_PROVIDER_STATUS_DELETING, "")
task.ScheduleRun(nil)
return nil
}
@@ -174,7 +174,7 @@ func (self *SSAMLProvider) StartSAMLProviderUpdateMetadataTask(ctx context.Conte
if err != nil {
return errors.Wrap(err, "NewTask")
}
self.SetStatus(userCred, api.SAML_PROVIDER_STATUS_UPDATE_METADATA, "")
self.SetStatus(ctx, userCred, api.SAML_PROVIDER_STATUS_UPDATE_METADATA, "")
task.ScheduleRun(nil)
return nil
}
@@ -184,7 +184,7 @@ func (self *SSAMLProvider) StartSAMLProviderCreateTask(ctx context.Context, user
if err != nil {
return errors.Wrap(err, "NewTask")
}
self.SetStatus(userCred, api.SAML_PROVIDER_STATUS_CREATING, "")
self.SetStatus(ctx, userCred, api.SAML_PROVIDER_STATUS_CREATING, "")
task.ScheduleRun(nil)
return nil
}
@@ -194,7 +194,7 @@ func (self *SSAMLProvider) StartSAMLProviderSyncTask(ctx context.Context, userCr
if err != nil {
return errors.Wrap(err, "NewTask")
}
self.SetStatus(userCred, api.SAML_PROVIDER_STATUS_SYNC, "")
self.SetStatus(ctx, userCred, api.SAML_PROVIDER_STATUS_SYNC, "")
task.ScheduleRun(nil)
return nil
}
+1 -1
View File
@@ -37,7 +37,7 @@ func init() {
}
func (self *CloudroleDeleteTask) taskFailed(ctx context.Context, role *models.SCloudrole, err error) {
role.SetStatus(self.GetUserCred(), api.CLOUD_ROLE_STATUS_DELETE_FAILED, err.Error())
role.SetStatus(ctx, self.GetUserCred(), api.CLOUD_ROLE_STATUS_DELETE_FAILED, err.Error())
logclient.AddActionLogWithStartable(self, role, logclient.ACT_DELETE, err, self.UserCred, false)
self.SetStageFailed(ctx, jsonutils.NewString(err.Error()))
}
+1 -1
View File
@@ -37,7 +37,7 @@ func init() {
}
func (self *CloudgroupDeleteTask) taskFailed(ctx context.Context, group *models.SCloudgroup, err error) {
group.SetStatus(self.GetUserCred(), api.CLOUD_GROUP_STATUS_DELETE_FAILED, err.Error())
group.SetStatus(ctx, self.GetUserCred(), api.CLOUD_GROUP_STATUS_DELETE_FAILED, err.Error())
logclient.AddActionLogWithStartable(self, group, logclient.ACT_DELETE, err, self.UserCred, false)
self.SetStageFailed(ctx, jsonutils.NewString(err.Error()))
}
@@ -36,7 +36,7 @@ func init() {
}
func (self *CloudgroupSyncPoliciesTask) taskFailed(ctx context.Context, group *models.SCloudgroup, err error) {
group.SetStatus(self.GetUserCred(), api.CLOUD_GROUP_STATUS_SYNC_POLICIES_FAILED, err.Error())
group.SetStatus(ctx, self.GetUserCred(), api.CLOUD_GROUP_STATUS_SYNC_POLICIES_FAILED, err.Error())
logclient.AddActionLogWithStartable(self, group, logclient.ACT_SYNC_POLICIES, err, self.UserCred, false)
self.SetStageFailed(ctx, jsonutils.NewString(err.Error()))
}
@@ -91,6 +91,6 @@ func (self *CloudgroupSyncPoliciesTask) OnInit(ctx context.Context, obj db.IStan
}
}
group.SetStatus(self.GetUserCred(), api.CLOUD_GROUP_STATUS_AVAILABLE, "")
group.SetStatus(ctx, self.GetUserCred(), api.CLOUD_GROUP_STATUS_AVAILABLE, "")
self.SetStageComplete(ctx, nil)
}
@@ -35,7 +35,7 @@ func init() {
}
func (self *CloudgroupSyncstatusTask) taskFailed(ctx context.Context, group *models.SCloudgroup, err error) {
group.SetStatus(self.GetUserCred(), api.CLOUD_GROUP_STATUS_AVAILABLE, err.Error())
group.SetStatus(ctx, self.GetUserCred(), api.CLOUD_GROUP_STATUS_AVAILABLE, err.Error())
self.SetStageFailed(ctx, jsonutils.NewString(err.Error()))
}
@@ -52,15 +52,15 @@ func (self *CloudgroupSyncstatusTask) OnInit(ctx context.Context, obj db.IStanda
if len(caches[i].ExternalId) > 0 {
_, err := caches[i].GetICloudgroup()
if err != nil {
caches[i].SetStatus(self.GetUserCred(), api.CLOUD_GROUP_CACHE_STATUS_UNKNOWN, errors.Wrap(err, "GetICloudgroup").Error())
caches[i].SetStatus(ctx, self.GetUserCred(), api.CLOUD_GROUP_CACHE_STATUS_UNKNOWN, errors.Wrap(err, "GetICloudgroup").Error())
continue
}
if caches[i].Status != api.CLOUD_GROUP_CACHE_STATUS_AVAILABLE {
caches[i].SetStatus(self.GetUserCred(), api.CLOUD_GROUP_CACHE_STATUS_AVAILABLE, "")
caches[i].SetStatus(ctx, self.GetUserCred(), api.CLOUD_GROUP_CACHE_STATUS_AVAILABLE, "")
}
}
}
group.SetStatus(self.GetUserCred(), api.CLOUD_GROUP_STATUS_AVAILABLE, "")
group.SetStatus(ctx, self.GetUserCred(), api.CLOUD_GROUP_STATUS_AVAILABLE, "")
self.SetStageComplete(ctx, nil)
}
@@ -36,7 +36,7 @@ func init() {
}
func (self *CloudgroupSyncUsersTask) taskFailed(ctx context.Context, group *models.SCloudgroup, err error) {
group.SetStatus(self.GetUserCred(), api.CLOUD_GROUP_STATUS_SYNC_USERS_FAILED, err.Error())
group.SetStatus(ctx, self.GetUserCred(), api.CLOUD_GROUP_STATUS_SYNC_USERS_FAILED, err.Error())
logclient.AddActionLogWithStartable(self, group, logclient.ACT_SYNC_USERS, err, self.UserCred, false)
self.SetStageFailed(ctx, jsonutils.NewString(err.Error()))
}
@@ -127,6 +127,6 @@ func (self *CloudgroupSyncUsersTask) OnInit(ctx context.Context, obj db.IStandal
}
}
group.SetStatus(self.GetUserCred(), api.CLOUD_GROUP_STATUS_AVAILABLE, "")
group.SetStatus(ctx, self.GetUserCred(), api.CLOUD_GROUP_STATUS_AVAILABLE, "")
self.SetStageComplete(ctx, nil)
}
@@ -37,7 +37,7 @@ func init() {
}
func (self *CloudgroupcacheDeleteTask) taskFailed(ctx context.Context, cache *models.SCloudgroupcache, err error) {
cache.SetStatus(self.GetUserCred(), api.CLOUD_GROUP_STATUS_DELETE_FAILED, err.Error())
cache.SetStatus(ctx, self.GetUserCred(), api.CLOUD_GROUP_STATUS_DELETE_FAILED, err.Error())
logclient.AddActionLogWithStartable(self, cache, logclient.ACT_DELETE, err, self.UserCred, false)
self.SetStageFailed(ctx, jsonutils.NewString(err.Error()))
}
@@ -36,7 +36,7 @@ func init() {
}
func (self *CloudgroupcacheSyncstatusTask) taskFailed(ctx context.Context, cache *models.SCloudgroupcache, err error) {
cache.SetStatus(self.GetUserCred(), api.CLOUD_GROUP_CACHE_STATUS_UNKNOWN, err.Error())
cache.SetStatus(ctx, self.GetUserCred(), api.CLOUD_GROUP_CACHE_STATUS_UNKNOWN, err.Error())
logclient.AddActionLogWithStartable(self, cache, logclient.ACT_SYNC_STATUS, err, self.UserCred, false)
self.SetStageFailed(ctx, jsonutils.NewString(err.Error()))
}
@@ -48,6 +48,6 @@ func (self *CloudgroupcacheSyncstatusTask) OnInit(ctx context.Context, obj db.IS
self.taskFailed(ctx, cache, errors.Wrap(err, "GetICloudgroup"))
return
}
cache.SetStatus(self.GetUserCred(), api.CLOUD_GROUP_CACHE_STATUS_AVAILABLE, "")
cache.SetStatus(ctx, self.GetUserCred(), api.CLOUD_GROUP_CACHE_STATUS_AVAILABLE, "")
self.SetStageComplete(ctx, nil)
}
+1 -1
View File
@@ -35,7 +35,7 @@ func init() {
}
func (self *CloudpolicyCacheTask) taskFailed(ctx context.Context, policy *models.SCloudpolicycache, err error) {
policy.SetStatus(self.GetUserCred(), apis.STATUS_CREATE_FAILED, err.Error())
policy.SetStatus(ctx, self.GetUserCred(), apis.STATUS_CREATE_FAILED, err.Error())
self.SetStageFailed(ctx, jsonutils.NewString(err.Error()))
}
+1 -1
View File
@@ -35,7 +35,7 @@ func init() {
}
func (self *CloudpolicyDeleteTask) taskFailed(ctx context.Context, policy *models.SCloudpolicy, err error) {
policy.SetStatus(self.GetUserCred(), api.CLOUD_USER_STATUS_DELETE_FAILED, err.Error())
policy.SetStatus(ctx, self.GetUserCred(), api.CLOUD_USER_STATUS_DELETE_FAILED, err.Error())
self.SetStageFailed(ctx, jsonutils.NewString(err.Error()))
}
+2 -2
View File
@@ -35,7 +35,7 @@ func init() {
}
func (self *CloudpolicyUpdateTask) taskFailed(ctx context.Context, policy *models.SCloudpolicy, err error) {
policy.SetStatus(self.GetUserCred(), api.CLOUD_POLICY_STATUS_SYNC_FAILE, err.Error())
policy.SetStatus(ctx, self.GetUserCred(), api.CLOUD_POLICY_STATUS_SYNC_FAILE, err.Error())
self.SetStageFailed(ctx, jsonutils.NewString(err.Error()))
}
@@ -71,6 +71,6 @@ func (self *CloudpolicyUpdateTask) OnInit(ctx context.Context, obj db.IStandalon
}
}
policy.SetStatus(self.GetUserCred(), api.CLOUD_POLICY_STATUS_AVAILABLE, "")
policy.SetStatus(ctx, self.GetUserCred(), api.CLOUD_POLICY_STATUS_AVAILABLE, "")
self.SetStageComplete(ctx, nil)
}
+1 -1
View File
@@ -37,7 +37,7 @@ func init() {
}
func (self *ClouduserDeleteTask) taskFailed(ctx context.Context, clouduser *models.SClouduser, err error) {
clouduser.SetStatus(self.GetUserCred(), api.CLOUD_USER_STATUS_DELETE_FAILED, err.Error())
clouduser.SetStatus(ctx, self.GetUserCred(), api.CLOUD_USER_STATUS_DELETE_FAILED, err.Error())
logclient.AddActionLogWithStartable(self, clouduser, logclient.ACT_DELETE, err, self.UserCred, false)
self.SetStageFailed(ctx, jsonutils.NewString(err.Error()))
}
@@ -36,7 +36,7 @@ func init() {
}
func (self *ClouduserResetPasswordTask) taskFailed(ctx context.Context, clouduser *models.SClouduser, err error) {
clouduser.SetStatus(self.GetUserCred(), api.CLOUD_USER_STATUS_RESET_PASSWORD_FAILED, err.Error())
clouduser.SetStatus(ctx, self.GetUserCred(), api.CLOUD_USER_STATUS_RESET_PASSWORD_FAILED, err.Error())
logclient.AddActionLogWithStartable(self, clouduser, logclient.ACT_RESET_PASSWORD, err, self.UserCred, false)
self.SetStageFailed(ctx, jsonutils.NewString(err.Error()))
}
@@ -75,7 +75,7 @@ func (self *ClouduserResetPasswordTask) OnInit(ctx context.Context, obj db.IStan
}
clouduser.SavePassword(password)
clouduser.SetStatus(self.GetUserCred(), api.CLOUD_USER_STATUS_AVAILABLE, "")
clouduser.SetStatus(ctx, self.GetUserCred(), api.CLOUD_USER_STATUS_AVAILABLE, "")
logclient.AddActionLogWithStartable(self, clouduser, logclient.ACT_RESET_PASSWORD, "", self.UserCred, true)
self.SetStageComplete(ctx, nil)
}
@@ -35,7 +35,7 @@ func init() {
}
func (self *ClouduserSyncGroupsTask) taskFailed(ctx context.Context, clouduser *models.SClouduser, err error) {
clouduser.SetStatus(self.GetUserCred(), api.CLOUD_USER_STATUS_SYNC_GROUPS_FAILED, err.Error())
clouduser.SetStatus(ctx, self.GetUserCred(), api.CLOUD_USER_STATUS_SYNC_GROUPS_FAILED, err.Error())
self.SetStageFailed(ctx, jsonutils.NewString(err.Error()))
}
@@ -108,7 +108,7 @@ func (self *ClouduserSyncGroupsTask) OnInit(ctx context.Context, obj db.IStandal
}
if !self.IsSubtask() {
user.SetStatus(self.GetUserCred(), api.CLOUD_USER_STATUS_AVAILABLE, "")
user.SetStatus(ctx, self.GetUserCred(), api.CLOUD_USER_STATUS_AVAILABLE, "")
}
self.SetStageComplete(ctx, nil)
}
@@ -35,7 +35,7 @@ func init() {
}
func (self *ClouduserSyncPoliciesTask) taskFailed(ctx context.Context, clouduser *models.SClouduser, err error) {
clouduser.SetStatus(self.GetUserCred(), api.CLOUD_USER_STATUS_SYNC_POLICIES_FAILED, err.Error())
clouduser.SetStatus(ctx, self.GetUserCred(), api.CLOUD_USER_STATUS_SYNC_POLICIES_FAILED, err.Error())
self.SetStageFailed(ctx, jsonutils.NewString(err.Error()))
}
@@ -69,7 +69,7 @@ func (self *ClouduserSyncPoliciesTask) OnInit(ctx context.Context, obj db.IStand
}
if !self.IsSubtask() {
user.SetStatus(self.GetUserCred(), api.CLOUD_USER_STATUS_AVAILABLE, "")
user.SetStatus(ctx, self.GetUserCred(), api.CLOUD_USER_STATUS_AVAILABLE, "")
}
self.SetStageComplete(ctx, nil)
}
+3 -3
View File
@@ -35,7 +35,7 @@ func init() {
}
func (self *ClouduserSyncTask) taskFailed(ctx context.Context, clouduser *models.SClouduser, err error) {
clouduser.SetStatus(self.GetUserCred(), api.CLOUD_USER_STATUS_SYNC_FAILED, err.Error())
clouduser.SetStatus(ctx, self.GetUserCred(), api.CLOUD_USER_STATUS_SYNC_FAILED, err.Error())
self.SetStageFailed(ctx, jsonutils.NewString(err.Error()))
}
@@ -64,7 +64,7 @@ func (self *ClouduserSyncTask) OnSyncCloudpoliciesComplete(ctx context.Context,
return
}
user.SetStatus(self.GetUserCred(), api.CLOUD_USER_STATUS_AVAILABLE, "")
user.SetStatus(ctx, self.GetUserCred(), api.CLOUD_USER_STATUS_AVAILABLE, "")
self.SetStageComplete(ctx, nil)
}
@@ -73,7 +73,7 @@ func (self *ClouduserSyncTask) OnSyncCloudpoliciesCompleteFailed(ctx context.Con
}
func (self *ClouduserSyncTask) OnSyncCloudgroupsComplete(ctx context.Context, user *models.SClouduser, body jsonutils.JSONObject) {
user.SetStatus(self.GetUserCred(), api.CLOUD_USER_STATUS_AVAILABLE, "")
user.SetStatus(ctx, self.GetUserCred(), api.CLOUD_USER_STATUS_AVAILABLE, "")
self.SetStageComplete(ctx, nil)
}
@@ -35,7 +35,7 @@ func init() {
}
func (self *ClouduserSyncstatusTask) taskFailed(ctx context.Context, clouduser *models.SClouduser, err error) {
clouduser.SetStatus(self.GetUserCred(), api.CLOUD_USER_STATUS_UNKNOWN, err.Error())
clouduser.SetStatus(ctx, self.GetUserCred(), api.CLOUD_USER_STATUS_UNKNOWN, err.Error())
self.SetStageFailed(ctx, jsonutils.NewString(err.Error()))
}
@@ -48,6 +48,6 @@ func (self *ClouduserSyncstatusTask) OnInit(ctx context.Context, obj db.IStandal
return
}
clouduser.SetStatus(self.GetUserCred(), api.CLOUD_USER_STATUS_AVAILABLE, "")
clouduser.SetStatus(ctx, self.GetUserCred(), api.CLOUD_USER_STATUS_AVAILABLE, "")
self.SetStageComplete(ctx, nil)
}
@@ -38,7 +38,7 @@ func init() {
}
func (self *SAMLProviderCreateTask) taskFailed(ctx context.Context, saml *models.SSAMLProvider, err error) {
saml.SetStatus(self.GetUserCred(), api.SAML_PROVIDER_STATUS_CREATE_FAILED, err.Error())
saml.SetStatus(ctx, self.GetUserCred(), api.SAML_PROVIDER_STATUS_CREATE_FAILED, err.Error())
logclient.AddActionLogWithStartable(self, saml, logclient.ACT_CREATE, err, self.UserCred, false)
self.SetStageFailed(ctx, jsonutils.NewString(err.Error()))
}
@@ -37,7 +37,7 @@ func init() {
}
func (self *SAMLProviderDeleteTask) taskFailed(ctx context.Context, saml *models.SSAMLProvider, err error) {
saml.SetStatus(self.GetUserCred(), api.SAML_PROVIDER_STATUS_DELETE_FAILED, err.Error())
saml.SetStatus(ctx, self.GetUserCred(), api.SAML_PROVIDER_STATUS_DELETE_FAILED, err.Error())
logclient.AddActionLogWithStartable(self, saml, logclient.ACT_DELETE, err, self.UserCred, false)
self.SetStageFailed(ctx, jsonutils.NewString(err.Error()))
}
+1 -1
View File
@@ -37,7 +37,7 @@ func init() {
}
func (self *SAMLProviderSyncTask) taskFailed(ctx context.Context, saml *models.SSAMLProvider, err error) {
saml.SetStatus(self.GetUserCred(), api.SAML_PROVIDER_STATUS_UNKNOWN, err.Error())
saml.SetStatus(ctx, self.GetUserCred(), api.SAML_PROVIDER_STATUS_UNKNOWN, err.Error())
logclient.AddActionLogWithStartable(self, saml, logclient.ACT_SYNC_CONF, err, self.UserCred, false)
self.SetStageFailed(ctx, jsonutils.NewString(err.Error()))
}
@@ -38,7 +38,7 @@ func init() {
}
func (self *SAMLProviderUpdateMetadataTask) taskFailed(ctx context.Context, saml *models.SSAMLProvider, err error) {
saml.SetStatus(self.GetUserCred(), api.SAML_PROVIDER_STATUS_UPDATE_METADATA_FAILED, err.Error())
saml.SetStatus(ctx, self.GetUserCred(), api.SAML_PROVIDER_STATUS_UPDATE_METADATA_FAILED, err.Error())
logclient.AddActionLogWithStartable(self, saml, logclient.ACT_UPDATE, err, self.UserCred, false)
self.SetStageFailed(ctx, jsonutils.NewString(err.Error()))
}
+1 -1
View File
@@ -213,7 +213,7 @@ func (drv *SBaseGuestDriver) StartGuestResetTask(guest *models.SGuest, ctx conte
func (drv *SBaseGuestDriver) StartGuestRestartTask(guest *models.SGuest, ctx context.Context, userCred mcclient.TokenCredential, isForce bool, parentTaskId string) error {
data := jsonutils.NewDict()
data.Set("is_force", jsonutils.NewBool(isForce))
if err := guest.SetStatus(userCred, api.VM_STOPPING, ""); err != nil {
if err := guest.SetStatus(ctx, userCred, api.VM_STOPPING, ""); err != nil {
return err
}
task, err := taskman.TaskManager.NewTask(ctx, "GuestRestartTask", guest, userCred, nil, parentTaskId, "", nil)
+2 -2
View File
@@ -699,10 +699,10 @@ func (self *SESXiGuestDriver) RequestStartOnHost(ctx context.Context, guest *mod
if err != nil {
return errors.Wrapf(err, "Wait vm running")
}
guest.SetStatus(userCred, api.VM_RUNNING, "StartOnHost")
guest.SetStatus(ctx, userCred, api.VM_RUNNING, "StartOnHost")
return task.ScheduleRun(result)
}
return guest.SetStatus(userCred, api.VM_RUNNING, "StartOnHost")
return guest.SetStatus(ctx, userCred, api.VM_RUNNING, "StartOnHost")
}
func (self *SESXiGuestDriver) RequestStopOnHost(ctx context.Context, guest *models.SGuest, host *models.SHost, task taskman.ITask, syncStatus bool) error {
+2 -2
View File
@@ -242,10 +242,10 @@ func (self *SGoogleGuestDriver) RequestStartOnHost(ctx context.Context, guest *m
log.Errorf("failed to update google userdata")
}
}
guest.SetStatus(userCred, api.VM_RUNNING, "StartOnHost")
guest.SetStatus(ctx, userCred, api.VM_RUNNING, "StartOnHost")
return task.ScheduleRun(result)
}
return guest.SetStatus(userCred, api.VM_RUNNING, "StartOnHost")
return guest.SetStatus(ctx, userCred, api.VM_RUNNING, "StartOnHost")
}
func (self *SGoogleGuestDriver) RemoteActionAfterGuestCreated(ctx context.Context, userCred mcclient.TokenCredential, guest *models.SGuest, host *models.SHost, iVM cloudprovider.ICloudVM, desc *cloudprovider.SManagedVMCreateConfig) {
+1 -1
View File
@@ -420,7 +420,7 @@ func (self *SKVMGuestDriver) RequestAssociateEip(ctx context.Context, userCred m
if err := eip.AssociateInstance(ctx, userCred, api.EIP_ASSOCIATE_TYPE_SERVER, guest); err != nil {
return errors.Wrapf(err, "associate eip %s(%s) to vm %s(%s)", eip.Name, eip.Id, guest.Name, guest.Id)
}
if err := eip.SetStatus(userCred, api.EIP_STATUS_READY, api.EIP_STATUS_ASSOCIATE); err != nil {
if err := eip.SetStatus(ctx, userCred, api.EIP_STATUS_READY, api.EIP_STATUS_ASSOCIATE); err != nil {
return errors.Wrapf(err, "set eip status to %s", api.EIP_STATUS_ALLOCATE)
}
return nil
+1 -1
View File
@@ -478,7 +478,7 @@ func (drv *SManagedVirtualizedGuestDriver) RequestStartOnHost(ctx context.Contex
guest.SyncAllWithCloudVM(ctx, userCred, host, ivm, true)
return task.ScheduleRun(result)
}
return guest.SetStatus(userCred, api.VM_RUNNING, "StartOnHost")
return guest.SetStatus(ctx, userCred, api.VM_RUNNING, "StartOnHost")
}
func (drv *SManagedVirtualizedGuestDriver) RequestDeployGuestOnHost(ctx context.Context, guest *models.SGuest, host *models.SHost, task taskman.ITask) error {
+2 -2
View File
@@ -377,7 +377,7 @@ func (self *SVirtualizedGuestDriver) StartResumeTask(ctx context.Context, userCr
}
func (self *SVirtualizedGuestDriver) StartGuestSaveImage(ctx context.Context, userCred mcclient.TokenCredential, guest *models.SGuest, params *jsonutils.JSONDict, parentTaskId string) error {
guest.SetStatus(userCred, api.VM_START_SAVE_DISK, "")
guest.SetStatus(ctx, userCred, api.VM_START_SAVE_DISK, "")
if task, err := taskman.TaskManager.NewTask(ctx, "GuestSaveImageTask", guest, userCred, params, parentTaskId, "", nil); err != nil {
return err
} else {
@@ -388,7 +388,7 @@ func (self *SVirtualizedGuestDriver) StartGuestSaveImage(ctx context.Context, us
func (self *SVirtualizedGuestDriver) StartGuestSaveGuestImage(ctx context.Context, userCred mcclient.TokenCredential,
guest *models.SGuest, params *jsonutils.JSONDict, parentTaskId string) error {
guest.SetStatus(userCred, api.VM_START_SAVE_DISK, "")
guest.SetStatus(ctx, userCred, api.VM_START_SAVE_DISK, "")
if task, err := taskman.TaskManager.NewTask(ctx, "GuestSaveGuestImageTask", guest, userCred, params, parentTaskId,
"", nil); err != nil {
return err
+3 -3
View File
@@ -102,7 +102,7 @@ func (self *SBaseHostDriver) FinishUnconvert(ctx context.Context, userCred mccli
if bss != nil {
bs := bss.GetStorage()
if bs != nil {
bs.SetStatus(userCred, api.STORAGE_ONLINE, "")
bs.SetStatus(ctx, userCred, api.STORAGE_ONLINE, "")
} else {
log.Errorf("ERROR: baremetal storage is None???")
}
@@ -136,7 +136,7 @@ func (self *SBaseHostDriver) FinishUnconvert(ctx context.Context, userCred mccli
func (self *SBaseHostDriver) CleanSchedCache(host *models.SHost) error {
return host.ClearSchedDescCache()
}
func (self *SBaseHostDriver) FinishConvert(userCred mcclient.TokenCredential, host *models.SHost, guest *models.SGuest, hostType string) error {
func (self *SBaseHostDriver) FinishConvert(ctx context.Context, userCred mcclient.TokenCredential, host *models.SHost, guest *models.SGuest, hostType string) error {
_, err := db.Update(guest, func() error {
guest.VmemSize = 0
guest.VcpuCount = 0
@@ -157,7 +157,7 @@ func (self *SBaseHostDriver) FinishConvert(userCred mcclient.TokenCredential, ho
})
}
bs := host.GetBaremetalstorage().GetStorage()
bs.SetStatus(userCred, api.STORAGE_OFFLINE, "")
bs.SetStatus(ctx, userCred, api.STORAGE_OFFLINE, "")
db.Update(host, func() error {
host.Name = guest.GetName()
host.CpuReserved = 0
+3 -3
View File
@@ -276,7 +276,7 @@ func (self *SAccessGroupRule) CustomizeDelete(ctx context.Context, userCred mccl
return self.StartDeleteTask(ctx, userCred, "")
}
func (self *SAccessGroupRule) SetStatus(userCred mcclient.TokenCredential, status string, reason string) error {
func (self *SAccessGroupRule) SetStatus(ctx context.Context, userCred mcclient.TokenCredential, status string, reason string) error {
_, err := db.Update(self, func() error {
self.Status = status
return nil
@@ -293,10 +293,10 @@ func (self *SAccessGroupRule) StartDeleteTask(ctx context.Context, userCred mccl
return task.ScheduleRun(nil)
}()
if err != nil {
self.SetStatus(userCred, apis.STATUS_DELETE_FAILED, err.Error())
self.SetStatus(ctx, userCred, apis.STATUS_DELETE_FAILED, err.Error())
return nil
}
self.SetStatus(userCred, apis.STATUS_DELETING, "")
self.SetStatus(ctx, userCred, apis.STATUS_DELETING, "")
return nil
}
+2 -2
View File
@@ -250,10 +250,10 @@ func (self *SAccessGroup) StartDeleteTask(ctx context.Context, userCred mcclient
return task.ScheduleRun(nil)
}()
if err != nil {
self.SetStatus(userCred, api.ACCESS_GROUP_STATUS_DELETE_FAILED, err.Error())
self.SetStatus(ctx, userCred, api.ACCESS_GROUP_STATUS_DELETE_FAILED, err.Error())
return nil
}
self.SetStatus(userCred, api.ACCESS_GROUP_STATUS_DELETING, "")
self.SetStatus(ctx, userCred, api.ACCESS_GROUP_STATUS_DELETING, "")
return nil
}
+1 -1
View File
@@ -443,7 +443,7 @@ func (self *SApp) StartRemoteUpdateTask(ctx context.Context, userCred mcclient.T
if err != nil {
return errors.Wrap(err, "NewTask")
}
self.SetStatus(userCred, apis.STATUS_UPDATE_TAGS, "StartRemoteUpdateTask")
self.SetStatus(ctx, userCred, apis.STATUS_UPDATE_TAGS, "StartRemoteUpdateTask")
return task.ScheduleRun(nil)
}
+1 -1
View File
@@ -133,7 +133,7 @@ func (bs *SBackupStorage) ValidateDeleteCondition(ctx context.Context, info json
func (bs *SBackupStorage) PostCreate(ctx context.Context, userCred mcclient.TokenCredential, ownerId mcclient.IIdentityProvider, query jsonutils.JSONObject, data jsonutils.JSONObject) {
bs.SEnabledStatusInfrasResourceBase.PostCreate(ctx, userCred, ownerId, query, data)
bs.SetStatus(userCred, api.BACKUPSTORAGE_STATUS_OFFLINE, "")
bs.SetStatus(ctx, userCred, api.BACKUPSTORAGE_STATUS_OFFLINE, "")
if bs.StorageType == api.BACKUPSTORAGE_TYPE_OBJECT_STORAGE {
err := bs.saveObjectSecret(bs.AccessInfo.ObjectSecret)
if err != nil {
+3 -3
View File
@@ -399,7 +399,7 @@ func (bucket *SBucket) StartBucketDeleteTask(ctx context.Context, userCred mccli
log.Errorf("%s", err)
return err
}
bucket.SetStatus(userCred, api.CLOUD_PROVIDER_START_DELETE, "StartBucketDeleteTask")
bucket.SetStatus(ctx, userCred, api.CLOUD_PROVIDER_START_DELETE, "StartBucketDeleteTask")
task.ScheduleRun(nil)
return nil
}
@@ -516,10 +516,10 @@ func (bucket *SBucket) PostCreate(
}
}
bucket.SetStatus(userCred, api.BUCKET_STATUS_START_CREATE, "PostCreate")
bucket.SetStatus(ctx, userCred, api.BUCKET_STATUS_START_CREATE, "PostCreate")
task, err := taskman.TaskManager.NewTask(ctx, "BucketCreateTask", bucket, userCred, nil, "", "", nil)
if err != nil {
bucket.SetStatus(userCred, api.BUCKET_STATUS_CREATE_FAIL, errors.Wrapf(err, "NewTask").Error())
bucket.SetStatus(ctx, userCred, api.BUCKET_STATUS_CREATE_FAIL, errors.Wrapf(err, "NewTask").Error())
return
}
task.ScheduleRun(nil)
+4 -4
View File
@@ -375,7 +375,7 @@ func (self *SCDNDomain) StartCdnCreateTask(ctx context.Context, userCred mcclien
if err != nil {
return errors.Wrapf(err, "NewTask")
}
self.SetStatus(userCred, apis.STATUS_CREATING, "")
self.SetStatus(ctx, userCred, apis.STATUS_CREATING, "")
return task.ScheduleRun(nil)
}
@@ -392,14 +392,14 @@ func (self *SCDNDomain) StartDeleteTask(ctx context.Context, userCred mcclient.T
return task.ScheduleRun(nil)
}()
if err != nil {
self.SetStatus(userCred, api.CDN_DOMAIN_STATUS_DELETE_FAILED, err.Error())
self.SetStatus(ctx, userCred, api.CDN_DOMAIN_STATUS_DELETE_FAILED, err.Error())
return nil
}
return nil
}
func (self *SCDNDomain) Delete(ctx context.Context, userCred mcclient.TokenCredential) error {
self.SetStatus(userCred, api.CDN_DOMAIN_STATUS_DELETING, "")
self.SetStatus(ctx, userCred, api.CDN_DOMAIN_STATUS_DELETING, "")
return nil
}
@@ -546,7 +546,7 @@ func (self *SCDNDomain) StartRemoteUpdateTask(ctx context.Context, userCred mccl
if err != nil {
return errors.Wrap(err, "NewTask")
}
self.SetStatus(userCred, apis.STATUS_UPDATE_TAGS, "StartRemoteUpdateTask")
self.SetStatus(ctx, userCred, apis.STATUS_UPDATE_TAGS, "StartRemoteUpdateTask")
return task.ScheduleRun(nil)
}
+5 -5
View File
@@ -887,7 +887,7 @@ func (acnt *SCloudaccount) PerformUpdateCredential(ctx context.Context, userCred
db.OpsLog.LogEvent(acnt, db.ACT_UPDATE, account, userCred)
logclient.AddActionLogWithContext(ctx, acnt, logclient.ACT_UPDATE_CREDENTIAL, account, userCred, true)
acnt.SetStatus(userCred, api.CLOUD_PROVIDER_INIT, "Change credential")
acnt.SetStatus(ctx, userCred, api.CLOUD_PROVIDER_INIT, "Change credential")
acnt.StartSyncCloudAccountInfoTask(ctx, userCred, nil, "", nil)
}
@@ -2167,7 +2167,7 @@ func (account *SCloudaccount) markAccountDisconected(ctx context.Context, userCr
if account.Status == api.CLOUD_PROVIDER_CONNECTED {
account.EventNotify(ctx, userCred, notify.ActionSyncAccountStatus)
}
return account.SetStatus(userCred, api.CLOUD_PROVIDER_DISCONNECTED, reason)
return account.SetStatus(ctx, userCred, api.CLOUD_PROVIDER_DISCONNECTED, reason)
}
func (account *SCloudaccount) markAllProvidersDisconnected(ctx context.Context, userCred mcclient.TokenCredential) error {
@@ -2191,7 +2191,7 @@ func (account *SCloudaccount) markAccountConnected(ctx context.Context, userCred
return err
}
}
return account.SetStatus(userCred, api.CLOUD_PROVIDER_CONNECTED, "")
return account.SetStatus(ctx, userCred, api.CLOUD_PROVIDER_CONNECTED, "")
}
func (account *SCloudaccount) shouldProbeStatus() bool {
@@ -2506,7 +2506,7 @@ func (acnt *SCloudaccount) Delete(ctx context.Context, userCred mcclient.TokenCr
}
func (acnt *SCloudaccount) RealDelete(ctx context.Context, userCred mcclient.TokenCredential) error {
acnt.SetStatus(userCred, api.CLOUD_PROVIDER_DELETED, "real delete")
acnt.SetStatus(ctx, userCred, api.CLOUD_PROVIDER_DELETED, "real delete")
return acnt.purge(ctx, userCred)
}
@@ -2521,7 +2521,7 @@ func (acnt *SCloudaccount) StartCloudaccountDeleteTask(ctx context.Context, user
log.Errorf("%s", err)
return err
}
acnt.SetStatus(userCred, api.CLOUD_PROVIDER_START_DELETE, "StartCloudaccountDeleteTask")
acnt.SetStatus(ctx, userCred, api.CLOUD_PROVIDER_START_DELETE, "StartCloudaccountDeleteTask")
task.ScheduleRun(nil)
return nil
}
+3 -3
View File
@@ -1478,7 +1478,7 @@ func (provider *SCloudprovider) markProviderDisconnected(ctx context.Context, us
return err
}
if provider.Status != api.CLOUD_PROVIDER_DISCONNECTED {
provider.SetStatus(userCred, api.CLOUD_PROVIDER_DISCONNECTED, reason)
provider.SetStatus(ctx, userCred, api.CLOUD_PROVIDER_DISCONNECTED, reason)
return provider.ClearSchedDescCache()
}
return nil
@@ -1513,7 +1513,7 @@ func (provider *SCloudprovider) markProviderConnected(ctx context.Context, userC
db.OpsLog.LogEvent(provider, db.ACT_UPDATE, diff, userCred)
}
if provider.Status != api.CLOUD_PROVIDER_CONNECTED {
provider.SetStatus(userCred, api.CLOUD_PROVIDER_CONNECTED, "")
provider.SetStatus(ctx, userCred, api.CLOUD_PROVIDER_CONNECTED, "")
return provider.ClearSchedDescCache()
}
return nil
@@ -1658,7 +1658,7 @@ func (cprvd *SCloudprovider) StartCloudproviderDeleteTask(ctx context.Context, u
if err != nil {
return errors.Wrapf(err, "NewTask")
}
cprvd.SetStatus(userCred, api.CLOUD_PROVIDER_START_DELETE, "StartCloudproviderDeleteTask")
cprvd.SetStatus(ctx, userCred, api.CLOUD_PROVIDER_START_DELETE, "StartCloudproviderDeleteTask")
return task.ScheduleRun(nil)
}
+6 -6
View File
@@ -359,7 +359,7 @@ func (self *SDBInstanceAccount) PostCreate(ctx context.Context, userCred mcclien
}
func (self *SDBInstanceAccount) StartDBInstanceAccountCreateTask(ctx context.Context, userCred mcclient.TokenCredential, data *jsonutils.JSONDict, parentTaskId string) error {
self.SetStatus(userCred, api.DBINSTANCE_USER_CREATING, "")
self.SetStatus(ctx, userCred, api.DBINSTANCE_USER_CREATING, "")
task, err := taskman.TaskManager.NewTask(ctx, "DBInstanceAccountCreateTask", self, userCred, data, parentTaskId, "", nil)
if err != nil {
return err
@@ -460,7 +460,7 @@ func (self *SDBInstanceAccount) PerformSetPrivileges(ctx context.Context, userCr
}
func (self *SDBInstanceAccount) StartSetPrivilegesTask(ctx context.Context, userCred mcclient.TokenCredential, data jsonutils.JSONObject) error {
self.SetStatus(userCred, api.DBINSTANCE_USER_SET_PRIVILEGE, "")
self.SetStatus(ctx, userCred, api.DBINSTANCE_USER_SET_PRIVILEGE, "")
task, err := taskman.TaskManager.NewTask(ctx, "DBInstanceAccountSetPrivilegesTask", self, userCred, data.(*jsonutils.JSONDict), "", "", nil)
if err != nil {
return errors.Wrap(err, "NewTask")
@@ -471,7 +471,7 @@ func (self *SDBInstanceAccount) StartSetPrivilegesTask(ctx context.Context, user
}
func (self *SDBInstanceAccount) StartGrantPrivilegeTask(ctx context.Context, userCred mcclient.TokenCredential, database string, privilege string, parentTaskId string) error {
self.SetStatus(userCred, api.DBINSTANCE_USER_GRANT_PRIVILEGE, "")
self.SetStatus(ctx, userCred, api.DBINSTANCE_USER_GRANT_PRIVILEGE, "")
params := jsonutils.NewDict()
params.Add(jsonutils.NewString(database), "database")
params.Add(jsonutils.NewString(privilege), "privilege")
@@ -518,7 +518,7 @@ func (self *SDBInstanceAccount) PerformRevokePrivilege(ctx context.Context, user
}
func (self *SDBInstanceAccount) StartRevokePrivilegeTask(ctx context.Context, userCred mcclient.TokenCredential, database string, privilege string, parentTaskId string) error {
self.SetStatus(userCred, api.DBINSTANCE_USER_REVOKE_PRIVILEGE, "")
self.SetStatus(ctx, userCred, api.DBINSTANCE_USER_REVOKE_PRIVILEGE, "")
params := jsonutils.NewDict()
params.Add(jsonutils.NewString(database), "database")
params.Add(jsonutils.NewString(privilege), "privilege")
@@ -560,7 +560,7 @@ func (self *SDBInstanceAccount) StartDBInstanceAccountResetPasswordTask(ctx cont
} else {
params.Add(jsonutils.NewString(seclib2.RandomPassword2(20)), "password")
}
self.SetStatus(userCred, api.DBINSTANCE_USER_RESET_PASSWD, "")
self.SetStatus(ctx, userCred, api.DBINSTANCE_USER_RESET_PASSWD, "")
task, err := taskman.TaskManager.NewTask(ctx, "DBInstanceAccountResetPasswordTask", self, userCred, params, "", "", nil)
if err != nil {
return errors.Wrapf(err, "NewTask")
@@ -728,7 +728,7 @@ func (self *SDBInstanceAccount) CustomizeDelete(ctx context.Context, userCred mc
}
func (self *SDBInstanceAccount) StartDBInstanceAccountDeleteTask(ctx context.Context, userCred mcclient.TokenCredential, parentTaskId string) error {
self.SetStatus(userCred, api.DBINSTANCE_USER_DELETING, "")
self.SetStatus(ctx, userCred, api.DBINSTANCE_USER_DELETING, "")
task, err := taskman.TaskManager.NewTask(ctx, "DBInstanceAccountDeleteTask", self, userCred, nil, parentTaskId, "", nil)
if err != nil {
return err
+3 -3
View File
@@ -266,8 +266,8 @@ func (self *SDBInstanceBackup) StartDBInstanceBackupCreateTask(ctx context.Conte
if err != nil {
return errors.Wrap(err, "GetDBInstance")
}
instance.SetStatus(userCred, api.DBINSTANCE_BACKING_UP, "")
self.SetStatus(userCred, api.DBINSTANCE_BACKUP_CREATING, "")
instance.SetStatus(ctx, userCred, api.DBINSTANCE_BACKING_UP, "")
self.SetStatus(ctx, userCred, api.DBINSTANCE_BACKUP_CREATING, "")
task.ScheduleRun(nil)
return nil
}
@@ -563,7 +563,7 @@ func (self *SDBInstanceBackup) CustomizeDelete(ctx context.Context, userCred mcc
}
func (self *SDBInstanceBackup) StartDBInstanceBackupDeleteTask(ctx context.Context, userCred mcclient.TokenCredential, parentTaskId string) error {
self.SetStatus(userCred, api.DBINSTANCE_BACKUP_DELETING, "")
self.SetStatus(ctx, userCred, api.DBINSTANCE_BACKUP_DELETING, "")
task, err := taskman.TaskManager.NewTask(ctx, "DBInstanceBackupDeleteTask", self, userCred, nil, parentTaskId, "", nil)
if err != nil {
return err
+2 -2
View File
@@ -257,7 +257,7 @@ func (self *SDBInstanceDatabase) PostCreate(ctx context.Context, userCred mcclie
}
func (self *SDBInstanceDatabase) StartDBInstanceDatabaseCreateTask(ctx context.Context, userCred mcclient.TokenCredential, params *jsonutils.JSONDict, parentTaskId string) error {
self.SetStatus(userCred, api.DBINSTANCE_DATABASE_CREATING, "")
self.SetStatus(ctx, userCred, api.DBINSTANCE_DATABASE_CREATING, "")
task, err := taskman.TaskManager.NewTask(ctx, "DBInstanceDatabaseCreateTask", self, userCred, params, parentTaskId, "", nil)
if err != nil {
return errors.Wrap(err, "NewTask")
@@ -451,7 +451,7 @@ func (self *SDBInstanceDatabase) CustomizeDelete(ctx context.Context, userCred m
}
func (self *SDBInstanceDatabase) StartDBInstanceDatabaseDeleteTask(ctx context.Context, userCred mcclient.TokenCredential, parentTaskId string) error {
self.SetStatus(userCred, api.DBINSTANCE_DATABASE_DELETING, "")
self.SetStatus(ctx, userCred, api.DBINSTANCE_DATABASE_DELETING, "")
task, err := taskman.TaskManager.NewTask(ctx, "DBInstanceDatabaseDeleteTask", self, userCred, nil, parentTaskId, "", nil)
if err != nil {
return err
+10 -10
View File
@@ -525,7 +525,7 @@ func (self *SDBInstance) StartDBInstanceCreateTask(ctx context.Context, userCred
if err != nil {
return errors.Wrapf(err, "NewTask")
}
self.SetStatus(userCred, api.DBINSTANCE_DEPLOYING, "")
self.SetStatus(ctx, userCred, api.DBINSTANCE_DEPLOYING, "")
task.ScheduleRun(nil)
return nil
}
@@ -924,7 +924,7 @@ func (self *SDBInstance) PerformRecovery(ctx context.Context, userCred mcclient.
}
func (self *SDBInstance) StartDBInstanceRecoveryTask(ctx context.Context, userCred mcclient.TokenCredential, params *jsonutils.JSONDict, parentTaskId string) error {
self.SetStatus(userCred, api.DBINSTANCE_RESTORING, "")
self.SetStatus(ctx, userCred, api.DBINSTANCE_RESTORING, "")
task, err := taskman.TaskManager.NewTask(ctx, "DBInstanceRecoveryTask", self, userCred, params, parentTaskId, "", nil)
if err != nil {
return err
@@ -1046,7 +1046,7 @@ func (self *SDBInstance) StartSetAutoRenewTask(ctx context.Context, userCred mcc
if err != nil {
return errors.Wrap(err, "NewTask")
}
self.SetStatus(userCred, api.DBINSTANCE_SET_AUTO_RENEW, "")
self.SetStatus(ctx, userCred, api.DBINSTANCE_SET_AUTO_RENEW, "")
task.ScheduleRun(nil)
return nil
}
@@ -1073,7 +1073,7 @@ func (self *SDBInstance) PerformPublicConnection(ctx context.Context, userCred m
}
func (self *SDBInstance) StartDBInstancePublicConnectionTask(ctx context.Context, userCred mcclient.TokenCredential, parentTaskId string, open bool) error {
self.SetStatus(userCred, api.DBINSTANCE_DEPLOYING, "")
self.SetStatus(ctx, userCred, api.DBINSTANCE_DEPLOYING, "")
params := jsonutils.NewDict()
params.Add(jsonutils.NewBool(open), "open")
task, err := taskman.TaskManager.NewTask(ctx, "DBInstancePublicConnectionTask", self, userCred, params, parentTaskId, "", nil)
@@ -1101,7 +1101,7 @@ func (self *SDBInstance) PerformChangeConfig(ctx context.Context, userCred mccli
}
func (self *SDBInstance) StartDBInstanceChangeConfig(ctx context.Context, userCred mcclient.TokenCredential, data *jsonutils.JSONDict, parentTaskId string) error {
self.SetStatus(userCred, api.DBINSTANCE_CHANGE_CONFIG, "")
self.SetStatus(ctx, userCred, api.DBINSTANCE_CHANGE_CONFIG, "")
task, err := taskman.TaskManager.NewTask(ctx, "DBInstanceChangeConfigTask", self, userCred, data, parentTaskId, "", nil)
if err != nil {
return err
@@ -1111,7 +1111,7 @@ func (self *SDBInstance) StartDBInstanceChangeConfig(ctx context.Context, userCr
}
func (self *SDBInstance) StartDBInstanceRenewTask(ctx context.Context, userCred mcclient.TokenCredential, duration string, parentTaskId string) error {
self.SetStatus(userCred, api.DBINSTANCE_RENEWING, "")
self.SetStatus(ctx, userCred, api.DBINSTANCE_RENEWING, "")
params := jsonutils.NewDict()
params.Set("duration", jsonutils.NewString(duration))
task, err := taskman.TaskManager.NewTask(ctx, "DBInstanceRenewTask", self, userCred, params, parentTaskId, "", nil)
@@ -1176,7 +1176,7 @@ func (self *SDBInstance) GetShortDesc(ctx context.Context) *jsonutils.JSONDict {
}
func (self *SDBInstance) StartDBInstanceDeleteTask(ctx context.Context, userCred mcclient.TokenCredential, data *jsonutils.JSONDict, parentTaskId string) error {
self.SetStatus(userCred, api.DBINSTANCE_DELETING, "")
self.SetStatus(ctx, userCred, api.DBINSTANCE_DELETING, "")
task, err := taskman.TaskManager.NewTask(ctx, "DBInstanceDeleteTask", self, userCred, data, parentTaskId, "", nil)
if err != nil {
return err
@@ -1186,7 +1186,7 @@ func (self *SDBInstance) StartDBInstanceDeleteTask(ctx context.Context, userCred
}
func (self *SDBInstance) StartDBInstanceRebootTask(ctx context.Context, userCred mcclient.TokenCredential, data *jsonutils.JSONDict, parentTaskId string) error {
self.SetStatus(userCred, api.DBINSTANCE_REBOOTING, "")
self.SetStatus(ctx, userCred, api.DBINSTANCE_REBOOTING, "")
task, err := taskman.TaskManager.NewTask(ctx, "DBInstanceRebootTask", self, userCred, data, parentTaskId, "", nil)
if err != nil {
return err
@@ -2103,7 +2103,7 @@ func (self *SDBInstance) StartRemoteUpdateTask(ctx context.Context, userCred mcc
log.Errorln(err)
return errors.Wrap(err, "Start ElasticcacheRemoteUpdateTask")
} else {
self.SetStatus(userCred, api.DBINSTANCE_UPDATE_TAGS, "StartRemoteUpdateTask")
self.SetStatus(ctx, userCred, api.DBINSTANCE_UPDATE_TAGS, "StartRemoteUpdateTask")
task.ScheduleRun(nil)
}
return nil
@@ -2175,7 +2175,7 @@ func (self *SDBInstance) StartSyncSecgroupsTask(ctx context.Context, userCred mc
if err != nil {
return errors.Wrap(err, "NewTask")
}
self.SetStatus(userCred, api.DBINSTANCE_DEPLOYING, "sync secgroups")
self.SetStatus(ctx, userCred, api.DBINSTANCE_DEPLOYING, "sync secgroups")
task.ScheduleRun(nil)
return nil
}
+2 -2
View File
@@ -415,7 +415,7 @@ func (self *SDiskBackup) CustomizeDelete(ctx context.Context, userCred mcclient.
}
func (self *SDiskBackup) StartBackupDeleteTask(ctx context.Context, userCred mcclient.TokenCredential, parentTaskId string, forceDelete bool) error {
self.SetStatus(userCred, api.BACKUP_STATUS_DELETING, "")
self.SetStatus(ctx, userCred, api.BACKUP_STATUS_DELETING, "")
log.Infof("start to delete diskbackup %s and set deleting", self.GetId())
params := jsonutils.NewDict()
if forceDelete {
@@ -438,7 +438,7 @@ func (self *SDiskBackup) PerformRecovery(ctx context.Context, userCred mcclient.
}
func (self *SDiskBackup) StartRecoveryTask(ctx context.Context, userCred mcclient.TokenCredential, parentTaskId string, diskName string) error {
self.SetStatus(userCred, api.BACKUP_STATUS_RECOVERY, "")
self.SetStatus(ctx, userCred, api.BACKUP_STATUS_RECOVERY, "")
var params *jsonutils.JSONDict
if diskName != "" {
params = jsonutils.NewDict()
+6 -6
View File
@@ -954,9 +954,9 @@ func (self *SDisk) StartResetDisk(
ctx context.Context, userCred mcclient.TokenCredential,
snapshotId string, autoStart bool, guest *SGuest, parentTaskId string,
) error {
self.SetStatus(userCred, api.DISK_RESET, "")
self.SetStatus(ctx, userCred, api.DISK_RESET, "")
if guest != nil {
guest.SetStatus(userCred, api.VM_DISK_RESET, "disk reset")
guest.SetStatus(ctx, userCred, api.VM_DISK_RESET, "disk reset")
}
params := jsonutils.NewDict()
params.Set("snapshot_id", jsonutils.NewString(snapshotId))
@@ -1210,7 +1210,7 @@ func (self *SDisk) StartDiskSaveTask(ctx context.Context, userCred mcclient.Toke
if err != nil {
return errors.Wrapf(err, "NewTask")
}
self.SetStatus(userCred, api.DISK_START_SAVE, "")
self.SetStatus(ctx, userCred, api.DISK_START_SAVE, "")
task.ScheduleRun(nil)
return nil
}
@@ -1623,7 +1623,7 @@ func (self *SDisk) syncRemoveCloudDisk(ctx context.Context, userCred mcclient.To
err = self.ValidatePurgeCondition(ctx)
if err != nil {
self.SetStatus(userCred, api.DISK_UNKNOWN, "missing original disk after sync")
self.SetStatus(ctx, userCred, api.DISK_UNKNOWN, "missing original disk after sync")
return err
}
err = self.RealDelete(ctx, userCred)
@@ -2464,7 +2464,7 @@ func (manager *SDiskManager) FetchCustomizeColumns(
}
func (self *SDisk) StartDiskResizeTask(ctx context.Context, userCred mcclient.TokenCredential, sizeMb int64, parentTaskId string, pendingUsage quotas.IQuota) error {
self.SetStatus(userCred, api.DISK_START_RESIZE, "StartDiskResizeTask")
self.SetStatus(ctx, userCred, api.DISK_START_RESIZE, "StartDiskResizeTask")
params := jsonutils.NewDict()
params.Add(jsonutils.NewInt(sizeMb), "size")
task, err := taskman.TaskManager.NewTask(ctx, "DiskResizeTask", self, userCred, params, parentTaskId, "", pendingUsage)
@@ -2516,7 +2516,7 @@ func (self *SDisk) GetAttachedGuests() []SGuest {
}
func (self *SDisk) SetDiskReady(ctx context.Context, userCred mcclient.TokenCredential, reason string) {
self.SetStatus(userCred, api.DISK_READY, reason)
self.SetStatus(ctx, userCred, api.DISK_READY, reason)
guests := self.GetAttachedGuests()
if guests != nil {
for _, guest := range guests {
+4 -4
View File
@@ -162,7 +162,7 @@ func (self *SDnsRecord) StartCreateTask(ctx context.Context, userCred mcclient.T
if err != nil {
return errors.Wrap(err, "NewTask")
}
self.SetStatus(userCred, api.DNS_RECORDSET_STATUS_CREATING, "")
self.SetStatus(ctx, userCred, api.DNS_RECORDSET_STATUS_CREATING, "")
return task.ScheduleRun(nil)
}
@@ -332,7 +332,7 @@ func (self *SDnsRecord) StartDeleteTask(ctx context.Context, userCred mcclient.T
if err != nil {
return errors.Wrap(err, "NewTask")
}
self.SetStatus(userCred, apis.STATUS_DELETING, "")
self.SetStatus(ctx, userCred, apis.STATUS_DELETING, "")
return task.ScheduleRun(nil)
}
@@ -408,7 +408,7 @@ func (self *SDnsRecord) StartUpdateTask(ctx context.Context, userCred mcclient.T
if err != nil {
return errors.Wrap(err, "NewTask")
}
self.SetStatus(userCred, apis.STATUS_SYNC_STATUS, "")
self.SetStatus(ctx, userCred, apis.STATUS_SYNC_STATUS, "")
return task.ScheduleRun(nil)
}
@@ -698,7 +698,7 @@ func (self *SDnsRecord) StartSetEnabledTask(ctx context.Context, userCred mcclie
if err != nil {
return errors.Wrap(err, "NewTask")
}
self.SetStatus(userCred, apis.STATUS_SYNC_STATUS, "")
self.SetStatus(ctx, userCred, apis.STATUS_SYNC_STATUS, "")
return task.ScheduleRun(nil)
}
+4 -4
View File
@@ -204,7 +204,7 @@ func (self *SDnsZone) StartDnsZoneCreateTask(ctx context.Context, userCred mccli
if err != nil {
return errors.Wrap(err, "NewTask")
}
self.SetStatus(userCred, api.DNS_ZONE_STATUS_CREATING, "")
self.SetStatus(ctx, userCred, api.DNS_ZONE_STATUS_CREATING, "")
return task.ScheduleRun(nil)
}
@@ -352,7 +352,7 @@ func (self *SDnsZone) StartDnsZoneDeleteTask(ctx context.Context, userCred mccli
if err != nil {
return errors.Wrap(err, "NewTask")
}
self.SetStatus(userCred, api.DNS_ZONE_STATUS_DELETING, "")
self.SetStatus(ctx, userCred, api.DNS_ZONE_STATUS_DELETING, "")
return task.ScheduleRun(nil)
}
@@ -594,7 +594,7 @@ func (self *SDnsZone) StartDnsZoneAddVpcsTask(ctx context.Context, userCred mccl
if err != nil {
return errors.Wrap(err, "NewTask")
}
self.SetStatus(userCred, apis.STATUS_SYNC_STATUS, "")
self.SetStatus(ctx, userCred, apis.STATUS_SYNC_STATUS, "")
return task.ScheduleRun(nil)
}
@@ -605,7 +605,7 @@ func (self *SDnsZone) StartDnsZoneRemoveVpcsTask(ctx context.Context, userCred m
if err != nil {
return errors.Wrap(err, "NewTask")
}
self.SetStatus(userCred, apis.STATUS_SYNC_STATUS, "")
self.SetStatus(ctx, userCred, apis.STATUS_SYNC_STATUS, "")
return task.ScheduleRun(nil)
}
+2 -2
View File
@@ -378,7 +378,7 @@ func (self *SElasticSearch) StartDeleteTask(ctx context.Context, userCred mcclie
if err != nil {
return err
}
self.SetStatus(userCred, api.ELASTIC_SEARCH_STATUS_DELETING, "")
self.SetStatus(ctx, userCred, api.ELASTIC_SEARCH_STATUS_DELETING, "")
task.ScheduleRun(nil)
return nil
}
@@ -689,7 +689,7 @@ func (self *SElasticSearch) StartRemoteUpdateTask(ctx context.Context, userCred
if task, err := taskman.TaskManager.NewTask(ctx, "ElasticSearchRemoteUpdateTask", self, userCred, data, parentTaskId, "", nil); err != nil {
return errors.Wrap(err, "Start ElasticSearchRemoteUpdateTask")
} else {
self.SetStatus(userCred, api.ELASTIC_SEARCH_UPDATE_TAGS, "StartRemoteUpdateTask")
self.SetStatus(ctx, userCred, api.ELASTIC_SEARCH_UPDATE_TAGS, "StartRemoteUpdateTask")
task.ScheduleRun(nil)
}
return nil
+3 -3
View File
@@ -256,7 +256,7 @@ func (self *SElasticcacheAccount) PostCreate(ctx context.Context, userCred mccli
self.SavePassword(self.Password)
}
self.SetStatus(userCred, api.ELASTIC_CACHE_ACCOUNT_STATUS_CREATING, "")
self.SetStatus(ctx, userCred, api.ELASTIC_CACHE_ACCOUNT_STATUS_CREATING, "")
if err := self.StartElasticcacheAccountCreateTask(ctx, userCred, data.(*jsonutils.JSONDict), ""); err != nil {
log.Errorf("Failed to create elastic account cache error: %v", err)
}
@@ -441,7 +441,7 @@ func (self *SElasticcacheAccount) GetDecodedPassword() (string, error) {
}
func (self *SElasticcacheAccount) CustomizeDelete(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) error {
self.SetStatus(userCred, api.ELASTIC_CACHE_ACCOUNT_STATUS_DELETING, "")
self.SetStatus(ctx, userCred, api.ELASTIC_CACHE_ACCOUNT_STATUS_DELETING, "")
return self.StartDeleteElasticcacheAccountTask(ctx, userCred, jsonutils.NewDict(), "")
}
@@ -482,7 +482,7 @@ func (self *SElasticcacheAccount) ValidatorResetPasswordData(ctx context.Context
}
func (self *SElasticcacheAccount) PerformResetPassword(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) (jsonutils.JSONObject, error) {
self.SetStatus(userCred, api.ELASTIC_CACHE_STATUS_CHANGING, "")
self.SetStatus(ctx, userCred, api.ELASTIC_CACHE_STATUS_CHANGING, "")
data, err := self.ValidatorResetPasswordData(ctx, userCred, query, data)
if err != nil {
return nil, err
+3 -3
View File
@@ -233,7 +233,7 @@ func (self *SElasticcacheAcl) GetOwnerId() mcclient.IIdentityProvider {
func (self *SElasticcacheAcl) PostCreate(ctx context.Context, userCred mcclient.TokenCredential, ownerId mcclient.IIdentityProvider, query jsonutils.JSONObject, data jsonutils.JSONObject) {
self.SStandaloneResourceBase.PostCreate(ctx, userCred, ownerId, query, data)
self.SetStatus(userCred, api.ELASTIC_CACHE_ACL_STATUS_CREATING, "")
self.SetStatus(ctx, userCred, api.ELASTIC_CACHE_ACL_STATUS_CREATING, "")
if err := self.StartElasticcacheAclCreateTask(ctx, userCred, data.(*jsonutils.JSONDict), ""); err != nil {
log.Errorf("Failed to create elastic cache acl error: %v", err)
}
@@ -285,7 +285,7 @@ func (self *SElasticcacheAcl) ValidateUpdateData(ctx context.Context, userCred m
}
func (self *SElasticcacheAcl) PostUpdate(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) {
self.SetStatus(userCred, api.ELASTIC_CACHE_ACL_STATUS_UPDATING, "")
self.SetStatus(ctx, userCred, api.ELASTIC_CACHE_ACL_STATUS_UPDATING, "")
if err := self.StartUpdateElasticcacheAclTask(ctx, userCred, data.(*jsonutils.JSONDict), ""); err != nil {
log.Errorf("ElasticcacheAcl %s", err.Error())
}
@@ -311,7 +311,7 @@ func (self *SElasticcacheAcl) ValidatePurgeCondition(ctx context.Context) error
}
func (self *SElasticcacheAcl) CustomizeDelete(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) error {
self.SetStatus(userCred, api.ELASTIC_CACHE_ACL_STATUS_DELETING, "")
self.SetStatus(ctx, userCred, api.ELASTIC_CACHE_ACL_STATUS_DELETING, "")
return self.StartDeleteElasticcacheAclTask(ctx, userCred, jsonutils.NewDict(), "")
}
+2 -2
View File
@@ -265,7 +265,7 @@ func (self *SElasticcacheBackup) GetOwnerId() mcclient.IIdentityProvider {
func (self *SElasticcacheBackup) PostCreate(ctx context.Context, userCred mcclient.TokenCredential, ownerId mcclient.IIdentityProvider, query jsonutils.JSONObject, data jsonutils.JSONObject) {
self.SStandaloneResourceBase.PostCreate(ctx, userCred, ownerId, query, data)
self.SetStatus(userCred, api.ELASTIC_CACHE_BACKUP_STATUS_CREATING, "")
self.SetStatus(ctx, userCred, api.ELASTIC_CACHE_BACKUP_STATUS_CREATING, "")
if err := self.StartElasticcacheBackupCreateTask(ctx, userCred, data.(*jsonutils.JSONDict), ""); err != nil {
log.Errorf("Failed to create elastic cache backup error: %v", err)
}
@@ -299,7 +299,7 @@ func (self *SElasticcacheBackup) PerformRestoreInstance(ctx context.Context, use
return nil, err
}
self.SetStatus(userCred, api.ELASTIC_CACHE_STATUS_BACKUPRECOVERING, "")
self.SetStatus(ctx, userCred, api.ELASTIC_CACHE_STATUS_BACKUPRECOVERING, "")
return nil, self.StartRestoreInstanceTask(ctx, userCred, data.(*jsonutils.JSONDict), "")
}
+19 -19
View File
@@ -941,7 +941,7 @@ func (self *SElasticcache) PostCreate(ctx context.Context, userCred mcclient.Tok
}
func (self *SElasticcache) StartElasticcacheCreateTask(ctx context.Context, userCred mcclient.TokenCredential, input *api.ElasticcacheCreateInput, parentTaskId string) {
self.SetStatus(userCred, api.ELASTIC_CACHE_STATUS_DEPLOYING, "")
self.SetStatus(ctx, userCred, api.ELASTIC_CACHE_STATUS_DEPLOYING, "")
params := jsonutils.Marshal(input).(*jsonutils.JSONDict)
err := func() error {
task, err := taskman.TaskManager.NewTask(ctx, "ElasticcacheCreateTask", self, userCred, params, parentTaskId, "", nil)
@@ -951,7 +951,7 @@ func (self *SElasticcache) StartElasticcacheCreateTask(ctx context.Context, user
return task.ScheduleRun(nil)
}()
if err != nil {
self.SetStatus(userCred, api.ELASTIC_CACHE_STATUS_CREATE_FAILED, err.Error())
self.SetStatus(ctx, userCred, api.ELASTIC_CACHE_STATUS_CREATE_FAILED, err.Error())
}
}
@@ -970,7 +970,7 @@ func (self *SElasticcache) GetSlaveZones() ([]SZone, error) {
func (self *SElasticcache) PerformRestart(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) (jsonutils.JSONObject, error) {
if utils.IsInStringArray(self.Status, []string{api.ELASTIC_CACHE_STATUS_RUNNING, api.ELASTIC_CACHE_STATUS_INACTIVE}) {
self.SetStatus(userCred, api.ELASTIC_CACHE_STATUS_RESTARTING, "")
self.SetStatus(ctx, userCred, api.ELASTIC_CACHE_STATUS_RESTARTING, "")
return nil, self.StartRestartTask(ctx, userCred, "", data)
} else {
return nil, httperrors.NewInvalidStatusError("Cannot do restart elasticcache instance in status %s", self.Status)
@@ -978,7 +978,7 @@ func (self *SElasticcache) PerformRestart(ctx context.Context, userCred mcclient
}
func (self *SElasticcache) StartRestartTask(ctx context.Context, userCred mcclient.TokenCredential, parentTaskId string, data jsonutils.JSONObject) error {
self.SetStatus(userCred, api.ELASTIC_CACHE_STATUS_RESTARTING, "")
self.SetStatus(ctx, userCred, api.ELASTIC_CACHE_STATUS_RESTARTING, "")
if task, err := taskman.TaskManager.NewTask(ctx, "ElasticcacheRestartTask", self, userCred, data.(*jsonutils.JSONDict), parentTaskId, "", nil); err != nil {
log.Errorln(err)
return err
@@ -1010,7 +1010,7 @@ func (self *SElasticcache) CustomizeDelete(ctx context.Context, userCred mcclien
}
func (self *SElasticcache) StartDeleteElasticcacheTask(ctx context.Context, userCred mcclient.TokenCredential, params *jsonutils.JSONDict, parentTaskId string) error {
self.SetStatus(userCred, api.ELASTIC_CACHE_STATUS_RELEASING, "")
self.SetStatus(ctx, userCred, api.ELASTIC_CACHE_STATUS_RELEASING, "")
task, err := taskman.TaskManager.NewTask(ctx, "ElasticcacheDeleteTask", self, userCred, params, parentTaskId, "", nil)
if err != nil {
return err
@@ -1057,7 +1057,7 @@ func (self *SElasticcache) PerformChangeSpec(ctx context.Context, userCred mccli
params := jsonutils.NewDict()
sku, _ := data.GetString("sku_ext_id")
params.Set("sku_ext_id", jsonutils.NewString(sku))
self.SetStatus(userCred, api.ELASTIC_CACHE_STATUS_CHANGING, "")
self.SetStatus(ctx, userCred, api.ELASTIC_CACHE_STATUS_CHANGING, "")
return nil, self.StartChangeSpecTask(ctx, userCred, params, "")
}
@@ -1108,7 +1108,7 @@ func (self *SElasticcache) PerformUpdateAuthMode(ctx context.Context, userCred m
params := jsonutils.NewDict()
authMode, _ := data.GetString("auth_mode")
params.Set("auth_mode", jsonutils.NewString(authMode))
self.SetStatus(userCred, api.ELASTIC_CACHE_STATUS_CHANGING, "")
self.SetStatus(ctx, userCred, api.ELASTIC_CACHE_STATUS_CHANGING, "")
return nil, self.StartUpdateAuthModeTask(ctx, userCred, params, "")
}
@@ -1148,7 +1148,7 @@ func (self *SElasticcache) PerformResetPassword(ctx context.Context, userCred mc
return nil, err
}
self.SetStatus(userCred, api.ELASTIC_CACHE_STATUS_CHANGING, "")
self.SetStatus(ctx, userCred, api.ELASTIC_CACHE_STATUS_CHANGING, "")
return nil, self.StartResetPasswordTask(ctx, userCred, data.(*jsonutils.JSONDict), "")
}
@@ -1215,7 +1215,7 @@ func (self *SElasticcache) PerformSetMaintainTime(ctx context.Context, userCred
endTime, _ := data.GetString("maintain_end_time")
params.Set("maintain_start_time", jsonutils.NewString(startTime))
params.Set("maintain_end_time", jsonutils.NewString(endTime))
self.SetStatus(userCred, api.ELASTIC_CACHE_STATUS_CHANGING, "")
self.SetStatus(ctx, userCred, api.ELASTIC_CACHE_STATUS_CHANGING, "")
return nil, self.StartSetMaintainTimeTask(ctx, userCred, params, "")
}
@@ -1252,7 +1252,7 @@ func (self *SElasticcache) PerformAllocatePublicConnection(ctx context.Context,
params := jsonutils.NewDict()
port, _ := data.Int("port")
params.Set("port", jsonutils.NewInt(port))
self.SetStatus(userCred, api.ELASTIC_CACHE_STATUS_NETWORKMODIFYING, "")
self.SetStatus(ctx, userCred, api.ELASTIC_CACHE_STATUS_NETWORKMODIFYING, "")
return nil, self.StartAllocatePublicConnectionTask(ctx, userCred, params, "")
}
@@ -1280,7 +1280,7 @@ func (self *SElasticcache) PerformReleasePublicConnection(ctx context.Context, u
return nil, err
}
self.SetStatus(userCred, api.ELASTIC_CACHE_STATUS_NETWORKMODIFYING, "")
self.SetStatus(ctx, userCred, api.ELASTIC_CACHE_STATUS_NETWORKMODIFYING, "")
return nil, self.StartReleasePublicConnectionTask(ctx, userCred, jsonutils.NewDict(), "")
}
@@ -1295,7 +1295,7 @@ func (self *SElasticcache) StartReleasePublicConnectionTask(ctx context.Context,
}
func (self *SElasticcache) PerformFlushInstance(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) (jsonutils.JSONObject, error) {
self.SetStatus(userCred, api.ELASTIC_CACHE_STATUS_FLUSHING, "")
self.SetStatus(ctx, userCred, api.ELASTIC_CACHE_STATUS_FLUSHING, "")
return nil, self.StartFlushInstanceTask(ctx, userCred, data.(*jsonutils.JSONDict), "")
}
@@ -1332,7 +1332,7 @@ func (self *SElasticcache) PerformUpdateInstanceParameters(ctx context.Context,
params := jsonutils.NewDict()
parameters, _ := data.Get("parameters")
params.Set("parameters", parameters)
self.SetStatus(userCred, api.ELASTIC_CACHE_STATUS_CHANGING, "")
self.SetStatus(ctx, userCred, api.ELASTIC_CACHE_STATUS_CHANGING, "")
return nil, self.StartUpdateInstanceParametersTask(ctx, userCred, params, "")
}
@@ -1375,7 +1375,7 @@ func (self *SElasticcache) PerformUpdateBackupPolicy(ctx context.Context, userCr
return nil, err
}
self.SetStatus(userCred, api.ELASTIC_CACHE_STATUS_CHANGING, "")
self.SetStatus(ctx, userCred, api.ELASTIC_CACHE_STATUS_CHANGING, "")
return nil, self.StartUpdateBackupPolicyTask(ctx, userCred, data.(*jsonutils.JSONDict), "")
}
@@ -1408,7 +1408,7 @@ func (self *SElasticcache) PerformSync(ctx context.Context, userCred mcclient.To
}
func (self *SElasticcache) StartSyncTask(ctx context.Context, userCred mcclient.TokenCredential, params *jsonutils.JSONDict, parentTaskId string) error {
self.SetStatus(userCred, api.ELASTIC_CACHE_STATUS_SYNCING, "")
self.SetStatus(ctx, userCred, api.ELASTIC_CACHE_STATUS_SYNCING, "")
task, err := taskman.TaskManager.NewTask(ctx, "ElasticcacheSyncTask", self, userCred, params, parentTaskId, "", nil)
if err != nil {
return err
@@ -1723,7 +1723,7 @@ func (self *SElasticcache) StartRemoteUpdateTask(ctx context.Context, userCred m
log.Errorln(err)
return errors.Wrap(err, "Start ElasticcacheRemoteUpdateTask")
} else {
self.SetStatus(userCred, api.ELASTIC_CACHE_UPDATE_TAGS, "StartRemoteUpdateTask")
self.SetStatus(ctx, userCred, api.ELASTIC_CACHE_UPDATE_TAGS, "StartRemoteUpdateTask")
task.ScheduleRun(nil)
}
return nil
@@ -2041,7 +2041,7 @@ func (self *SElasticcache) SyncElasticcacheSecgroups(ctx context.Context, userCr
}
func (self *SElasticcache) StartSyncSecgroupsTask(ctx context.Context, userCred mcclient.TokenCredential, params *jsonutils.JSONDict, parentTaskId string) error {
self.SetStatus(userCred, api.ELASTIC_CACHE_STATUS_SYNCING, "")
self.SetStatus(ctx, userCred, api.ELASTIC_CACHE_STATUS_SYNCING, "")
task, err := taskman.TaskManager.NewTask(ctx, "ElasticcacheSyncsecgroupsTask", self, userCred, params, parentTaskId, "", nil)
if err != nil {
return err
@@ -2096,7 +2096,7 @@ func (self *SElasticcache) PerformSetAutoRenew(ctx context.Context, userCred mcc
}
func (self *SElasticcache) StartSetAutoRenewTask(ctx context.Context, userCred mcclient.TokenCredential, autoRenew bool, parentTaskId string) error {
self.SetStatus(userCred, api.ELASTIC_CACHE_SET_AUTO_RENEW, "")
self.SetStatus(ctx, userCred, api.ELASTIC_CACHE_SET_AUTO_RENEW, "")
data := jsonutils.NewDict()
data.Set("auto_renew", jsonutils.NewBool(autoRenew))
@@ -2141,7 +2141,7 @@ func (self *SElasticcache) PerformRenew(ctx context.Context, userCred mcclient.T
}
func (self *SElasticcache) startRenewTask(ctx context.Context, userCred mcclient.TokenCredential, duration string, parentTaskId string) error {
self.SetStatus(userCred, api.ELASTIC_CACHE_RENEWING, "")
self.SetStatus(ctx, userCred, api.ELASTIC_CACHE_RENEWING, "")
data := jsonutils.NewDict()
data.Add(jsonutils.NewString(duration), "duration")
task, err := taskman.TaskManager.NewTask(ctx, "ElasticcacheRenewTask", self, userCred, data, parentTaskId, "", nil)
@@ -229,7 +229,7 @@ func (self *SElasticcacheParameter) PostUpdate(ctx context.Context, userCred mcc
paramsObj.Add(v, self.Name)
params.Add(paramsObj, "parameters")
self.SetStatus(userCred, api.ELASTIC_CACHE_PARAMETER_STATUS_UPDATING, "")
self.SetStatus(ctx, userCred, api.ELASTIC_CACHE_PARAMETER_STATUS_UPDATING, "")
if err := self.StartUpdateElasticcacheParameterTask(ctx, userCred, params, ""); err != nil {
log.Errorf("ElasticcacheParameter %s", err.Error())
}
+10 -10
View File
@@ -1063,7 +1063,7 @@ func (self *SElasticip) startEipAllocateTask(ctx context.Context, userCred mccli
if err != nil {
return errors.Wrapf(err, "NewTask")
}
self.SetStatus(userCred, api.EIP_STATUS_ALLOCATE, "start allocate")
self.SetStatus(ctx, userCred, api.EIP_STATUS_ALLOCATE, "start allocate")
return task.ScheduleRun(nil)
}
@@ -1097,7 +1097,7 @@ func (self *SElasticip) StartEipDeallocateTask(ctx context.Context, userCred mcc
log.Errorf("newTask EipDeallocateTask fail %s", err)
return err
}
self.SetStatus(userCred, api.EIP_STATUS_DEALLOCATE, "start to delete")
self.SetStatus(ctx, userCred, api.EIP_STATUS_DEALLOCATE, "start to delete")
task.ScheduleRun(nil)
return nil
}
@@ -1288,7 +1288,7 @@ func (self *SElasticip) StartEipAssociateTask(ctx context.Context, userCred mccl
if err != nil {
return errors.Wrapf(err, "NewTask")
}
self.SetStatus(userCred, api.EIP_STATUS_ASSOCIATE, "start to associate")
self.SetStatus(ctx, userCred, api.EIP_STATUS_ASSOCIATE, "start to associate")
return task.ScheduleRun(nil)
}
@@ -1330,7 +1330,7 @@ func (self *SElasticip) StartEipDissociateTask(ctx context.Context, userCred mcc
log.Errorf("create EipDissociateTask fail %s", err)
return nil
}
self.SetStatus(userCred, api.EIP_STATUS_DISSOCIATE, "start to dissociate")
self.SetStatus(ctx, userCred, api.EIP_STATUS_DISSOCIATE, "start to dissociate")
task.ScheduleRun(nil)
return nil
}
@@ -1368,7 +1368,7 @@ func (self *SElasticip) PerformSyncstatus(ctx context.Context, userCred mcclient
if self.IsManaged() {
return nil, StartResourceSyncStatusTask(ctx, userCred, self, "EipSyncstatusTask", "")
} else {
return nil, self.SetStatus(userCred, api.EIP_STATUS_READY, "eip sync status")
return nil, self.SetStatus(ctx, userCred, api.EIP_STATUS_READY, "eip sync status")
}
}
@@ -1752,7 +1752,7 @@ func (eip *SElasticip) AllocateAndAssociateInstance(ctx context.Context, userCre
params := jsonutils.Marshal(input).(*jsonutils.JSONDict)
db.StatusBaseSetStatus(ins, userCred, api.INSTANCE_ASSOCIATE_EIP, "allocate and associate EIP")
db.StatusBaseSetStatus(ctx, ins, userCred, api.INSTANCE_ASSOCIATE_EIP, "allocate and associate EIP")
return eip.startEipAllocateTask(ctx, userCred, params, parentTaskId)
}
@@ -1786,7 +1786,7 @@ func (self *SElasticip) PerformChangeBandwidth(ctx context.Context, userCred mcc
func (self *SElasticip) StartEipChangeBandwidthTask(ctx context.Context, userCred mcclient.TokenCredential, bandwidth int64) error {
self.SetStatus(userCred, api.EIP_STATUS_CHANGE_BANDWIDTH, "change bandwidth")
self.SetStatus(ctx, userCred, api.EIP_STATUS_CHANGE_BANDWIDTH, "change bandwidth")
params := jsonutils.NewDict()
params.Add(jsonutils.NewInt(bandwidth), "bandwidth")
@@ -1800,7 +1800,7 @@ func (self *SElasticip) StartEipChangeBandwidthTask(ctx context.Context, userCre
return nil
}
func (self *SElasticip) DoChangeBandwidth(userCred mcclient.TokenCredential, bandwidth int) error {
func (self *SElasticip) DoChangeBandwidth(ctx context.Context, userCred mcclient.TokenCredential, bandwidth int) error {
changes := jsonutils.NewDict()
changes.Add(jsonutils.NewInt(int64(self.Bandwidth)), "obw")
@@ -1809,7 +1809,7 @@ func (self *SElasticip) DoChangeBandwidth(userCred mcclient.TokenCredential, ban
return nil
})
self.SetStatus(userCred, api.EIP_STATUS_READY, "finish change bandwidth")
self.SetStatus(ctx, userCred, api.EIP_STATUS_READY, "finish change bandwidth")
if err != nil {
log.Errorf("DoChangeBandwidth update fail %s", err)
@@ -1952,7 +1952,7 @@ func (self *SElasticip) StartRemoteUpdateTask(ctx context.Context, userCred mccl
if err != nil {
return errors.Wrap(err, "NewTask")
}
self.SetStatus(userCred, apis.STATUS_UPDATE_TAGS, "StartRemoteUpdateTask")
self.SetStatus(ctx, userCred, apis.STATUS_UPDATE_TAGS, "StartRemoteUpdateTask")
return task.ScheduleRun(nil)
}
+3 -3
View File
@@ -138,7 +138,7 @@ func (extProj *SExternalProject) RemoteCreateProject(ctx context.Context, userCr
if err == nil {
return nil
}
extProj.SetStatus(userCred, api.EXTERNAL_PROJECT_STATUS_UNAVAILABLE, err.Error())
extProj.SetStatus(ctx, userCred, api.EXTERNAL_PROJECT_STATUS_UNAVAILABLE, err.Error())
return errors.Wrap(err, "remoteCreateProjectInternal")
}
@@ -205,7 +205,7 @@ func (extProj *SExternalProject) PostCreate(
}
func (extProj *SExternalProject) startExternalProjectCreateTask(ctx context.Context, userCred mcclient.TokenCredential) error {
extProj.SetStatus(userCred, api.EXTERNAL_PROJECT_STATUS_CREATING, "")
extProj.SetStatus(ctx, userCred, api.EXTERNAL_PROJECT_STATUS_CREATING, "")
params := jsonutils.NewDict()
task, err := taskman.TaskManager.NewTask(ctx, "ExternalProjectCreateTask", extProj, userCred, params, "", "", nil)
if err != nil {
@@ -297,7 +297,7 @@ func (manager *SExternalProjectManager) SyncProjects(ctx context.Context, userCr
for i := 0; i < len(removed); i++ {
if removed[i].Source == apis.EXTERNAL_RESOURCE_SOURCE_LOCAL {
removed[i].SetStatus(userCred, api.EXTERNAL_PROJECT_STATUS_UNKNOWN, "sync delete")
removed[i].SetStatus(ctx, userCred, api.EXTERNAL_PROJECT_STATUS_UNKNOWN, "sync delete")
} else {
err = removed[i].syncRemoveCloudProject(ctx, userCred)
if err != nil {
+6 -6
View File
@@ -203,10 +203,10 @@ func (fileSystem *SFileSystem) StartCreateTask(ctx context.Context, userCred mcc
return task.ScheduleRun(nil)
}()
if err != nil {
fileSystem.SetStatus(userCred, api.NAS_STATUS_CREATE_FAILED, err.Error())
fileSystem.SetStatus(ctx, userCred, api.NAS_STATUS_CREATE_FAILED, err.Error())
return err
}
fileSystem.SetStatus(userCred, api.NAS_STATUS_CREATING, "")
fileSystem.SetStatus(ctx, userCred, api.NAS_STATUS_CREATING, "")
return nil
}
@@ -387,7 +387,7 @@ func (fileSystem *SFileSystem) syncRemove(ctx context.Context, userCred mcclient
err := fileSystem.ValidateDeleteCondition(ctx, nil)
if err != nil { // cannot delete
return fileSystem.SetStatus(userCred, api.NAS_STATUS_UNKNOWN, "sync to delete")
return fileSystem.SetStatus(ctx, userCred, api.NAS_STATUS_UNKNOWN, "sync to delete")
}
err = fileSystem.RealDelete(ctx, userCred)
@@ -415,10 +415,10 @@ func (fileSystem *SFileSystem) StartDeleteTask(ctx context.Context, userCred mcc
return task.ScheduleRun(nil)
}()
if err != nil {
fileSystem.SetStatus(userCred, api.NAS_STATUS_DELETE_FAILED, err.Error())
fileSystem.SetStatus(ctx, userCred, api.NAS_STATUS_DELETE_FAILED, err.Error())
return nil
}
fileSystem.SetStatus(userCred, api.NAS_STATUS_DELETING, "")
fileSystem.SetStatus(ctx, userCred, api.NAS_STATUS_DELETING, "")
return nil
}
@@ -639,7 +639,7 @@ func (fileSystem *SFileSystem) StartRemoteUpdateTask(ctx context.Context, userCr
if err != nil {
return errors.Wrap(err, "NewTask")
}
fileSystem.SetStatus(userCred, api.NAS_UPDATE_TAGS, "StartRemoteUpdateTask")
fileSystem.SetStatus(ctx, userCred, api.NAS_UPDATE_TAGS, "StartRemoteUpdateTask")
return task.ScheduleRun(nil)
}
+2 -2
View File
@@ -381,7 +381,7 @@ func (self *SGlobalVpc) StartDeleteTask(ctx context.Context, userCred mcclient.T
if err != nil {
return errors.Wrapf(err, "NewTask")
}
self.SetStatus(userCred, apis.STATUS_DELETING, "")
self.SetStatus(ctx, userCred, apis.STATUS_DELETING, "")
return task.ScheduleRun(nil)
}
@@ -399,7 +399,7 @@ func (self *SGlobalVpc) GetICloudGlobalVpc(ctx context.Context) (cloudprovider.I
func (self *SGlobalVpc) syncRemoveGlobalVpc(ctx context.Context, userCred mcclient.TokenCredential) error {
err := self.ValidateDeleteCondition(ctx, nil)
if err != nil {
self.SetStatus(userCred, apis.STATUS_UNKNOWN, "sync remove")
self.SetStatus(ctx, userCred, apis.STATUS_UNKNOWN, "sync remove")
return err
}
return self.RealDelete(ctx, userCred)
+2 -2
View File
@@ -764,7 +764,7 @@ func (grp *SGroup) PerformAssociateEip(ctx context.Context, userCred mcclient.To
}
}
grp.SetStatus(userCred, api.INSTANCE_ASSOCIATE_EIP, "associate eip")
grp.SetStatus(ctx, userCred, api.INSTANCE_ASSOCIATE_EIP, "associate eip")
params := jsonutils.NewDict()
params.Add(jsonutils.NewString(grp.Id), "instance_id")
@@ -862,7 +862,7 @@ func (grp *SGroup) PerformDissociateEip(ctx context.Context, userCred mcclient.T
return nil, errors.Wrap(err, "eip is not accessible")
}
grp.SetStatus(userCred, api.INSTANCE_DISSOCIATE_EIP, "associate eip")
grp.SetStatus(ctx, userCred, api.INSTANCE_DISSOCIATE_EIP, "associate eip")
autoDelete := (input.AudoDelete != nil && *input.AudoDelete)
+40 -41
View File
@@ -530,7 +530,7 @@ func (self *SGuest) StartMigrateTask(
ctx context.Context, userCred mcclient.TokenCredential,
isRescueMode, autoStart bool, guestStatus, preferHostId, parentTaskId string,
) error {
self.SetStatus(userCred, api.VM_START_MIGRATE, "")
self.SetStatus(ctx, userCred, api.VM_START_MIGRATE, "")
data := jsonutils.NewDict()
if isRescueMode {
data.Set("is_rescue_mode", jsonutils.JSONTrue)
@@ -574,7 +574,7 @@ func (self *SGuest) StartGuestLiveMigrateTask(
skipCpuCheck, skipKernelCheck, enableTLS, quicklyFinish *bool,
maxBandwidthMb *int64, keepDestGuestOnFailed *bool, parentTaskId string,
) error {
self.SetStatus(userCred, api.VM_START_MIGRATE, "")
self.SetStatus(ctx, userCred, api.VM_START_MIGRATE, "")
data := jsonutils.NewDict()
if len(preferHostId) > 0 {
data.Set("prefer_host_id", jsonutils.NewString(preferHostId))
@@ -921,7 +921,7 @@ func (self *SGuest) PerformAttachdisk(ctx context.Context, userCred mcclient.Tok
taskData.Add(jsonutils.NewInt(int64(*input.BootIndex)), "boot_index")
}
self.SetStatus(userCred, api.VM_ATTACH_DISK, "")
self.SetStatus(ctx, userCred, api.VM_ATTACH_DISK, "")
return nil, self.GetDriver().StartGuestAttachDiskTask(ctx, userCred, self, taskData, "")
}
@@ -957,7 +957,7 @@ func (self *SGuest) StartQgaRestartNetworkTask(ctx context.Context, userCred mcc
func (self *SGuest) startSyncTask(ctx context.Context, userCred mcclient.TokenCredential, firewallOnly bool, parentTaskId string, data *jsonutils.JSONDict) error {
if firewallOnly {
data.Add(jsonutils.JSONTrue, "fw_only")
} else if err := self.SetStatus(userCred, api.VM_SYNC_CONFIG, ""); err != nil {
} else if err := self.SetStatus(ctx, userCred, api.VM_SYNC_CONFIG, ""); err != nil {
log.Errorln(err)
return err
}
@@ -993,7 +993,7 @@ func (self *SGuest) PerformSuspend(ctx context.Context, userCred mcclient.TokenC
}
func (self *SGuest) StartSuspendTask(ctx context.Context, userCred mcclient.TokenCredential, parentTaskId string) error {
err := self.SetStatus(userCred, api.VM_START_SUSPEND, "do suspend")
err := self.SetStatus(ctx, userCred, api.VM_START_SUSPEND, "do suspend")
if err != nil {
return err
}
@@ -1009,7 +1009,7 @@ func (self *SGuest) PerformResume(ctx context.Context, userCred mcclient.TokenCr
}
func (self *SGuest) StartResumeTask(ctx context.Context, userCred mcclient.TokenCredential, parentTaskId string) error {
err := self.SetStatus(userCred, api.VM_RESUMING, "do resume")
err := self.SetStatus(ctx, userCred, api.VM_RESUMING, "do resume")
if err != nil {
return err
}
@@ -1058,7 +1058,7 @@ func (self *SGuest) StartGuestDeployTask(
ctx context.Context, userCred mcclient.TokenCredential,
kwargs *jsonutils.JSONDict, action string, parentTaskId string,
) error {
self.SetStatus(userCred, api.VM_START_DEPLOY, "")
self.SetStatus(ctx, userCred, api.VM_START_DEPLOY, "")
if kwargs == nil {
kwargs = jsonutils.NewDict()
}
@@ -1186,7 +1186,7 @@ func (self *SGuest) NotifyAdminServerEvent(ctx context.Context, event string, pr
func (self *SGuest) StartGuestStopTask(ctx context.Context, userCred mcclient.TokenCredential, isForce, stopCharging bool, parentTaskId string) error {
if len(parentTaskId) == 0 {
self.SetStatus(userCred, api.VM_START_STOP, "")
self.SetStatus(ctx, userCred, api.VM_START_STOP, "")
}
params := jsonutils.NewDict()
params.Add(jsonutils.NewBool(isForce), "is_force")
@@ -1447,7 +1447,7 @@ func (self *SGuest) GuestSchedStartTask(
ctx context.Context, userCred mcclient.TokenCredential,
data *jsonutils.JSONDict, parentTaskId string,
) error {
self.SetStatus(userCred, api.VM_SCHEDULE, "")
self.SetStatus(ctx, userCred, api.VM_SCHEDULE, "")
task, err := taskman.TaskManager.NewTask(ctx, "GuestSchedStartTask", self, userCred, data,
parentTaskId, "", nil)
if err != nil {
@@ -1461,7 +1461,7 @@ func (self *SGuest) GuestNonSchedStartTask(
ctx context.Context, userCred mcclient.TokenCredential,
data *jsonutils.JSONDict, parentTaskId string,
) error {
self.SetStatus(userCred, api.VM_START_START, "")
self.SetStatus(ctx, userCred, api.VM_START_START, "")
taskName := "GuestStartTask"
if self.BackupHostId != "" {
taskName = "HAGuestStartTask"
@@ -1543,7 +1543,7 @@ func (self *SGuest) StartDeleteGuestTask(
params := jsonutils.NewDict()
params.Add(jsonutils.NewString(self.Status), "guest_status")
params.Update(jsonutils.Marshal(opts))
self.SetStatus(userCred, api.VM_START_DELETE, "")
self.SetStatus(ctx, userCred, api.VM_START_DELETE, "")
return self.GetDriver().StartDeleteGuestTask(ctx, userCred, self, params, parentTaskId)
}
@@ -1742,7 +1742,7 @@ func (self *SGuest) StartRebuildRootTask(ctx context.Context, userCred mcclient.
}
data.Set("deploy_params", jsonutils.Marshal(deployInput))
self.SetStatus(userCred, api.VM_REBUILD_ROOT, "request start rebuild root")
self.SetStatus(ctx, userCred, api.VM_REBUILD_ROOT, "request start rebuild root")
task, err := taskman.TaskManager.NewTask(ctx, "GuestRebuildRootTask", self, userCred, data, "", "", nil)
if err != nil {
return err
@@ -1872,7 +1872,7 @@ func (self *SGuest) PerformDetachdisk(ctx context.Context, userCred mcclient.Tok
}
if utils.IsInStringArray(self.Status, detachDiskStatus) {
self.SetStatus(userCred, api.VM_DETACH_DISK, "")
self.SetStatus(ctx, userCred, api.VM_DETACH_DISK, "")
err = self.StartGuestDetachdiskTask(ctx, userCred, disk, input.KeepDisk, "", false, false)
return nil, err
}
@@ -1898,7 +1898,7 @@ func (self *SGuest) StartGuestDetachdiskTask(
return nil
})
}
disk.SetStatus(userCred, api.DISK_DETACHING, "")
disk.SetStatus(ctx, userCred, api.DISK_DETACHING, "")
return self.GetDriver().StartGuestDetachdiskTask(ctx, userCred, self, taskData, parentTaskId)
}
@@ -2476,7 +2476,7 @@ func (self *SGuest) PerformChangeIpaddr(
if self.Status == api.VM_BLOCK_STREAM {
taskData.Set("in_block_stream", jsonutils.JSONTrue)
}
self.SetStatus(userCred, api.VM_RESTART_NETWORK, "restart network")
self.SetStatus(ctx, userCred, api.VM_RESTART_NETWORK, "restart network")
}
return nil, self.startSyncTask(ctx, userCred, false, "", taskData)
}
@@ -2924,7 +2924,7 @@ func (self *SGuest) ChangeConfToSchedDesc(addCpu, addMem int, schedInputDisks []
func (self *SGuest) StartChangeConfigTask(ctx context.Context, userCred mcclient.TokenCredential,
confs *api.ServerChangeConfigSettings, parentTaskId string, pendingUsage quotas.IQuota) error {
self.SetStatus(userCred, api.VM_CHANGE_FLAVOR, "")
self.SetStatus(ctx, userCred, api.VM_CHANGE_FLAVOR, "")
task, err := taskman.TaskManager.NewTask(ctx, "GuestChangeConfigTask", self, userCred, jsonutils.Marshal(confs).(*jsonutils.JSONDict), parentTaskId, "", pendingUsage)
if err != nil {
return err
@@ -3036,7 +3036,7 @@ func (self *SGuest) isNotRunningStatus(status string) bool {
return false
}
func (self *SGuest) SetStatus(userCred mcclient.TokenCredential, status, reason string) error {
func (self *SGuest) SetStatus(ctx context.Context, userCred mcclient.TokenCredential, status, reason string) error {
if status == api.VM_RUNNING {
if err := self.SetPowerStates(api.VM_POWER_STATES_ON); err != nil {
return err
@@ -3047,11 +3047,10 @@ func (self *SGuest) SetStatus(userCred mcclient.TokenCredential, status, reason
}
}
err := self.SVirtualResourceBase.SetStatus(userCred, status, reason)
err := self.SVirtualResourceBase.SetStatus(ctx, userCred, status, reason)
if err != nil {
return errors.Wrap(err, "setStatus")
}
db.CallUpdateNotifyHook(context.Background(), userCred, self)
return nil
}
@@ -3163,7 +3162,7 @@ func (self *SGuest) PerformFreeze(ctx context.Context, userCred mcclient.TokenCr
}
func (self *SGuest) StartGuestStopAndFreezeTask(ctx context.Context, userCred mcclient.TokenCredential) error {
self.SetStatus(userCred, api.VM_START_STOP, "")
self.SetStatus(ctx, userCred, api.VM_START_STOP, "")
task, err := taskman.TaskManager.NewTask(ctx, "GuestStopAndFreezeTask", self, userCred, nil, "", "", nil)
if err != nil {
return err
@@ -3320,7 +3319,7 @@ func (self *SGuest) PerformAssociateEip(ctx context.Context, userCred mcclient.T
return nil, httperrors.NewInputParameterError("cannot associate eip and instance in different provider")
}
self.SetStatus(userCred, api.INSTANCE_ASSOCIATE_EIP, "associate eip")
self.SetStatus(ctx, userCred, api.INSTANCE_ASSOCIATE_EIP, "associate eip")
params := jsonutils.NewDict()
params.Add(jsonutils.NewString(self.ExternalId), "instance_external_id")
@@ -3350,7 +3349,7 @@ func (self *SGuest) PerformDissociateEip(ctx context.Context, userCred mcclient.
return nil, errors.Wrap(err, "eip is not accessible")
}
self.SetStatus(userCred, api.INSTANCE_DISSOCIATE_EIP, "associate eip")
self.SetStatus(ctx, userCred, api.INSTANCE_DISSOCIATE_EIP, "associate eip")
autoDelete := (input.AudoDelete != nil && *input.AudoDelete)
@@ -3545,7 +3544,7 @@ func (self *SGuest) PerformSwitchToBackup(
log.Errorln(err)
return nil, err
} else {
self.SetStatus(userCred, api.VM_SWITCH_TO_BACKUP, "Switch to backup")
self.SetStatus(ctx, userCred, api.VM_SWITCH_TO_BACKUP, "Switch to backup")
task.ScheduleRun(nil)
}
return nil, nil
@@ -3643,7 +3642,7 @@ func (self *SGuest) PerformBlockStreamFailed(ctx context.Context, userCred mccli
if self.Status == api.VM_BLOCK_STREAM || self.Status == api.VM_RUNNING {
reason, _ := data.GetString("reason")
logclient.AddSimpleActionLog(self, logclient.ACT_VM_BLOCK_STREAM, reason, userCred, false)
return nil, self.SetStatus(userCred, api.VM_BLOCK_STREAM_FAIL, reason)
return nil, self.SetStatus(ctx, userCred, api.VM_BLOCK_STREAM_FAIL, reason)
}
return nil, nil
}
@@ -3845,7 +3844,7 @@ func (self *SGuest) StartGuestCreateBackupTask(
params := data.(*jsonutils.JSONDict)
params.Set("guest_status", jsonutils.NewString(self.Status))
self.SetStatus(userCred, api.VM_BACKUP_CREATING, "")
self.SetStatus(ctx, userCred, api.VM_BACKUP_CREATING, "")
task, err := taskman.TaskManager.NewTask(ctx, "GuestCreateBackupTask", self, userCred, params, parentTaskId, "", &req)
if err != nil {
quotas.CancelPendingUsage(ctx, userCred, &req, &req, false)
@@ -3872,7 +3871,7 @@ func (self *SGuest) PerformDeleteBackup(ctx context.Context, userCred mcclient.T
taskData := jsonutils.NewDict()
taskData.Set("purge", jsonutils.NewBool(jsonutils.QueryBoolean(data, "purge", false)))
taskData.Set("create", jsonutils.NewBool(jsonutils.QueryBoolean(data, "create", false)))
self.SetStatus(userCred, api.VM_DELETING_BACKUP, "delete backup server")
self.SetStatus(ctx, userCred, api.VM_DELETING_BACKUP, "delete backup server")
if task, err := taskman.TaskManager.NewTask(
ctx, "GuestDeleteBackupTask", self, userCred, taskData, "", "", nil); err != nil {
log.Errorln(err)
@@ -4053,7 +4052,7 @@ func (self *SGuest) GetStorages() ([]SStorage, error) {
}
func (self *SGuest) startGuestRenewTask(ctx context.Context, userCred mcclient.TokenCredential, duration string, parentTaskId string) error {
self.SetStatus(userCred, api.VM_RENEWING, "")
self.SetStatus(ctx, userCred, api.VM_RENEWING, "")
data := jsonutils.NewDict()
data.Add(jsonutils.NewString(duration), "duration")
task, err := taskman.TaskManager.NewTask(ctx, "GuestRenewTask", self, userCred, data, parentTaskId, "", nil)
@@ -4292,7 +4291,7 @@ func (self *SGuest) importDisks(ctx context.Context, userCred mcclient.TokenCred
if err != nil {
return err
}
disk.SetStatus(userCred, api.DISK_READY, "")
disk.SetStatus(ctx, userCred, api.DISK_READY, "")
}
return nil
}
@@ -4593,7 +4592,7 @@ func (guest *SGuest) PerformResizeDisk(ctx context.Context, userCred mcclient.To
}
func (guest *SGuest) StartGuestDiskResizeTask(ctx context.Context, userCred mcclient.TokenCredential, diskId string, sizeMb int64, parentTaskId string, pendingUsage quotas.IQuota) error {
guest.SetStatus(userCred, api.VM_START_RESIZE_DISK, "StartGuestDiskResizeTask")
guest.SetStatus(ctx, userCred, api.VM_START_RESIZE_DISK, "StartGuestDiskResizeTask")
params := jsonutils.NewDict()
params.Add(jsonutils.NewInt(sizeMb), "size")
params.Add(jsonutils.NewString(diskId), "disk_id")
@@ -4664,7 +4663,7 @@ func (self *SGuest) UpdateIoThrottle(input *api.ServerSetDiskIoThrottleInput) er
func (self *SGuest) StartBlockIoThrottleTask(ctx context.Context, userCred mcclient.TokenCredential, input *api.ServerSetDiskIoThrottleInput) error {
params := jsonutils.Marshal(input).(*jsonutils.JSONDict)
params.Set("old_status", jsonutils.NewString(self.Status))
self.SetStatus(userCred, api.VM_IO_THROTTLE, "start block io throttle task")
self.SetStatus(ctx, userCred, api.VM_IO_THROTTLE, "start block io throttle task")
task, err := taskman.TaskManager.NewTask(ctx, "GuestBlockIoThrottleTask", self, userCred, params, "", "", nil)
if err != nil {
log.Errorf("%s", err)
@@ -5013,12 +5012,12 @@ func (self *SGuest) InstaceCreateSnapshot(
instanceSnapshot *SInstanceSnapshot,
pendingUsage *SRegionQuota,
) error {
self.SetStatus(userCred, api.VM_START_INSTANCE_SNAPSHOT, "instance snapshot")
self.SetStatus(ctx, userCred, api.VM_START_INSTANCE_SNAPSHOT, "instance snapshot")
return instanceSnapshot.StartCreateInstanceSnapshotTask(ctx, userCred, pendingUsage, "")
}
func (self *SGuest) InstanceCreateBackup(ctx context.Context, userCred mcclient.TokenCredential, instanceBackup *SInstanceBackup) error {
self.SetStatus(userCred, api.VM_START_INSTANCE_BACKUP, "instance backup")
self.SetStatus(ctx, userCred, api.VM_START_INSTANCE_BACKUP, "instance backup")
return instanceBackup.StartCreateInstanceBackupTask(ctx, userCred, "")
}
@@ -5064,8 +5063,8 @@ func (self *SGuest) StartSnapshotResetTask(ctx context.Context, userCred mcclien
data.Set("auto_start", jsonutils.JSONTrue)
}
data.Add(jsonutils.NewBool(withMemory), "with_memory")
self.SetStatus(userCred, api.VM_START_SNAPSHOT_RESET, "start snapshot reset task")
instanceSnapshot.SetStatus(userCred, api.INSTANCE_SNAPSHOT_RESET, "start snapshot reset task")
self.SetStatus(ctx, userCred, api.VM_START_SNAPSHOT_RESET, "start snapshot reset task")
instanceSnapshot.SetStatus(ctx, userCred, api.INSTANCE_SNAPSHOT_RESET, "start snapshot reset task")
log.Errorf("====data: %s", data)
if task, err := taskman.TaskManager.NewTask(
ctx, "InstanceSnapshotResetTask", instanceSnapshot, userCred, data, "", "", nil,
@@ -5177,7 +5176,7 @@ func (self *SGuest) StartInstanceSnapshotAndCloneTask(
ctx, "InstanceSnapshotAndCloneTask", instanceSnapshot, userCred, params, "", "", pendingUsage, pendingRegionUsage); err != nil {
return err
} else {
self.SetStatus(userCred, api.VM_START_INSTANCE_SNAPSHOT, "instance snapshot")
self.SetStatus(ctx, userCred, api.VM_START_INSTANCE_SNAPSHOT, "instance snapshot")
task.ScheduleRun(nil)
return nil
}
@@ -5257,7 +5256,7 @@ func (self *SGuest) PerformResetNicTrafficLimit(ctx context.Context, userCred mc
params := jsonutils.Marshal(input).(*jsonutils.JSONDict)
params.Set("old_status", jsonutils.NewString(self.Status))
self.SetStatus(userCred, api.VM_SYNC_TRAFFIC_LIMIT, "PerformResetNicTrafficLimit")
self.SetStatus(ctx, userCred, api.VM_SYNC_TRAFFIC_LIMIT, "PerformResetNicTrafficLimit")
task, err := taskman.TaskManager.NewTask(ctx, "GuestResetNicTrafficsTask", self, userCred, params, "", "", nil)
if err != nil {
return nil, err
@@ -5282,7 +5281,7 @@ func (self *SGuest) PerformSetNicTrafficLimit(ctx context.Context, userCred mccl
}
params := jsonutils.Marshal(input).(*jsonutils.JSONDict)
params.Set("old_status", jsonutils.NewString(self.Status))
self.SetStatus(userCred, api.VM_SYNC_TRAFFIC_LIMIT, "GuestSetNicTrafficsTask")
self.SetStatus(ctx, userCred, api.VM_SYNC_TRAFFIC_LIMIT, "GuestSetNicTrafficsTask")
task, err := taskman.TaskManager.NewTask(ctx, "GuestSetNicTrafficsTask", self, userCred, params, "", "", nil)
if err != nil {
return nil, err
@@ -5418,7 +5417,7 @@ func (self *SGuest) StartPublicipToEipTask(ctx context.Context, userCred mcclien
if err != nil {
return errors.Wrap(err, "NewTask")
}
self.SetStatus(userCred, api.VM_START_EIP_CONVERT, "")
self.SetStatus(ctx, userCred, api.VM_START_EIP_CONVERT, "")
task.ScheduleRun(nil)
return nil
}
@@ -5477,7 +5476,7 @@ func (self *SGuest) StartSetAutoRenewTask(ctx context.Context, userCred mcclient
if err != nil {
return errors.Wrap(err, "NewTask")
}
self.SetStatus(userCred, api.VM_SET_AUTO_RENEW, "")
self.SetStatus(ctx, userCred, api.VM_SET_AUTO_RENEW, "")
task.ScheduleRun(nil)
return nil
}
@@ -5603,7 +5602,7 @@ func (self *SGuest) StartGuestChangeStorageTask(ctx context.Context, userCred mc
GuestRunning: self.Status == api.VM_RUNNING,
}
reason := fmt.Sprintf("Change guest disks storage to %s", input.TargetStorageId)
self.SetStatus(userCred, api.VM_DISK_CHANGE_STORAGE, reason)
self.SetStatus(ctx, userCred, api.VM_DISK_CHANGE_STORAGE, reason)
if task, err := taskman.TaskManager.NewTask(
ctx, "GuestChangeDisksStorageTask", self, userCred, jsonutils.Marshal(params).(*jsonutils.JSONDict),
"", "", nil); err != nil {
@@ -5680,7 +5679,7 @@ func (self *SGuest) PerformChangeDiskStorage(ctx context.Context, userCred mccli
func (self *SGuest) StartChangeDiskStorageTask(ctx context.Context, userCred mcclient.TokenCredential, input *api.ServerChangeDiskStorageInternalInput, parentTaskId string) error {
reason := fmt.Sprintf("Change disk %s to storage %s", input.DiskId, input.TargetStorageId)
self.SetStatus(userCred, api.VM_DISK_CHANGE_STORAGE, reason)
self.SetStatus(ctx, userCred, api.VM_DISK_CHANGE_STORAGE, reason)
return self.GetDriver().StartChangeDiskStorageTask(self, ctx, userCred, input, parentTaskId)
}
+1 -1
View File
@@ -147,7 +147,7 @@ func (self *SGuest) StartConvertToKvmTask(
if err != nil {
return err
} else {
self.SetStatus(userCred, api.VM_CONVERTING, "esxi guest convert to kvm")
self.SetStatus(ctx, userCred, api.VM_CONVERTING, "esxi guest convert to kvm")
task.ScheduleRun(nil)
return nil
}
+4 -4
View File
@@ -133,7 +133,7 @@ func (gtm *SGuestTemplateManager) ValidateCreateData(
func (gt *SGuestTemplate) PostCreate(ctx context.Context, userCred mcclient.TokenCredential,
ownerId mcclient.IIdentityProvider, query jsonutils.JSONObject, data jsonutils.JSONObject) {
gt.SetStatus(userCred, computeapis.GT_READY, "")
gt.SetStatus(ctx, userCred, computeapis.GT_READY, "")
gt.updateCheckTime()
logclient.AddActionLogWithContext(ctx, gt, logclient.ACT_CREATE, nil, userCred, true)
}
@@ -776,7 +776,7 @@ func (manager *SGuestTemplateManager) ListItemExportKeys(ctx context.Context,
func (g *SGuest) PerformSaveTemplate(ctx context.Context, userCred mcclient.TokenCredential,
query jsonutils.JSONObject, input computeapis.GuestSaveToTemplateInput) (jsonutils.JSONObject, error) {
g.SetStatus(userCred, computeapis.VM_TEMPLATE_SAVING, "save to template")
g.SetStatus(ctx, userCred, computeapis.VM_TEMPLATE_SAVING, "save to template")
if len(input.Name) == 0 && len(input.GenerateName) == 0 {
input.GenerateName = fmt.Sprintf("%s-template", g.Name)
@@ -798,14 +798,14 @@ func (gt *SGuestTemplate) inspect(ctx context.Context, userCred mcclient.TokenCr
_, err := GuestTemplateManager.validateContent(ctx, userCred, gt.GetOwnerId(), jsonutils.NewDict(), gt.Content.(*jsonutils.JSONDict))
if err == nil {
gt.updateCheckTime()
gt.SetStatus(userCred, computeapis.GT_READY, "inspect successfully")
gt.SetStatus(ctx, userCred, computeapis.GT_READY, "inspect successfully")
logclient.AddSimpleActionLog(gt, logclient.ACT_HEALTH_CHECK, "", userCred, true)
return nil
}
// invalid
gt.updateCheckTime()
reason := fmt.Sprintf("During the inspection, the guest template is not available: %s", err.Error())
gt.SetStatus(userCred, computeapis.GT_INVALID, reason)
gt.SetStatus(ctx, userCred, computeapis.GT_INVALID, reason)
logclient.AddSimpleActionLog(gt, logclient.ACT_HEALTH_CHECK, reason, userCred, false)
return nil
}
+4 -4
View File
@@ -2397,7 +2397,7 @@ func (manager *SGuestManager) OnCreateComplete(ctx context.Context, items []db.I
if err != nil {
for i := range items {
guest := items[i].(*SGuest)
guest.SetStatus(userCred, api.VM_CREATE_FAILED, err.Error())
guest.SetStatus(ctx, userCred, api.VM_CREATE_FAILED, err.Error())
}
}
}
@@ -2986,7 +2986,7 @@ func (self *SGuest) SyncRemoveCloudVM(ctx context.Context, userCred mcclient.Tok
}
if self.Status != api.VM_UNKNOWN {
self.SetStatus(userCred, api.VM_UNKNOWN, "Sync lost")
self.SetStatus(ctx, userCred, api.VM_UNKNOWN, "Sync lost")
}
if options.Options.EnableSyncPurge {
@@ -5622,7 +5622,7 @@ func (manager *SGuestManager) CleanPendingDeleteServers(ctx context.Context, use
iVm, err := guests[i].GetIVM(ctx)
if err == nil && iVm.GetStatus() == api.VM_RUNNING {
if guests[i].Status != api.VM_DELETE_FAIL {
guests[i].SetStatus(userCred, api.VM_DELETE_FAIL, "vm status is running")
guests[i].SetStatus(ctx, userCred, api.VM_DELETE_FAIL, "vm status is running")
}
continue
}
@@ -6606,7 +6606,7 @@ func (guest *SGuest) StartRemoteUpdateTask(ctx context.Context, userCred mcclien
log.Errorln(err)
return errors.Wrap(err, "Start GuestRemoteUpdateTask")
} else {
guest.SetStatus(userCred, api.VM_UPDATE_TAGS, "StartRemoteUpdateTask")
guest.SetStatus(ctx, userCred, api.VM_UPDATE_TAGS, "StartRemoteUpdateTask")
task.ScheduleRun(nil)
}
return nil
+1 -1
View File
@@ -55,7 +55,7 @@ type IHostDriver interface {
PrepareConvert(host *SHost, image, raid string, data jsonutils.JSONObject) (*api.ServerCreateInput, error)
PrepareUnconvert(host *SHost) error
FinishUnconvert(ctx context.Context, userCred mcclient.TokenCredential, host *SHost) error
FinishConvert(userCred mcclient.TokenCredential, host *SHost, guest *SGuest, hostType string) error
FinishConvert(ctx context.Context, userCred mcclient.TokenCredential, host *SHost, guest *SGuest, hostType string) error
ConvertFailed(host *SHost) error
GetRaidScheme(host *SHost, raid string) (string, error)
+28 -32
View File
@@ -1090,11 +1090,11 @@ func (hh *SHost) _getAttachedStorages(isBaremetal tristate.TriState, enabled tri
return ret
}
func (hh *SHost) SyncAttachedStorageStatus() {
func (hh *SHost) SyncAttachedStorageStatus(ctx context.Context) {
storages := hh.GetAttachedEnabledHostStorages(nil)
if storages != nil {
for _, storage := range storages {
storage.SyncStatusWithHosts()
storage.SyncStatusWithHosts(ctx)
}
hh.ClearSchedDescCache()
}
@@ -2271,7 +2271,7 @@ func (hh *SHost) SyncHostStorages(ctx context.Context, userCred mcclient.TokenCr
log.Infof("host %s not connected with %s any more, to detach...", hh.Id, removed[i].Id)
err := hh.syncRemoveCloudHostStorage(ctx, userCred, &removed[i])
if errors.Cause(err) == ErrStorageInUse && removed[i].StorageType == api.STORAGE_LOCAL {
removed[i].SetStatus(userCred, api.STORAGE_OFFLINE, "the only host used this local storage has detached")
removed[i].SetStatus(ctx, userCred, api.STORAGE_OFFLINE, "the only host used this local storage has detached")
// prevent generating a delete error for syncResult
continue
}
@@ -3999,7 +3999,7 @@ func (hh *SHost) PerformStart(
// if !utils.IsInStringArray(guest.Status, []string{VM_ADMIN}) {
// return nil, httperrors.NewBadRequestError("Cannot start baremetal with active guest")
// }
hh.SetStatus(userCred, api.BAREMETAL_START_MAINTAIN, "")
hh.SetStatus(ctx, userCred, api.BAREMETAL_START_MAINTAIN, "")
return guest.PerformStart(ctx, userCred, query, api.GuestPerformStartInput{})
}
params := jsonutils.NewDict()
@@ -4034,7 +4034,7 @@ func (hh *SHost) PerformStop(ctx context.Context, userCred mcclient.TokenCredent
if utils.ToBool(guest.GetMetadata(ctx, "is_fake_baremetal_server", userCred)) {
return nil, hh.InitializedGuestStop(ctx, userCred, guest)
}
hh.SetStatus(userCred, api.BAREMETAL_START_MAINTAIN, "")
hh.SetStatus(ctx, userCred, api.BAREMETAL_START_MAINTAIN, "")
input := api.ServerStopInput{}
data.Unmarshal(&input)
return guest.PerformStop(ctx, userCred, query, input)
@@ -4074,7 +4074,7 @@ func (hh *SHost) PerformMaintenance(ctx context.Context, userCred mcclient.Token
if guest.Status == api.VM_RUNNING {
params.Set("guest_running", jsonutils.NewBool(true))
}
guest.SetStatus(userCred, api.VM_ADMIN, "")
guest.SetStatus(ctx, userCred, api.VM_ADMIN, "")
}
if hh.Status == api.BAREMETAL_RUNNING && jsonutils.QueryBoolean(data, "force_reboot", false) {
params.Set("force_reboot", jsonutils.NewBool(true))
@@ -4084,7 +4084,7 @@ func (hh *SHost) PerformMaintenance(ctx context.Context, userCred mcclient.Token
action, _ = data.GetString("action")
}
params.Set("action", jsonutils.NewString(action))
hh.SetStatus(userCred, api.BAREMETAL_START_MAINTAIN, "")
hh.SetStatus(ctx, userCred, api.BAREMETAL_START_MAINTAIN, "")
task, err := taskman.TaskManager.NewTask(ctx, "BaremetalMaintenanceTask", hh, userCred, params, "", "", nil)
if err != nil {
return nil, err
@@ -4114,7 +4114,7 @@ func (hh *SHost) PerformUnmaintenance(ctx context.Context, userCred mcclient.Tok
}
func (hh *SHost) StartBaremetalUnmaintenanceTask(ctx context.Context, userCred mcclient.TokenCredential, startGuest bool, action string) error {
hh.SetStatus(userCred, api.BAREMETAL_START_MAINTAIN, "")
hh.SetStatus(ctx, userCred, api.BAREMETAL_START_MAINTAIN, "")
params := jsonutils.NewDict()
params.Set("guest_running", jsonutils.NewBool(startGuest))
if len(action) == 0 {
@@ -4164,7 +4164,7 @@ func (hh *SHost) PerformOffline(ctx context.Context, userCred mcclient.TokenCred
ndata.Add(jsonutils.NewString(input.Reason), "reason")
}
notifyclient.SystemExceptionNotify(ctx, napi.ActionOffline, HostManager.Keyword(), ndata)
hh.SyncAttachedStorageStatus()
hh.SyncAttachedStorageStatus(ctx)
}
return nil, nil
}
@@ -4188,7 +4188,7 @@ func (hh *SHost) PerformOnline(ctx context.Context, userCred mcclient.TokenCrede
}
db.OpsLog.LogEvent(hh, db.ACT_ONLINE, "", userCred)
logclient.AddActionLogWithContext(ctx, hh, logclient.ACT_ONLINE, data, userCred, true)
hh.SyncAttachedStorageStatus()
hh.SyncAttachedStorageStatus(ctx)
hh.StartSyncAllGuestsStatusTask(ctx, userCred)
}
return nil, nil
@@ -4475,7 +4475,7 @@ func (hh *SHost) StartPrepareTask(ctx context.Context, userCred mcclient.TokenCr
if len(onfinish) > 0 {
data.Set("on_finish", jsonutils.NewString(onfinish))
}
hh.SetStatus(userCred, api.BAREMETAL_PREPARE, "start prepare task")
hh.SetStatus(ctx, userCred, api.BAREMETAL_PREPARE, "start prepare task")
if task, err := taskman.TaskManager.NewTask(ctx, "BaremetalPrepareTask", hh, userCred, data, parentTaskId, "", nil); err != nil {
log.Errorln(err)
return err
@@ -4494,7 +4494,7 @@ func (hh *SHost) PerformIpmiProbe(ctx context.Context, userCred mcclient.TokenCr
func (hh *SHost) StartIpmiProbeTask(ctx context.Context, userCred mcclient.TokenCredential, parentTaskId string) error {
data := jsonutils.NewDict()
hh.SetStatus(userCred, api.BAREMETAL_START_PROBE, "start ipmi-probe task")
hh.SetStatus(ctx, userCred, api.BAREMETAL_START_PROBE, "start ipmi-probe task")
if task, err := taskman.TaskManager.NewTask(ctx, "BaremetalIpmiProbeTask", hh, userCred, data, parentTaskId, "", nil); err != nil {
log.Errorln(err)
return err
@@ -5113,7 +5113,7 @@ func (hh *SHost) PerformSyncstatus(ctx context.Context, userCred mcclient.TokenC
if hh.HostType != api.HOST_TYPE_BAREMETAL {
return nil, httperrors.NewBadRequestError("Cannot sync status a non-baremetal host")
}
hh.SetStatus(userCred, api.BAREMETAL_SYNCING_STATUS, "")
hh.SetStatus(ctx, userCred, api.BAREMETAL_SYNCING_STATUS, "")
return nil, hh.StartSyncstatus(ctx, userCred, "")
}
@@ -5161,7 +5161,7 @@ func (hh *SHost) PerformEnable(
if err != nil {
return nil, errors.Wrap(err, "SEnabledStatusInfrasResourceBase.PerformEnable")
}
hh.SyncAttachedStorageStatus()
hh.SyncAttachedStorageStatus(ctx)
hh.updateNotify(ctx, userCred)
}
return nil, nil
@@ -5173,7 +5173,7 @@ func (hh *SHost) PerformDisable(ctx context.Context, userCred mcclient.TokenCred
if err != nil {
return nil, errors.Wrap(err, "SEnabledStatusInfrasResourceBase.PerformDisable")
}
hh.SyncAttachedStorageStatus()
hh.SyncAttachedStorageStatus(ctx)
hh.updateNotify(ctx, userCred)
}
return nil, nil
@@ -5304,7 +5304,7 @@ func (hh *SHost) PerformConvertHypervisor(ctx context.Context, userCred mcclient
}
task.ScheduleRun(nil)
hh.SetStatus(userCred, api.BAREMETAL_START_CONVERT, "")
hh.SetStatus(ctx, userCred, api.BAREMETAL_START_CONVERT, "")
return nil, nil
}
@@ -5765,10 +5765,10 @@ func (hh *SHost) GetShortDesc(ctx context.Context) *jsonutils.JSONDict {
return desc
}
func (hh *SHost) MarkGuestUnknown(userCred mcclient.TokenCredential) {
func (hh *SHost) MarkGuestUnknown(ctx context.Context, userCred mcclient.TokenCredential) {
guests, _ := hh.GetGuests()
for _, guest := range guests {
guest.SetStatus(userCred, api.VM_UNKNOWN, "host offline")
guest.SetStatus(ctx, userCred, api.VM_UNKNOWN, "host offline")
}
guests2 := hh.GetGuestsBackupOnThisHost()
for _, guest := range guests2 {
@@ -5796,7 +5796,7 @@ func (manager *SHostManager) PingDetectionTask(ctx context.Context, userCred mcc
lockman.LockObject(ctx, &hosts[i])
defer lockman.ReleaseObject(ctx, &hosts[i])
hosts[i].PerformOffline(ctx, userCred, nil, &api.HostOfflineInput{UpdateHealthStatus: &updateHealthStatus, Reason: fmt.Sprintf("last ping detection at %s", deadline)})
hosts[i].MarkGuestUnknown(userCred)
hosts[i].MarkGuestUnknown(ctx, userCred)
}()
}
}
@@ -5830,7 +5830,7 @@ func (host *SHost) PerformHostExitMaintenance(ctx context.Context, userCred mccl
if !utils.IsInStringArray(host.Status, []string{api.BAREMETAL_MAINTAIN_FAIL, api.BAREMETAL_MAINTAINING}) {
return nil, httperrors.NewInvalidStatusError("host status %s can't exit maintenance", host.Status)
}
err := host.SetStatus(userCred, api.HOST_STATUS_RUNNING, "exit maintenance")
err := host.SetStatus(ctx, userCred, api.HOST_STATUS_RUNNING, "exit maintenance")
if err != nil {
return nil, err
}
@@ -5883,7 +5883,7 @@ func (host *SHost) PerformHostMaintenance(ctx context.Context, userCred mcclient
RescueMode: guests[i].Status == api.VM_UNKNOWN,
OldStatus: guests[i].Status,
}
guests[i].SetStatus(userCred, api.VM_START_MIGRATE, "host maintainence")
guests[i].SetStatus(ctx, userCred, api.VM_START_MIGRATE, "host maintainence")
hostGuests = append(hostGuests, bmp)
}
@@ -6027,7 +6027,7 @@ func (host *SHost) MigrateSharedStorageServers(ctx context.Context, userCred mcc
RescueMode: true,
OldStatus: guests[i].Status,
}
guests[i].SetStatus(userCred, api.VM_START_MIGRATE, "host down")
guests[i].SetStatus(ctx, userCred, api.VM_START_MIGRATE, "host down")
hostGuests = append(hostGuests, bmp)
migGuests = append(migGuests, &guests[i])
}
@@ -6037,21 +6037,17 @@ func (host *SHost) MigrateSharedStorageServers(ctx context.Context, userCred mcc
return GuestManager.StartHostGuestsMigrateTask(ctx, userCred, migGuests, kwargs, "")
}
func (host *SHost) SetStatus(userCred mcclient.TokenCredential, status string, reason string) error {
err := host.SEnabledStatusInfrasResourceBase.SetStatus(userCred, status, reason)
func (host *SHost) SetStatus(ctx context.Context, userCred mcclient.TokenCredential, status string, reason string) error {
err := host.SEnabledStatusInfrasResourceBase.SetStatus(ctx, userCred, status, reason)
if err != nil {
return err
}
host.ClearSchedDescCache()
notifyclient.EventNotify(context.Background(), userCred, notifyclient.SEventNotifyParam{
Obj: host,
Action: notifyclient.ActionUpdate,
})
return nil
}
func (host *SHost) StartMaintainTask(ctx context.Context, userCred mcclient.TokenCredential, data *jsonutils.JSONDict) error {
host.SetStatus(userCred, api.BAREMETAL_START_MAINTAIN, "start maintenance")
host.SetStatus(ctx, userCred, api.BAREMETAL_START_MAINTAIN, "start maintenance")
if task, err := taskman.TaskManager.NewTask(ctx, "HostMaintainTask", host, userCred, data, "", "", nil); err != nil {
log.Errorln(err)
return err
@@ -6219,7 +6215,7 @@ func (hh *SHost) StartInsertIsoTask(ctx context.Context, userCred mcclient.Token
data.Add(jsonutils.JSONTrue, "boot")
}
data.Add(jsonutils.NewString(api.BAREMETAL_CDROM_ACTION_INSERT), "action")
hh.SetStatus(userCred, api.BAREMETAL_START_INSERT_ISO, "start insert iso task")
hh.SetStatus(ctx, userCred, api.BAREMETAL_START_INSERT_ISO, "start insert iso task")
if task, err := taskman.TaskManager.NewTask(ctx, "BaremetalCdromTask", hh, userCred, data, parentTaskId, "", nil); err != nil {
log.Errorln(err)
return err
@@ -6239,7 +6235,7 @@ func (hh *SHost) PerformEjectIso(ctx context.Context, userCred mcclient.TokenCre
func (hh *SHost) StartEjectIsoTask(ctx context.Context, userCred mcclient.TokenCredential, parentTaskId string) error {
data := jsonutils.NewDict()
data.Add(jsonutils.NewString(api.BAREMETAL_CDROM_ACTION_EJECT), "action")
hh.SetStatus(userCred, api.BAREMETAL_START_EJECT_ISO, "start eject iso task")
hh.SetStatus(ctx, userCred, api.BAREMETAL_START_EJECT_ISO, "start eject iso task")
if task, err := taskman.TaskManager.NewTask(ctx, "BaremetalCdromTask", hh, userCred, data, parentTaskId, "", nil); err != nil {
log.Errorln(err)
return err
@@ -6253,7 +6249,7 @@ func (hh *SHost) PerformSyncConfig(ctx context.Context, userCred mcclient.TokenC
if hh.HostType != api.HOST_TYPE_BAREMETAL {
return nil, httperrors.NewBadRequestError("Cannot sync config a non-baremetal host")
}
hh.SetStatus(userCred, api.BAREMETAL_SYNCING_STATUS, "")
hh.SetStatus(ctx, userCred, api.BAREMETAL_SYNCING_STATUS, "")
return nil, hh.StartSyncConfig(ctx, userCred, "")
}
+3 -3
View File
@@ -230,10 +230,10 @@ func (self *SHoststorage) StartHostStorageDetachTask(ctx context.Context, userCr
func (self *SHoststorage) PostDelete(ctx context.Context, userCred mcclient.TokenCredential) {
self.StartHostStorageDetachTask(ctx, userCred)
self.SyncStorageStatus(userCred)
self.SyncStorageStatus(ctx, userCred)
}
func (self *SHoststorage) SyncStorageStatus(userCred mcclient.TokenCredential) {
func (self *SHoststorage) SyncStorageStatus(ctx context.Context, userCred mcclient.TokenCredential) {
storage := self.GetStorage()
status := api.STORAGE_OFFLINE
hosts, _ := storage.GetAttachedHosts()
@@ -243,7 +243,7 @@ func (self *SHoststorage) SyncStorageStatus(userCred mcclient.TokenCredential) {
}
}
if status != storage.Status {
storage.SetStatus(userCred, status, "SyncStorageStatus")
storage.SetStatus(ctx, userCred, status, "SyncStorageStatus")
}
}
+4 -4
View File
@@ -257,7 +257,7 @@ func (manager *SInstanceBackupManager) FetchCustomizeColumns(
}
func (self *SInstanceBackup) StartCreateInstanceBackupTask(ctx context.Context, userCred mcclient.TokenCredential, parentTaskId string) error {
self.SetStatus(userCred, api.INSTANCE_BACKUP_STATUS_CREATING, "")
self.SetStatus(ctx, userCred, api.INSTANCE_BACKUP_STATUS_CREATING, "")
if task, err := taskman.TaskManager.NewTask(ctx, "InstanceBackupCreateTask", self, userCred, nil, parentTaskId, "", nil); err != nil {
return err
} else {
@@ -458,7 +458,7 @@ func (self *SInstanceBackup) StartInstanceBackupDeleteTask(
log.Errorf("%s", err)
return err
}
self.SetStatus(userCred, api.INSTANCE_BACKUP_STATUS_DELETING, "InstanceBackupDeleteTask")
self.SetStatus(ctx, userCred, api.INSTANCE_BACKUP_STATUS_DELETING, "InstanceBackupDeleteTask")
task.ScheduleRun(nil)
return nil
}
@@ -494,7 +494,7 @@ func (self *SInstanceBackup) PerformRecovery(ctx context.Context, userCred mccli
}
func (self *SInstanceBackup) StartRecoveryTask(ctx context.Context, userCred mcclient.TokenCredential, parentTaskId string, serverName string) error {
self.SetStatus(userCred, api.INSTANCE_BACKUP_STATUS_RECOVERY, "")
self.SetStatus(ctx, userCred, api.INSTANCE_BACKUP_STATUS_RECOVERY, "")
params := jsonutils.NewDict()
if serverName != "" {
params.Set("server_name", jsonutils.NewString(serverName))
@@ -512,7 +512,7 @@ func (self *SInstanceBackup) PerformPack(ctx context.Context, userCred mcclient.
if input.PackageName == "" {
return nil, httperrors.NewMissingParameterError("miss package_name")
}
self.SetStatus(userCred, api.INSTANCE_BACKUP_STATUS_PACK, "")
self.SetStatus(ctx, userCred, api.INSTANCE_BACKUP_STATUS_PACK, "")
params := jsonutils.NewDict()
params.Set("package_name", jsonutils.NewString(input.PackageName))
task, err := taskman.TaskManager.NewTask(ctx, "InstanceBackupPackTask", self, userCred, params, "", "", nil)
+2 -2
View File
@@ -601,7 +601,7 @@ func (self *SInstanceSnapshot) StartInstanceSnapshotDeleteTask(
log.Errorf("%s", err)
return err
}
self.SetStatus(userCred, api.INSTANCE_SNAPSHOT_START_DELETE, "InstanceSnapshotDeleteTask")
self.SetStatus(ctx, userCred, api.INSTANCE_SNAPSHOT_START_DELETE, "InstanceSnapshotDeleteTask")
task.ScheduleRun(nil)
return nil
}
@@ -643,7 +643,7 @@ func (is *SInstanceSnapshot) syncRemoveCloudInstanceSnapshot(ctx context.Context
err := is.ValidateDeleteCondition(ctx, nil)
if err != nil {
err = is.SetStatus(userCred, api.INSTANCE_SNAPSHOT_UNKNOWN, "sync to delete")
err = is.SetStatus(ctx, userCred, api.INSTANCE_SNAPSHOT_UNKNOWN, "sync to delete")
} else {
err = is.RealDelete(ctx, userCred)
}
+4 -4
View File
@@ -158,7 +158,7 @@ func (self *SInterVpcNetwork) PostCreate(ctx context.Context, userCred mcclient.
if err != nil {
return
}
self.SetStatus(userCred, api.INTER_VPC_NETWORK_STATUS_CREATING, "")
self.SetStatus(ctx, userCred, api.INTER_VPC_NETWORK_STATUS_CREATING, "")
task.ScheduleRun(nil)
}
@@ -252,7 +252,7 @@ func (self *SInterVpcNetwork) CustomizeDelete(ctx context.Context, userCred mccl
if err != nil {
return errors.Wrap(err, "NewTask")
}
self.SetStatus(userCred, api.INTER_VPC_NETWORK_STATUS_DELETING, "")
self.SetStatus(ctx, userCred, api.INTER_VPC_NETWORK_STATUS_DELETING, "")
task.ScheduleRun(nil)
return nil
}
@@ -280,7 +280,7 @@ func (self *SInterVpcNetwork) StartInterVpcNetworkAddVpcTask(ctx context.Context
if err != nil {
return err
}
self.SetStatus(userCred, api.INTER_VPC_NETWORK_STATUS_ADDVPC, "")
self.SetStatus(ctx, userCred, api.INTER_VPC_NETWORK_STATUS_ADDVPC, "")
task.ScheduleRun(nil)
return nil
}
@@ -332,7 +332,7 @@ func (self *SInterVpcNetwork) StartInterVpcNetworkRemoveVpcTask(ctx context.Cont
if err != nil {
return err
}
self.SetStatus(userCred, api.INTER_VPC_NETWORK_STATUS_REMOVEVPC, "")
self.SetStatus(ctx, userCred, api.INTER_VPC_NETWORK_STATUS_REMOVEVPC, "")
task.ScheduleRun(nil)
return nil
}
@@ -296,7 +296,7 @@ func (self *SInterVpcNetwork) StartInterVpcNetworkUpdateRoutesetTask(ctx context
if err != nil {
return errors.Wrap(err, "Start InterVpcNetworkUpdateRoutesetTask fail")
}
self.SetStatus(userCred, api.INTER_VPC_NETWORK_STATUS_UPDATEROUTE, "update route")
self.SetStatus(ctx, userCred, api.INTER_VPC_NETWORK_STATUS_UPDATEROUTE, "update route")
task.ScheduleRun(nil)
return nil
}
+2 -2
View File
@@ -147,7 +147,7 @@ func (self *SIPv6Gateway) syncRemoveCloudIPv6Gateway(ctx context.Context, userCr
err := self.ValidateDeleteCondition(ctx, nil)
if err != nil { // cannot delete
self.SetStatus(userCred, api.NETWORK_STATUS_UNKNOWN, "Sync to remove")
self.SetStatus(ctx, userCred, api.NETWORK_STATUS_UNKNOWN, "Sync to remove")
return err
}
return self.RealDelete(ctx, userCred)
@@ -256,7 +256,7 @@ func (self *SIPv6Gateway) ValidateUpdateData(ctx context.Context, userCred mccli
}
func (self *SIPv6Gateway) Delete(ctx context.Context, userCred mcclient.TokenCredential) error {
self.SetStatus(userCred, apis.STATUS_DELETING, "")
self.SetStatus(ctx, userCred, apis.STATUS_DELETING, "")
return nil
}
+2 -2
View File
@@ -374,7 +374,7 @@ func (self *SKafka) StartDeleteTask(ctx context.Context, userCred mcclient.Token
if err != nil {
return err
}
self.SetStatus(userCred, api.KAFKA_STATUS_DELETING, "")
self.SetStatus(ctx, userCred, api.KAFKA_STATUS_DELETING, "")
task.ScheduleRun(nil)
return nil
}
@@ -682,7 +682,7 @@ func (self *SKafka) StartRemoteUpdateTask(ctx context.Context, userCred mcclient
if task, err := taskman.TaskManager.NewTask(ctx, "KafkaRemoteUpdateTask", self, userCred, data, parentTaskId, "", nil); err != nil {
return errors.Wrap(err, "Start ElasticSearchRemoteUpdateTask")
} else {
self.SetStatus(userCred, api.ELASTIC_SEARCH_UPDATE_TAGS, "StartRemoteUpdateTask")
self.SetStatus(ctx, userCred, api.ELASTIC_SEARCH_UPDATE_TAGS, "StartRemoteUpdateTask")
task.ScheduleRun(nil)
}
return nil
+3 -3
View File
@@ -225,7 +225,7 @@ func (self *SKubeCluster) syncRemoveCloudKubeCluster(ctx context.Context, userCr
err := self.ValidateDeleteCondition(ctx, nil)
if err != nil { // cannot delete
self.SetStatus(userCred, apis.STATUS_UNKNOWN, "sync to delete")
self.SetStatus(ctx, userCred, apis.STATUS_UNKNOWN, "sync to delete")
return errors.Wrapf(err, "ValidateDeleteCondition")
}
return self.RealDelete(ctx, userCred)
@@ -505,7 +505,7 @@ func (self *SKubeCluster) StartKubeClusterCreateTask(ctx context.Context, userCr
if err != nil {
return errors.Wrapf(err, "NewTask")
}
self.SetStatus(userCred, api.KUBE_CLUSTER_STATUS_CREATING, "")
self.SetStatus(ctx, userCred, api.KUBE_CLUSTER_STATUS_CREATING, "")
return task.ScheduleRun(nil)
}
@@ -533,7 +533,7 @@ func (self *SKubeCluster) GetIKubeCluster(ctx context.Context) (cloudprovider.IC
}
func (self *SKubeCluster) Delete(ctx context.Context, userCred mcclient.TokenCredential) error {
self.SetStatus(userCred, apis.STATUS_DELETING, "")
self.SetStatus(ctx, userCred, apis.STATUS_DELETING, "")
return nil
}
+2 -2
View File
@@ -360,7 +360,7 @@ func (self *SKubeNodePool) StartKubeNodePoolCreateTask(ctx context.Context, user
if err != nil {
return errors.Wrapf(err, "NewTask")
}
self.SetStatus(userCred, apis.STATUS_CREATING, "")
self.SetStatus(ctx, userCred, apis.STATUS_CREATING, "")
return task.ScheduleRun(nil)
}
@@ -524,7 +524,7 @@ func (self *SKubeCluster) newFromCloudKubeNodePool(ctx context.Context, userCred
func (self *SKubeNodePool) Delete(ctx context.Context, userCred mcclient.TokenCredential) error {
log.Infof("kube node pool delete do nothing")
return self.SetStatus(userCred, apis.STATUS_DELETING, "")
return self.SetStatus(ctx, userCred, apis.STATUS_DELETING, "")
}
func (self *SKubeNodePool) RealDelete(ctx context.Context, userCred mcclient.TokenCredential) error {
+1 -1
View File
@@ -352,7 +352,7 @@ func (self *SKubeCluster) newFromCloudKubeNode(ctx context.Context, userCred mcc
func (self *SKubeNode) Delete(ctx context.Context, userCred mcclient.TokenCredential) error {
log.Infof("kube node delete do nothing")
return self.SetStatus(userCred, apis.STATUS_DELETING, "")
return self.SetStatus(ctx, userCred, apis.STATUS_DELETING, "")
}
func (self *SKubeNode) RealDelete(ctx context.Context, userCred mcclient.TokenCredential) error {
@@ -507,7 +507,7 @@ func (lbbg *SLoadbalancerBackendGroup) PostCreate(ctx context.Context, userCred
}
func (lbbg *SLoadbalancerBackendGroup) StartLoadBalancerBackendGroupCreateTask(ctx context.Context, userCred mcclient.TokenCredential, parentTaskId string) {
lbbg.SetStatus(userCred, api.LB_CREATING, "")
lbbg.SetStatus(ctx, userCred, api.LB_CREATING, "")
err := func() error {
task, err := taskman.TaskManager.NewTask(ctx, "LoadbalancerLoadbalancerBackendGroupCreateTask", lbbg, userCred, nil, parentTaskId, "", nil)
if err != nil {
@@ -516,7 +516,7 @@ func (lbbg *SLoadbalancerBackendGroup) StartLoadBalancerBackendGroupCreateTask(c
return task.ScheduleRun(nil)
}()
if err != nil {
lbbg.SetStatus(userCred, api.LB_CREATE_FAILED, err.Error())
lbbg.SetStatus(ctx, userCred, api.LB_CREATE_FAILED, err.Error())
}
}
@@ -541,7 +541,7 @@ func (lbbg *SLoadbalancerBackendGroup) PerformPurge(ctx context.Context, userCre
}
func (lbbg *SLoadbalancerBackendGroup) CustomizeDelete(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) error {
lbbg.SetStatus(userCred, api.LB_STATUS_DELETING, "")
lbbg.SetStatus(ctx, userCred, api.LB_STATUS_DELETING, "")
return lbbg.StartLoadBalancerBackendGroupDeleteTask(ctx, userCred, jsonutils.NewDict(), "")
}
@@ -687,7 +687,7 @@ func (lbbg *SLoadbalancerBackendGroup) syncRemove(ctx context.Context, userCred
err := lbbg.ValidateDeleteCondition(ctx, nil)
if err != nil { // cannot delete
lbbg.SetStatus(userCred, api.LB_STATUS_UNKNOWN, "sync to delete")
lbbg.SetStatus(ctx, userCred, api.LB_STATUS_UNKNOWN, "sync to delete")
return errors.Wrapf(err, "ValidateDeleteCondition")
}
notifyclient.EventNotify(ctx, userCred, notifyclient.SEventNotifyParam{
+4 -4
View File
@@ -424,7 +424,7 @@ func (lbb *SLoadbalancerBackend) PostUpdate(ctx context.Context, userCred mcclie
func (lbb *SLoadbalancerBackend) StartLoadBalancerBackendSyncTask(ctx context.Context, userCred mcclient.TokenCredential, parentTaskId string) error {
params := jsonutils.NewDict()
lbb.SetStatus(userCred, api.LB_SYNC_CONF, "")
lbb.SetStatus(ctx, userCred, api.LB_SYNC_CONF, "")
task, err := taskman.TaskManager.NewTask(ctx, "LoadbalancerBackendSyncTask", lbb, userCred, params, parentTaskId, "", nil)
if err != nil {
return err
@@ -435,7 +435,7 @@ func (lbb *SLoadbalancerBackend) StartLoadBalancerBackendSyncTask(ctx context.Co
func (lbb *SLoadbalancerBackend) PostCreate(ctx context.Context, userCred mcclient.TokenCredential, ownerId mcclient.IIdentityProvider, query jsonutils.JSONObject, data jsonutils.JSONObject) {
lbb.SStatusStandaloneResourceBase.PostCreate(ctx, userCred, ownerId, query, data)
lbb.SetStatus(userCred, api.LB_CREATING, "")
lbb.SetStatus(ctx, userCred, api.LB_CREATING, "")
err := lbb.StartLoadBalancerBackendCreateTask(ctx, userCred, "")
if err != nil {
log.Errorf("Failed to create loadbalancer backend error: %v", err)
@@ -514,7 +514,7 @@ func (lbb *SLoadbalancerBackend) PerformPurge(ctx context.Context, userCred mccl
}
func (lbb *SLoadbalancerBackend) CustomizeDelete(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) error {
lbb.SetStatus(userCred, api.LB_STATUS_DELETING, "")
lbb.SetStatus(ctx, userCred, api.LB_STATUS_DELETING, "")
return lbb.StartLoadBalancerBackendDeleteTask(ctx, userCred, jsonutils.NewDict(), "")
}
@@ -620,7 +620,7 @@ func (lbb *SLoadbalancerBackend) syncRemove(ctx context.Context, userCred mcclie
err := lbb.ValidateDeleteCondition(ctx, nil)
if err != nil { // cannot delete
lbb.SetStatus(userCred, api.LB_STATUS_UNKNOWN, "sync to delete")
lbb.SetStatus(ctx, userCred, api.LB_STATUS_UNKNOWN, "sync to delete")
return errors.Wrapf(err, "ValidateDeleteCondition")
}
return lbb.RealDelete(ctx, userCred)
+1 -1
View File
@@ -189,7 +189,7 @@ func (lbacl *SCachedLoadbalancerAcl) PerformPurge(ctx context.Context, userCred
}
func (lbacl *SCachedLoadbalancerAcl) CustomizeDelete(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) error {
lbacl.SetStatus(userCred, api.LB_STATUS_DELETING, "")
lbacl.SetStatus(ctx, userCred, api.LB_STATUS_DELETING, "")
return lbacl.StartLoadBalancerAclDeleteTask(ctx, userCred, query.(*jsonutils.JSONDict), "")
}
@@ -118,7 +118,7 @@ func (self *SCachedLoadbalancerCertificate) RealDelete(ctx context.Context, user
}
func (self *SCachedLoadbalancerCertificate) CustomizeDelete(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) error {
self.SetStatus(userCred, api.LB_STATUS_DELETING, "")
self.SetStatus(ctx, userCred, api.LB_STATUS_DELETING, "")
return self.StartLoadBalancerCertificateDeleteTask(ctx, userCred, jsonutils.NewDict(), "")
}
@@ -131,7 +131,7 @@ func (lbcert *SCachedLoadbalancerCertificate) StartLoadBalancerCertificateDelete
return task.ScheduleRun(nil)
}()
if err != nil {
lbcert.SetStatus(userCred, api.LB_STATUS_DELETE_FAILED, err.Error())
lbcert.SetStatus(ctx, userCred, api.LB_STATUS_DELETE_FAILED, err.Error())
}
return err
}
@@ -546,7 +546,7 @@ func (man *SLoadbalancerListenerRuleManager) ValidateCreateData(ctx context.Cont
func (lbr *SLoadbalancerListenerRule) PostCreate(ctx context.Context, userCred mcclient.TokenCredential, ownerId mcclient.IIdentityProvider, query jsonutils.JSONObject, data jsonutils.JSONObject) {
lbr.SStatusStandaloneResourceBase.PostCreate(ctx, userCred, ownerId, query, data)
lbr.SetStatus(userCred, api.LB_CREATING, "")
lbr.SetStatus(ctx, userCred, api.LB_CREATING, "")
if err := lbr.StartLoadBalancerListenerRuleCreateTask(ctx, userCred, ""); err != nil {
log.Errorf("Failed to create loadbalancer listener rule error: %v", err)
}
@@ -568,7 +568,7 @@ func (lbr *SLoadbalancerListenerRule) PerformPurge(ctx context.Context, userCred
}
func (lbr *SLoadbalancerListenerRule) CustomizeDelete(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) error {
lbr.SetStatus(userCred, api.LB_STATUS_DELETING, "")
lbr.SetStatus(ctx, userCred, api.LB_STATUS_DELETING, "")
return lbr.StartLoadBalancerListenerRuleDeleteTask(ctx, userCred, jsonutils.NewDict(), "")
}
@@ -929,7 +929,7 @@ func (lbr *SLoadbalancerListenerRule) syncRemoveCloudLoadbalancerListenerRule(ct
err := lbr.ValidateDeleteCondition(ctx, nil)
if err != nil { // cannot delete
lbr.SetStatus(userCred, api.LB_STATUS_UNKNOWN, "sync to delete")
lbr.SetStatus(ctx, userCred, api.LB_STATUS_UNKNOWN, "sync to delete")
return errors.Wrapf(err, "ValidateDeleteCondition")
}
return lbr.RealDelete(ctx, userCred)
+6 -6
View File
@@ -474,7 +474,7 @@ func (lblis *SLoadbalancerListener) PostUpdate(ctx context.Context, userCred mcc
func (lblis *SLoadbalancerListener) StartLoadBalancerListenerSyncTask(ctx context.Context, userCred mcclient.TokenCredential, data jsonutils.JSONObject, parentTaskId string) error {
params := data.(*jsonutils.JSONDict)
lblis.SetStatus(userCred, api.LB_SYNC_CONF, "")
lblis.SetStatus(ctx, userCred, api.LB_SYNC_CONF, "")
task, err := taskman.TaskManager.NewTask(ctx, "LoadbalancerListenerSyncTask", lblis, userCred, params, parentTaskId, "", nil)
if err != nil {
return err
@@ -545,7 +545,7 @@ func (lblis *SLoadbalancerListener) PostCreate(ctx context.Context, userCred mcc
func (lblis *SLoadbalancerListener) StartLoadBalancerListenerCreateTask(ctx context.Context, userCred mcclient.TokenCredential, data *jsonutils.JSONDict, parentTaskId string) {
err := func() error {
lblis.SetStatus(userCred, api.LB_CREATING, "")
lblis.SetStatus(ctx, userCred, api.LB_CREATING, "")
task, err := taskman.TaskManager.NewTask(ctx, "LoadbalancerListenerCreateTask", lblis, userCred, data, parentTaskId, "", nil)
if err != nil {
return errors.Wrapf(err, "NewTask")
@@ -553,7 +553,7 @@ func (lblis *SLoadbalancerListener) StartLoadBalancerListenerCreateTask(ctx cont
return task.ScheduleRun(nil)
}()
if err != nil {
lblis.SetStatus(userCred, api.LB_CREATE_FAILED, err.Error())
lblis.SetStatus(ctx, userCred, api.LB_CREATE_FAILED, err.Error())
}
}
@@ -574,13 +574,13 @@ func (lblis *SLoadbalancerListener) StartLoadBalancerListenerDeleteTask(ctx cont
return task.ScheduleRun(nil)
}()
if err != nil {
lblis.SetStatus(userCred, api.LB_STATUS_DELETE_FAILED, err.Error())
lblis.SetStatus(ctx, userCred, api.LB_STATUS_DELETE_FAILED, err.Error())
}
return err
}
func (lblis *SLoadbalancerListener) CustomizeDelete(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) error {
lblis.SetStatus(userCred, api.LB_STATUS_DELETING, "")
lblis.SetStatus(ctx, userCred, api.LB_STATUS_DELETING, "")
return lblis.StartLoadBalancerListenerDeleteTask(ctx, userCred, jsonutils.NewDict(), "")
}
@@ -945,7 +945,7 @@ func (lblis *SLoadbalancerListener) syncRemoveCloudLoadbalancerListener(ctx cont
err := lblis.ValidateDeleteCondition(ctx, nil)
if err != nil { // cannot delete
return lblis.SetStatus(userCred, api.LB_STATUS_UNKNOWN, "sync to delete")
return lblis.SetStatus(ctx, userCred, api.LB_STATUS_UNKNOWN, "sync to delete")
}
notifyclient.EventNotify(ctx, userCred, notifyclient.SEventNotifyParam{
Obj: lblis,
+5 -5
View File
@@ -599,10 +599,10 @@ func (lb *SLoadbalancer) PostCreate(ctx context.Context, userCred mcclient.Token
input := &api.LoadbalancerCreateInput{}
data.Unmarshal(input)
lb.SetStatus(userCred, api.LB_CREATING, "")
lb.SetStatus(ctx, userCred, api.LB_CREATING, "")
err = lb.StartLoadBalancerCreateTask(ctx, userCred, input)
if err != nil {
lb.SetStatus(userCred, api.LB_CREATE_FAILED, err.Error())
lb.SetStatus(ctx, userCred, api.LB_CREATE_FAILED, err.Error())
}
}
@@ -839,7 +839,7 @@ func (lb *SLoadbalancer) ValidateDeleteCondition(ctx context.Context, info jsonu
}
func (lb *SLoadbalancer) CustomizeDelete(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) error {
lb.SetStatus(userCred, api.LB_STATUS_DELETING, "")
lb.SetStatus(ctx, userCred, api.LB_STATUS_DELETING, "")
params := jsonutils.NewDict()
deleteEip := jsonutils.QueryBoolean(data, "delete_eip", false)
if deleteEip {
@@ -1093,7 +1093,7 @@ func (lb *SLoadbalancer) syncRemoveCloudLoadbalancer(ctx context.Context, userCr
}
err = lb.ValidateDeleteCondition(ctx, nil)
if err != nil { // cannot delete
return lb.SetStatus(userCred, api.LB_STATUS_UNKNOWN, "sync to delete")
return lb.SetStatus(ctx, userCred, api.LB_STATUS_UNKNOWN, "sync to delete")
}
notifyclient.EventNotify(ctx, userCred, notifyclient.SEventNotifyParam{
Obj: lb,
@@ -1429,7 +1429,7 @@ func (self *SLoadbalancer) StartRemoteUpdateTask(ctx context.Context, userCred m
log.Errorln(err)
return errors.Wrap(err, "Start LoadbalancerRemoteUpdateTask")
} else {
self.SetStatus(userCred, api.LB_UPDATE_TAGS, "StartRemoteUpdateTask")
self.SetStatus(ctx, userCred, api.LB_UPDATE_TAGS, "StartRemoteUpdateTask")
task.ScheduleRun(nil)
}
return nil
+4 -4
View File
@@ -328,10 +328,10 @@ func (self *SModelartsPool) StartCreateTask(ctx context.Context, userCred mcclie
return task.ScheduleRun(nil)
}()
if err != nil {
self.SetStatus(userCred, api.MODELARTS_POOL_STATUS_ERROR, err.Error())
self.SetStatus(ctx, userCred, api.MODELARTS_POOL_STATUS_ERROR, err.Error())
return err
}
self.SetStatus(userCred, api.MODELARTS_POOL_STATUS_CREATING, "")
self.SetStatus(ctx, userCred, api.MODELARTS_POOL_STATUS_CREATING, "")
return nil
}
@@ -379,7 +379,7 @@ func (self *SModelartsPool) StartDeleteTask(ctx context.Context, userCred mcclie
if err != nil {
return err
}
self.SetStatus(userCred, api.MODELARTS_POOL_STATUS_DELETING, "")
self.SetStatus(ctx, userCred, api.MODELARTS_POOL_STATUS_DELETING, "")
task.ScheduleRun(nil)
return nil
}
@@ -397,7 +397,7 @@ func (self *SModelartsPool) StartChangeConfigTask(ctx context.Context, userCred
if err != nil {
return err
}
self.SetStatus(userCred, api.MODELARTS_POOL_STATUS_CHANGE_CONFIG, "")
self.SetStatus(ctx, userCred, api.MODELARTS_POOL_STATUS_CHANGE_CONFIG, "")
return task.ScheduleRun(nil)
}
+3 -3
View File
@@ -386,10 +386,10 @@ func (self *SMongoDB) StartDeleteTask(ctx context.Context, userCred mcclient.Tok
return task.ScheduleRun(nil)
}()
if err != nil {
self.SetStatus(userCred, api.MONGO_DB_STATUS_DELETE_FAILED, err.Error())
self.SetStatus(ctx, userCred, api.MONGO_DB_STATUS_DELETE_FAILED, err.Error())
return err
}
return self.SetStatus(userCred, api.MONGO_DB_STATUS_DELETING, "")
return self.SetStatus(ctx, userCred, api.MONGO_DB_STATUS_DELETING, "")
}
func (self *SCloudregion) GetMongoDBs(managerId string) ([]SMongoDB, error) {
@@ -829,7 +829,7 @@ func (self *SMongoDB) StartRemoteUpdateTask(ctx context.Context, userCred mcclie
if err != nil {
return errors.Wrap(err, "NewTask")
}
self.SetStatus(userCred, apis.STATUS_UPDATE_TAGS, "StartRemoteUpdateTask")
self.SetStatus(ctx, userCred, apis.STATUS_UPDATE_TAGS, "StartRemoteUpdateTask")
return task.ScheduleRun(nil)
}
+4 -4
View File
@@ -170,10 +170,10 @@ func (self *SMountTarget) StartCreateTask(ctx context.Context, userCred mcclient
return task.ScheduleRun(nil)
}()
if err != nil {
self.SetStatus(userCred, api.MOUNT_TARGET_STATUS_CREATE_FAILED, err.Error())
self.SetStatus(ctx, userCred, api.MOUNT_TARGET_STATUS_CREATE_FAILED, err.Error())
return nil
}
self.SetStatus(userCred, api.MOUNT_TARGET_STATUS_CREATING, "")
self.SetStatus(ctx, userCred, api.MOUNT_TARGET_STATUS_CREATING, "")
return nil
}
@@ -377,10 +377,10 @@ func (self *SMountTarget) StartDeleteTask(ctx context.Context, userCred mcclient
return task.ScheduleRun(nil)
}()
if err != nil {
self.SetStatus(userCred, api.MOUNT_TARGET_STATUS_DELETE_FAILED, err.Error())
self.SetStatus(ctx, userCred, api.MOUNT_TARGET_STATUS_DELETE_FAILED, err.Error())
return err
}
return self.SetStatus(userCred, api.MOUNT_TARGET_STATUS_DELETING, "")
return self.SetStatus(ctx, userCred, api.MOUNT_TARGET_STATUS_DELETING, "")
}
func (self *SFileSystem) GetMountTargets() ([]SMountTarget, error) {
+5 -5
View File
@@ -250,7 +250,7 @@ func (self *SNatDEntry) syncRemoveCloudNatDTable(ctx context.Context, userCred m
err := self.ValidateDeleteCondition(ctx, nil)
if err != nil { // cannot delete
return self.SetStatus(userCred, api.VPC_STATUS_UNKNOWN, "sync to delete")
return self.SetStatus(ctx, userCred, api.VPC_STATUS_UNKNOWN, "sync to delete")
}
return self.RealDelete(ctx, userCred)
}
@@ -343,10 +343,10 @@ func (self *SNatDEntry) PostCreate(ctx context.Context, userCred mcclient.TokenC
return task.ScheduleRun(nil)
}()
if err != nil {
self.SetStatus(userCred, api.NAT_STATUS_CREATE_FAILED, err.Error())
self.SetStatus(ctx, userCred, api.NAT_STATUS_CREATE_FAILED, err.Error())
return
}
self.SetStatus(userCred, api.NAT_STATUS_ALLOCATE, "")
self.SetStatus(ctx, userCred, api.NAT_STATUS_ALLOCATE, "")
}
func (self *SNatDEntry) CustomizeDelete(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) error {
@@ -362,10 +362,10 @@ func (self *SNatDEntry) StartDeleteDNatTask(ctx context.Context, userCred mcclie
return task.ScheduleRun(nil)
}()
if err != nil {
self.SetStatus(userCred, api.NAT_STATUS_DELETE_FAILED, err.Error())
self.SetStatus(ctx, userCred, api.NAT_STATUS_DELETE_FAILED, err.Error())
return err
}
self.SetStatus(userCred, api.NAT_STATUS_DELETING, "")
self.SetStatus(ctx, userCred, api.NAT_STATUS_DELETING, "")
return nil
}
+9 -9
View File
@@ -233,10 +233,10 @@ func (self *SNatGateway) PostCreate(
err := self.StartNatGatewayCreateTask(ctx, userCred, data.(*jsonutils.JSONDict))
if err != nil {
self.SetStatus(userCred, api.NAT_STATUS_CREATE_FAILED, err.Error())
self.SetStatus(ctx, userCred, api.NAT_STATUS_CREATE_FAILED, err.Error())
return
}
self.SetStatus(userCred, api.NAT_STATUS_ALLOCATE, "start allocate")
self.SetStatus(ctx, userCred, api.NAT_STATUS_ALLOCATE, "start allocate")
}
func (self *SNatGateway) StartNatGatewayCreateTask(ctx context.Context, userCred mcclient.TokenCredential, params *jsonutils.JSONDict) error {
@@ -466,7 +466,7 @@ func (self *SNatGateway) syncRemoveCloudNatGateway(ctx context.Context, userCred
err := self.ValidateDeleteCondition(ctx, nil)
if err != nil { // cannot delete
return self.SetStatus(userCred, api.NAT_STATUS_UNKNOWN, "sync to delete")
return self.SetStatus(ctx, userCred, api.NAT_STATUS_UNKNOWN, "sync to delete")
}
err = self.purge(ctx, userCred)
if err != nil {
@@ -640,7 +640,7 @@ func (self *SNatGateway) CustomizeDelete(ctx context.Context, userCred mcclient.
if err != nil {
return err
}
self.SetStatus(userCred, api.NAT_STATUS_DELETING, jsonutils.Marshal(input).String())
self.SetStatus(ctx, userCred, api.NAT_STATUS_DELETING, jsonutils.Marshal(input).String())
return nil
}
@@ -973,7 +973,7 @@ func (self *SNatGateway) StartRenewTask(ctx context.Context, userCred mcclient.T
if err != nil {
return errors.Wrap(err, "NewTask")
}
self.SetStatus(userCred, api.NAT_STATUS_RENEWING, "")
self.SetStatus(ctx, userCred, api.NAT_STATUS_RENEWING, "")
return task.ScheduleRun(nil)
}
@@ -1027,7 +1027,7 @@ func (self *SNatGateway) StartSetAutoRenewTask(ctx context.Context, userCred mcc
if err != nil {
return errors.Wrap(err, "NewTask")
}
self.SetStatus(userCred, api.NAT_STATUS_SET_AUTO_RENEW, "")
self.SetStatus(ctx, userCred, api.NAT_STATUS_SET_AUTO_RENEW, "")
return task.ScheduleRun(nil)
}
@@ -1042,7 +1042,7 @@ func (self *SNatEntry) GetINatGateway(ctx context.Context) (cloudprovider.ICloud
func (self *SNatEntry) Delete(ctx context.Context, userCred mcclient.TokenCredential) error {
log.Infof("NAT Entry delete do nothing")
self.SetStatus(userCred, api.NAT_STATUS_DELETING, "")
self.SetStatus(ctx, userCred, api.NAT_STATUS_DELETING, "")
return nil
}
@@ -1051,7 +1051,7 @@ func (self *SNatEntry) RealDelete(ctx context.Context, userCred mcclient.TokenCr
if err != nil {
return err
}
self.SetStatus(userCred, api.NAT_STATUS_DELETED, "real delete")
self.SetStatus(ctx, userCred, api.NAT_STATUS_DELETED, "real delete")
return nil
}
@@ -1107,7 +1107,7 @@ func (self *SNatGateway) StartRemoteUpdateTask(ctx context.Context, userCred mcc
if err != nil {
return errors.Wrap(err, "NewTask")
}
self.SetStatus(userCred, apis.STATUS_UPDATE_TAGS, "StartRemoteUpdateTask")
self.SetStatus(ctx, userCred, apis.STATUS_UPDATE_TAGS, "StartRemoteUpdateTask")
return task.ScheduleRun(nil)
}
+5 -5
View File
@@ -296,7 +296,7 @@ func (self *SNatSEntry) syncRemoveCloudNatSTable(ctx context.Context, userCred m
err := self.ValidateDeleteCondition(ctx, nil)
if err != nil { // cannot delete
return self.SetStatus(userCred, api.VPC_STATUS_UNKNOWN, "sync to delete")
return self.SetStatus(ctx, userCred, api.VPC_STATUS_UNKNOWN, "sync to delete")
}
return self.RealDelete(ctx, userCred)
}
@@ -433,10 +433,10 @@ func (self *SNatSEntry) PostCreate(ctx context.Context, userCred mcclient.TokenC
return task.ScheduleRun(nil)
}()
if err != nil {
self.SetStatus(userCred, api.NAT_STATUS_CREATE_FAILED, err.Error())
self.SetStatus(ctx, userCred, api.NAT_STATUS_CREATE_FAILED, err.Error())
return
}
self.SetStatus(userCred, api.NAT_STATUS_ALLOCATE, "")
self.SetStatus(ctx, userCred, api.NAT_STATUS_ALLOCATE, "")
}
func (self *SNatSEntry) CustomizeDelete(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) error {
@@ -452,10 +452,10 @@ func (self *SNatSEntry) StartDeleteSNatTask(ctx context.Context, userCred mcclie
return task.ScheduleRun(nil)
}()
if err != nil {
self.SetStatus(userCred, api.NAT_STATUS_DELETE_FAILED, err.Error())
self.SetStatus(ctx, userCred, api.NAT_STATUS_DELETE_FAILED, err.Error())
return err
}
self.SetStatus(userCred, api.NAT_STATUS_DELETING, "")
self.SetStatus(ctx, userCred, api.NAT_STATUS_DELETING, "")
return nil
}
+4 -4
View File
@@ -709,7 +709,7 @@ func (snet *SNetwork) syncRemoveCloudNetwork(ctx context.Context, userCred mccli
err := snet.ValidateDeleteCondition(ctx, nil)
if err != nil { // cannot delete
err = snet.SetStatus(userCred, api.NETWORK_STATUS_UNKNOWN, "Sync to remove")
err = snet.SetStatus(ctx, userCred, api.NETWORK_STATUS_UNKNOWN, "Sync to remove")
} else {
err = snet.RealDelete(ctx, userCred)
if err == nil {
@@ -2336,7 +2336,7 @@ func (net *SNetwork) PostCreate(ctx context.Context, userCred mcclient.TokenCred
log.Errorf("syncAdditionalWires error: %s", err)
}
}
net.SetStatus(userCred, api.NETWORK_STATUS_AVAILABLE, "")
net.SetStatus(ctx, userCred, api.NETWORK_STATUS_AVAILABLE, "")
if err := net.ClearSchedDescCache(); err != nil {
log.Errorf("network post create clear schedcache error: %v", err)
}
@@ -2375,7 +2375,7 @@ func (snet *SNetwork) GetPrefix() (netutils.IPV4Prefix, error) {
func (snet *SNetwork) Delete(ctx context.Context, userCred mcclient.TokenCredential) error {
log.Infof("SNetwork delete do nothing")
snet.SetStatus(userCred, api.NETWORK_STATUS_START_DELETE, "")
snet.SetStatus(ctx, userCred, api.NETWORK_STATUS_START_DELETE, "")
return nil
}
@@ -2390,7 +2390,7 @@ func (snet *SNetwork) CustomizeDelete(ctx context.Context, userCred mcclient.Tok
func (snet *SNetwork) RealDelete(ctx context.Context, userCred mcclient.TokenCredential) error {
DeleteResourceJointSchedtags(snet, ctx, userCred)
db.OpsLog.LogEvent(snet, db.ACT_DELOCATE, snet.GetShortDesc(ctx), userCred)
snet.SetStatus(userCred, api.NETWORK_STATUS_DELETED, "real delete")
snet.SetStatus(ctx, userCred, api.NETWORK_STATUS_DELETED, "real delete")
networkinterfaces, err := snet.GetNetworkInterfaces()
if err != nil {
return errors.Wrap(err, "GetNetworkInterfaces")

Some files were not shown because too many files have changed in this diff Show More