diff --git a/pkg/compute/tasks/baremetal_cdrom_task.go b/pkg/compute/tasks/baremetal_cdrom_task.go index ac692d6507..3fb8b2fbd9 100644 --- a/pkg/compute/tasks/baremetal_cdrom_task.go +++ b/pkg/compute/tasks/baremetal_cdrom_task.go @@ -47,7 +47,7 @@ func (self *BaremetalCdromTask) OnInit(ctx context.Context, obj db.IStandaloneMo self.SetStage("OnSyncConfigComplete", nil) _, err := baremetal.BaremetalSyncRequest(ctx, "POST", url, headers, self.Params) if err != nil { - self.OnFailure(ctx, baremetal, jsonutils.Marshal(err)) + self.OnFailure(ctx, baremetal, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/baremetal_convert_hypervisor_task.go b/pkg/compute/tasks/baremetal_convert_hypervisor_task.go index cbbd7b16b8..ebfc6144f8 100644 --- a/pkg/compute/tasks/baremetal_convert_hypervisor_task.go +++ b/pkg/compute/tasks/baremetal_convert_hypervisor_task.go @@ -60,7 +60,7 @@ func (self *BaremetalConvertHypervisorTask) OnInit(ctx context.Context, obj db.I paramsDict := params.(*jsonutils.JSONDict) input, err := cmdline.FetchServerCreateInputByJSON(paramsDict) if err != nil { - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) return } input.ParentTaskId = self.GetTaskId() diff --git a/pkg/compute/tasks/baremetal_delete_task.go b/pkg/compute/tasks/baremetal_delete_task.go index a21b446e09..9f4087dcd9 100644 --- a/pkg/compute/tasks/baremetal_delete_task.go +++ b/pkg/compute/tasks/baremetal_delete_task.go @@ -61,7 +61,7 @@ func (self *BaremetalDeleteTask) OnDeleteBaremetalComplete(ctx context.Context, err := baremetal.RealDelete(ctx, self.UserCred) if err != nil { log.Errorf("RealDelete fail %s", err) - self.OnFailure(ctx, baremetal, jsonutils.Marshal(err)) + self.OnFailure(ctx, baremetal, jsonutils.NewString(err.Error())) return } self.SetStageComplete(ctx, nil) diff --git a/pkg/compute/tasks/baremetal_ipmi_probe_task.go b/pkg/compute/tasks/baremetal_ipmi_probe_task.go index 8eb557ea8d..fd36047d27 100644 --- a/pkg/compute/tasks/baremetal_ipmi_probe_task.go +++ b/pkg/compute/tasks/baremetal_ipmi_probe_task.go @@ -43,7 +43,7 @@ func (self *BaremetalIpmiProbeTask) OnInit(ctx context.Context, obj db.IStandalo self.SetStage("OnSyncConfigComplete", nil) _, err := baremetal.BaremetalSyncRequest(ctx, "POST", url, headers, self.Params) if err != nil { - self.OnFailure(ctx, baremetal, jsonutils.Marshal(err)) + self.OnFailure(ctx, baremetal, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/baremetal_prepare_task.go b/pkg/compute/tasks/baremetal_prepare_task.go index 3bb4c92a92..483ab85d1d 100644 --- a/pkg/compute/tasks/baremetal_prepare_task.go +++ b/pkg/compute/tasks/baremetal_prepare_task.go @@ -41,7 +41,7 @@ func (self *BaremetalPrepareTask) OnInit(ctx context.Context, obj db.IStandalone self.SetStage("OnSyncConfigComplete", nil) _, err := baremetal.BaremetalSyncRequest(ctx, "POST", url, headers, self.Params) if err != nil { - self.OnFailure(ctx, baremetal, jsonutils.Marshal(err)) + self.OnFailure(ctx, baremetal, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/baremetal_server_reset_task.go b/pkg/compute/tasks/baremetal_server_reset_task.go index d9d1658b46..55382c7aab 100644 --- a/pkg/compute/tasks/baremetal_server_reset_task.go +++ b/pkg/compute/tasks/baremetal_server_reset_task.go @@ -41,7 +41,7 @@ func (self *BaremetalServerResetTask) OnInit(ctx context.Context, obj db.IStanda _, err := baremetal.BaremetalSyncRequest(ctx, "POST", url, headers, nil) if err != nil { log.Errorln(err) - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) } else { self.SetStageComplete(ctx, nil) } diff --git a/pkg/compute/tasks/baremetal_sync_config_task.go b/pkg/compute/tasks/baremetal_sync_config_task.go index fc438fff43..5f5f238c39 100644 --- a/pkg/compute/tasks/baremetal_sync_config_task.go +++ b/pkg/compute/tasks/baremetal_sync_config_task.go @@ -49,7 +49,7 @@ func (self *BaremetalSyncConfigTask) DoSyncConfig(ctx context.Context, baremetal headers := self.GetTaskRequestHeader() _, err := baremetal.BaremetalSyncRequest(ctx, "POST", url, headers, nil) if err != nil { - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/baremetal_sync_status_task.go b/pkg/compute/tasks/baremetal_sync_status_task.go index 9a360f08d0..f6f181538e 100644 --- a/pkg/compute/tasks/baremetal_sync_status_task.go +++ b/pkg/compute/tasks/baremetal_sync_status_task.go @@ -47,7 +47,7 @@ func (self *BaremetalSyncStatusTask) DoSyncStatus(ctx context.Context, baremetal headers := self.GetTaskRequestHeader() _, err := baremetal.BaremetalSyncRequest(ctx, "POST", url, headers, nil) if err != nil { - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/baremetal_unmaintenance_task.go b/pkg/compute/tasks/baremetal_unmaintenance_task.go index 0d6a8a14a9..051541c9e6 100644 --- a/pkg/compute/tasks/baremetal_unmaintenance_task.go +++ b/pkg/compute/tasks/baremetal_unmaintenance_task.go @@ -45,7 +45,7 @@ func (self *BaremetalUnmaintenanceTask) OnInit(ctx context.Context, obj db.IStan if len(action) > 0 { logclient.AddActionLogWithStartable(self, baremetal, action, err, self.UserCred, false) } - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) } else { if len(action) > 0 { logclient.AddActionLogWithStartable(self, baremetal, action, "", self.UserCred, true) diff --git a/pkg/compute/tasks/bucket_create_task.go b/pkg/compute/tasks/bucket_create_task.go index ebef5a8691..38f4c6587e 100644 --- a/pkg/compute/tasks/bucket_create_task.go +++ b/pkg/compute/tasks/bucket_create_task.go @@ -38,7 +38,7 @@ func (task *BucketCreateTask) taskFailed(ctx context.Context, bucket *models.SBu bucket.SetStatus(task.UserCred, api.BUCKET_STATUS_CREATE_FAIL, err.Error()) db.OpsLog.LogEvent(bucket, db.ACT_ALLOCATE_FAIL, err, task.UserCred) logclient.AddActionLogWithStartable(task, bucket, logclient.ACT_ALLOCATE, err, task.UserCred, false) - task.SetStageFailed(ctx, jsonutils.Marshal(err)) + task.SetStageFailed(ctx, jsonutils.NewString(err.Error())) } func (task *BucketCreateTask) OnInit(ctx context.Context, obj db.IStandaloneModel, body jsonutils.JSONObject) { diff --git a/pkg/compute/tasks/bucket_delete_task.go b/pkg/compute/tasks/bucket_delete_task.go index 72c25b49b7..81ea7219e2 100644 --- a/pkg/compute/tasks/bucket_delete_task.go +++ b/pkg/compute/tasks/bucket_delete_task.go @@ -38,7 +38,7 @@ func (task *BucketDeleteTask) taskFailed(ctx context.Context, bucket *models.SBu bucket.SetStatus(task.UserCred, api.VPC_STATUS_DELETE_FAILED, err.Error()) db.OpsLog.LogEvent(bucket, db.ACT_DELOCATE_FAIL, err.Error(), task.UserCred) logclient.AddActionLogWithStartable(task, bucket, logclient.ACT_DELETE, err.Error(), task.UserCred, false) - task.SetStageFailed(ctx, jsonutils.Marshal(err)) + task.SetStageFailed(ctx, jsonutils.NewString(err.Error())) } func (task *BucketDeleteTask) OnInit(ctx context.Context, obj db.IStandaloneModel, body jsonutils.JSONObject) { diff --git a/pkg/compute/tasks/bucket_syncstatus_task.go b/pkg/compute/tasks/bucket_syncstatus_task.go index 7c13376cb8..9a2d3bb0f7 100644 --- a/pkg/compute/tasks/bucket_syncstatus_task.go +++ b/pkg/compute/tasks/bucket_syncstatus_task.go @@ -38,7 +38,7 @@ func init() { func (self *BucketSyncstatusTask) taskFailed(ctx context.Context, bucket *models.SBucket, err error) { bucket.SetStatus(self.GetUserCred(), api.BUCKET_STATUS_UNKNOWN, err.Error()) - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) db.OpsLog.LogEvent(bucket, db.ACT_SYNC_STATUS, bucket.GetShortDesc(ctx), self.GetUserCred()) logclient.AddActionLogWithContext(ctx, bucket, logclient.ACT_SYNC_STATUS, err, self.UserCred, false) } diff --git a/pkg/compute/tasks/cloud_account_delete_task.go b/pkg/compute/tasks/cloud_account_delete_task.go index d51081c746..403eee7569 100644 --- a/pkg/compute/tasks/cloud_account_delete_task.go +++ b/pkg/compute/tasks/cloud_account_delete_task.go @@ -56,7 +56,7 @@ func (self *CloudAccountDeleteTask) OnInit(ctx context.Context, obj db.IStandalo if err != nil { // very unlikely account.SetStatus(self.UserCred, api.CLOUD_PROVIDER_DELETE_FAILED, err.Error()) - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) return } } diff --git a/pkg/compute/tasks/cloud_account_sync_skus_task.go b/pkg/compute/tasks/cloud_account_sync_skus_task.go index 1f7d98864e..fcd5f70e4f 100644 --- a/pkg/compute/tasks/cloud_account_sync_skus_task.go +++ b/pkg/compute/tasks/cloud_account_sync_skus_task.go @@ -42,7 +42,7 @@ func (self *CloudAccountSyncSkusTask) taskFailed(ctx context.Context, account *m account.SetStatus(self.UserCred, api.CLOUD_PROVIDER_SYNC_STATUS_ERROR, err.Error()) db.OpsLog.LogEvent(account, db.ACT_SYNC_CLOUD_SKUS, err.Error(), self.GetUserCred()) logclient.AddActionLogWithStartable(self, account, logclient.ACT_CLOUD_SYNC, err, self.UserCred, false) - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) } func (self *CloudAccountSyncSkusTask) OnInit(ctx context.Context, obj db.IStandaloneModel, body jsonutils.JSONObject) { diff --git a/pkg/compute/tasks/cloud_account_sync_task.go b/pkg/compute/tasks/cloud_account_sync_task.go index c397666a50..2ccae73985 100644 --- a/pkg/compute/tasks/cloud_account_sync_task.go +++ b/pkg/compute/tasks/cloud_account_sync_task.go @@ -66,7 +66,7 @@ func (self *CloudAccountSyncInfoTask) OnInit(ctx context.Context, obj db.IStanda func (self *CloudAccountSyncInfoTask) OnCloudaccountSyncReadyFailed(ctx context.Context, obj db.IStandaloneModel, err jsonutils.JSONObject) { cloudaccount := obj.(*models.SCloudaccount) db.OpsLog.LogEvent(cloudaccount, db.ACT_SYNC_HOST_FAILED, err, self.UserCred) - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, err) logclient.AddActionLogWithStartable(self, cloudaccount, logclient.ACT_CLOUD_SYNC, err, self.UserCred, false) } @@ -77,7 +77,7 @@ func (self *CloudAccountSyncInfoTask) OnCloudaccountSyncReady(ctx context.Contex if err != nil { cloudaccount.MarkEndSyncWithLock(ctx, self.UserCred) db.OpsLog.LogEvent(cloudaccount, db.ACT_SYNC_HOST_FAILED, err, self.UserCred) - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) logclient.AddActionLogWithStartable(self, cloudaccount, logclient.ACT_CLOUD_SYNC, err, self.UserCred, false) return } diff --git a/pkg/compute/tasks/dbinstance_account_create_task.go b/pkg/compute/tasks/dbinstance_account_create_task.go index 6e6ad9f89d..6a4495e412 100644 --- a/pkg/compute/tasks/dbinstance_account_create_task.go +++ b/pkg/compute/tasks/dbinstance_account_create_task.go @@ -41,7 +41,7 @@ func (self *DBInstanceAccountCreateTask) taskFailed(ctx context.Context, account account.SetStatus(self.UserCred, api.DBINSTANCE_USER_CREATE_FAILED, err.Error()) db.OpsLog.LogEvent(account, db.ACT_CREATE, err.Error(), self.GetUserCred()) logclient.AddActionLogWithStartable(self, account, logclient.ACT_CREATE, err, self.UserCred, false) - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) } func (self *DBInstanceAccountCreateTask) OnInit(ctx context.Context, obj db.IStandaloneModel, data jsonutils.JSONObject) { diff --git a/pkg/compute/tasks/dbinstance_account_delete_task.go b/pkg/compute/tasks/dbinstance_account_delete_task.go index 9ca413ee96..c92210a308 100644 --- a/pkg/compute/tasks/dbinstance_account_delete_task.go +++ b/pkg/compute/tasks/dbinstance_account_delete_task.go @@ -39,7 +39,7 @@ func (self *DBInstanceAccountDeleteTask) taskFailed(ctx context.Context, account account.SetStatus(self.UserCred, api.DBINSTANCE_USER_DELETE_FAILED, err.Error()) db.OpsLog.LogEvent(account, db.ACT_DELETE, err.Error(), self.GetUserCred()) logclient.AddActionLogWithStartable(self, account, logclient.ACT_DELETE, err, self.UserCred, false) - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) } func (self *DBInstanceAccountDeleteTask) OnInit(ctx context.Context, obj db.IStandaloneModel, data jsonutils.JSONObject) { diff --git a/pkg/compute/tasks/dbinstance_account_grant_privilege_task.go b/pkg/compute/tasks/dbinstance_account_grant_privilege_task.go index 9271b68936..71df1e83ea 100644 --- a/pkg/compute/tasks/dbinstance_account_grant_privilege_task.go +++ b/pkg/compute/tasks/dbinstance_account_grant_privilege_task.go @@ -41,7 +41,7 @@ func (self *DBInstanceAccountGrantPrivilegeTask) taskFailed(ctx context.Context, account.SetStatus(self.UserCred, api.DBINSTANCE_USER_AVAILABLE, err.Error()) db.OpsLog.LogEvent(account, db.ACT_GRANT_PRIVILEGE, err.Error(), self.GetUserCred()) logclient.AddActionLogWithStartable(self, account, logclient.ACT_GRANT_PRIVILEGE, err, self.UserCred, false) - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) } func (self *DBInstanceAccountGrantPrivilegeTask) OnInit(ctx context.Context, obj db.IStandaloneModel, data jsonutils.JSONObject) { diff --git a/pkg/compute/tasks/dbinstance_account_reset_password_task.go b/pkg/compute/tasks/dbinstance_account_reset_password_task.go index 2568c28cbf..fa9d4a395a 100644 --- a/pkg/compute/tasks/dbinstance_account_reset_password_task.go +++ b/pkg/compute/tasks/dbinstance_account_reset_password_task.go @@ -39,7 +39,7 @@ func (self *DBInstanceAccountResetPasswordTask) taskFailed(ctx context.Context, account.SetStatus(self.UserCred, api.DBINSTANCE_USER_RESET_PASSWD_FAILED, err.Error()) db.OpsLog.LogEvent(account, db.ACT_RESET_PASSWORD, err, self.GetUserCred()) logclient.AddActionLogWithStartable(self, account, logclient.ACT_RESET_PASSWORD, err, self.UserCred, false) - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) } func (self *DBInstanceAccountResetPasswordTask) OnInit(ctx context.Context, obj db.IStandaloneModel, data jsonutils.JSONObject) { diff --git a/pkg/compute/tasks/dbinstance_account_revoke_privilege_task.go b/pkg/compute/tasks/dbinstance_account_revoke_privilege_task.go index 9913951a74..faead35878 100644 --- a/pkg/compute/tasks/dbinstance_account_revoke_privilege_task.go +++ b/pkg/compute/tasks/dbinstance_account_revoke_privilege_task.go @@ -41,7 +41,7 @@ func (self *DBInstanceAccountRevokePrivilegeTask) taskFailed(ctx context.Context account.SetStatus(self.UserCred, api.DBINSTANCE_USER_AVAILABLE, err.Error()) db.OpsLog.LogEvent(account, db.ACT_REVOKE_PRIVILEGE, err, self.GetUserCred()) logclient.AddActionLogWithStartable(self, account, logclient.ACT_REVOKE_PRIVILEGE, err, self.UserCred, false) - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) } func (self *DBInstanceAccountRevokePrivilegeTask) OnInit(ctx context.Context, obj db.IStandaloneModel, data jsonutils.JSONObject) { diff --git a/pkg/compute/tasks/dbinstance_account_set_privileges_task.go b/pkg/compute/tasks/dbinstance_account_set_privileges_task.go index 7f6e5bf878..5002368aec 100644 --- a/pkg/compute/tasks/dbinstance_account_set_privileges_task.go +++ b/pkg/compute/tasks/dbinstance_account_set_privileges_task.go @@ -42,7 +42,7 @@ func (self *DBInstanceAccountSetPrivilegesTask) taskFailed(ctx context.Context, account.SetStatus(self.UserCred, api.DBINSTANCE_USER_AVAILABLE, err.Error()) db.OpsLog.LogEvent(account, db.ACT_SET_PRIVILEGES, err, self.GetUserCred()) logclient.AddActionLogWithStartable(self, account, logclient.ACT_SET_PRIVILEGES, err, self.UserCred, false) - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) } func (self *DBInstanceAccountSetPrivilegesTask) OnInit(ctx context.Context, obj db.IStandaloneModel, data jsonutils.JSONObject) { diff --git a/pkg/compute/tasks/dbinstance_backup_create_task.go b/pkg/compute/tasks/dbinstance_backup_create_task.go index 6650edac79..024da30f6d 100644 --- a/pkg/compute/tasks/dbinstance_backup_create_task.go +++ b/pkg/compute/tasks/dbinstance_backup_create_task.go @@ -44,7 +44,7 @@ func (self *DBInstanceBackupCreateTask) taskFailed(ctx context.Context, backup * if instance != nil { instance.SetStatus(self.UserCred, api.DBINSTANCE_BACKING_UP_FAILED, err.Error()) } - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) } func (self *DBInstanceBackupCreateTask) OnInit(ctx context.Context, obj db.IStandaloneModel, data jsonutils.JSONObject) { diff --git a/pkg/compute/tasks/dbinstance_backup_delete.go b/pkg/compute/tasks/dbinstance_backup_delete.go index 37295a7862..68384406dd 100644 --- a/pkg/compute/tasks/dbinstance_backup_delete.go +++ b/pkg/compute/tasks/dbinstance_backup_delete.go @@ -40,7 +40,7 @@ func (self *DBInstanceBackupDeleteTask) taskFailed(ctx context.Context, backup * backup.SetStatus(self.UserCred, api.DBINSTANCE_BACKUP_DELETE_FAILED, err.Error()) db.OpsLog.LogEvent(backup, db.ACT_DELETE, err, self.GetUserCred()) logclient.AddActionLogWithStartable(self, backup, logclient.ACT_DELETE, err, self.UserCred, false) - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) } func (self *DBInstanceBackupDeleteTask) OnInit(ctx context.Context, obj db.IStandaloneModel, data jsonutils.JSONObject) { diff --git a/pkg/compute/tasks/dbinstance_backup_syncstatus_task.go b/pkg/compute/tasks/dbinstance_backup_syncstatus_task.go index ae318eb9e0..a8f301ad48 100644 --- a/pkg/compute/tasks/dbinstance_backup_syncstatus_task.go +++ b/pkg/compute/tasks/dbinstance_backup_syncstatus_task.go @@ -38,7 +38,7 @@ func init() { func (self *DBInstanceBackupSyncstatusTask) taskFailed(ctx context.Context, backup *models.SDBInstanceBackup, err error) { backup.SetStatus(self.GetUserCred(), api.DBINSTANCE_BACKUP_UNKNOWN, err.Error()) - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) db.OpsLog.LogEvent(backup, db.ACT_SYNC_STATUS, backup.GetShortDesc(ctx), self.GetUserCred()) logclient.AddActionLogWithContext(ctx, backup, logclient.ACT_SYNC_STATUS, err, self.UserCred, false) } diff --git a/pkg/compute/tasks/dbinstance_change_config.go b/pkg/compute/tasks/dbinstance_change_config.go index 0fdb32e0ae..8f10a2c55d 100644 --- a/pkg/compute/tasks/dbinstance_change_config.go +++ b/pkg/compute/tasks/dbinstance_change_config.go @@ -40,7 +40,7 @@ func (self *DBInstanceChangeConfigTask) taskFailed(ctx context.Context, dbinstan dbinstance.SetStatus(self.UserCred, api.DBINSTANCE_CHANGE_CONFIG_FAILED, err.Error()) db.OpsLog.LogEvent(dbinstance, db.ACT_CHANGE_CONFIG, err, self.GetUserCred()) logclient.AddActionLogWithStartable(self, dbinstance, logclient.ACT_CHANGE_CONFIG, err, self.UserCred, false) - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) } func (self *DBInstanceChangeConfigTask) OnInit(ctx context.Context, obj db.IStandaloneModel, data jsonutils.JSONObject) { diff --git a/pkg/compute/tasks/dbinstance_database_create_task.go b/pkg/compute/tasks/dbinstance_database_create_task.go index 8d1d7a5f58..964decf36f 100644 --- a/pkg/compute/tasks/dbinstance_database_create_task.go +++ b/pkg/compute/tasks/dbinstance_database_create_task.go @@ -41,7 +41,7 @@ func (self *DBInstanceDatabaseCreateTask) taskFailed(ctx context.Context, databa database.SetStatus(self.UserCred, api.DBINSTANCE_DATABASE_CREATE_FAILE, err.Error()) db.OpsLog.LogEvent(database, db.ACT_CREATE, err, self.GetUserCred()) logclient.AddActionLogWithStartable(self, database, logclient.ACT_CREATE, err, self.UserCred, false) - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) } func (self *DBInstanceDatabaseCreateTask) OnInit(ctx context.Context, obj db.IStandaloneModel, data jsonutils.JSONObject) { diff --git a/pkg/compute/tasks/dbinstance_database_delete_task.go b/pkg/compute/tasks/dbinstance_database_delete_task.go index d1ec7454e9..f8d9c0c870 100644 --- a/pkg/compute/tasks/dbinstance_database_delete_task.go +++ b/pkg/compute/tasks/dbinstance_database_delete_task.go @@ -39,7 +39,7 @@ func (self *DBInstanceDatabaseDeleteTask) taskFailed(ctx context.Context, databa database.SetStatus(self.UserCred, api.DBINSTANCE_DATABASE_DELETE_FAILED, err.Error()) db.OpsLog.LogEvent(database, db.ACT_DELETE, err, self.GetUserCred()) logclient.AddActionLogWithStartable(self, database, logclient.ACT_DELETE, err, self.UserCred, false) - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) } func (self *DBInstanceDatabaseDeleteTask) OnInit(ctx context.Context, obj db.IStandaloneModel, data jsonutils.JSONObject) { diff --git a/pkg/compute/tasks/dbinstance_delete_task.go b/pkg/compute/tasks/dbinstance_delete_task.go index d2dce14916..893a32ec81 100644 --- a/pkg/compute/tasks/dbinstance_delete_task.go +++ b/pkg/compute/tasks/dbinstance_delete_task.go @@ -41,7 +41,7 @@ func (self *DBInstanceDeleteTask) taskFailed(ctx context.Context, dbinstance *mo dbinstance.SetStatus(self.UserCred, api.DBINSTANCE_DELETE_FAILED, err.Error()) db.OpsLog.LogEvent(dbinstance, db.ACT_DELETE, err, self.GetUserCred()) logclient.AddActionLogWithStartable(self, dbinstance, logclient.ACT_DELETE, err, self.UserCred, false) - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) } func (self *DBInstanceDeleteTask) OnInit(ctx context.Context, obj db.IStandaloneModel, data jsonutils.JSONObject) { diff --git a/pkg/compute/tasks/dbinstance_reboot_task.go b/pkg/compute/tasks/dbinstance_reboot_task.go index efab136843..a5447a6aae 100644 --- a/pkg/compute/tasks/dbinstance_reboot_task.go +++ b/pkg/compute/tasks/dbinstance_reboot_task.go @@ -41,7 +41,7 @@ func (self *DBInstanceRebootTask) taskFailed(ctx context.Context, dbinstance *mo dbinstance.SetStatus(self.UserCred, api.DBINSTANCE_REBOOT_FAILED, err.Error()) db.OpsLog.LogEvent(dbinstance, db.ACT_REBOOT, err, self.GetUserCred()) logclient.AddActionLogWithStartable(self, dbinstance, logclient.ACT_REBOOT, err, self.UserCred, false) - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) } func (self *DBInstanceRebootTask) OnInit(ctx context.Context, obj db.IStandaloneModel, data jsonutils.JSONObject) { diff --git a/pkg/compute/tasks/dbinstance_recovery_task.go b/pkg/compute/tasks/dbinstance_recovery_task.go index c80bba278a..56e98f8f4a 100644 --- a/pkg/compute/tasks/dbinstance_recovery_task.go +++ b/pkg/compute/tasks/dbinstance_recovery_task.go @@ -42,7 +42,7 @@ func (self *DBInstanceRecoveryTask) taskFailed(ctx context.Context, instance *mo instance.SetStatus(self.UserCred, api.DBINSTANCE_RESTORE_FAILED, err.Error()) db.OpsLog.LogEvent(instance, db.ACT_RESTORE, err, self.GetUserCred()) logclient.AddActionLogWithStartable(self, instance, logclient.ACT_RESTORE, err, self.UserCred, false) - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) } func (self *DBInstanceRecoveryTask) OnInit(ctx context.Context, obj db.IStandaloneModel, data jsonutils.JSONObject) { diff --git a/pkg/compute/tasks/dbinstance_remote_update_task.go b/pkg/compute/tasks/dbinstance_remote_update_task.go index 28f1f7efa6..c1665396fc 100644 --- a/pkg/compute/tasks/dbinstance_remote_update_task.go +++ b/pkg/compute/tasks/dbinstance_remote_update_task.go @@ -47,7 +47,7 @@ func (self *DBInstanceRemoteUpdateTask) OnInit(ctx context.Context, obj db.IStan replaceTags := jsonutils.QueryBoolean(self.Params, "replace_tags", false) if err := instance.GetRegion().GetDriver().RequestRemoteUpdateDBInstance(ctx, self.GetUserCred(), instance, replaceTags, self); err != nil { - self.taskFail(ctx, instance, jsonutils.Marshal(err)) + self.taskFail(ctx, instance, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/dbinstance_sync_task.go b/pkg/compute/tasks/dbinstance_sync_task.go index 434818f6f9..9ce54ff253 100644 --- a/pkg/compute/tasks/dbinstance_sync_task.go +++ b/pkg/compute/tasks/dbinstance_sync_task.go @@ -39,7 +39,7 @@ func (self *DBInstanceSyncTask) taskFailed(ctx context.Context, dbinstance *mode dbinstance.SetStatus(self.UserCred, api.DBINSTANCE_UNKNOWN, err.Error()) db.OpsLog.LogEvent(dbinstance, db.ACT_SYNC_CONF, err, self.GetUserCred()) logclient.AddActionLogWithStartable(self, dbinstance, logclient.ACT_SYNC_CONF, err, self.UserCred, false) - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) } func (self *DBInstanceSyncTask) OnInit(ctx context.Context, obj db.IStandaloneModel, data jsonutils.JSONObject) { diff --git a/pkg/compute/tasks/disk_batch_create_task.go b/pkg/compute/tasks/disk_batch_create_task.go index 2df5aec8e3..d4b270d289 100644 --- a/pkg/compute/tasks/disk_batch_create_task.go +++ b/pkg/compute/tasks/disk_batch_create_task.go @@ -127,7 +127,7 @@ func (self *DiskBatchCreateTask) SaveScheduleResult(ctx context.Context, obj ISc onError := func(err error) { self.clearPendingUsage(ctx, disk) disk.SetStatus(self.UserCred, api.DISK_ALLOC_FAILED, err.Error()) - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) db.OpsLog.LogEvent(disk, db.ACT_ALLOCATE_FAIL, err, self.UserCred) notifyclient.NotifySystemErrorWithCtx(ctx, disk.Id, disk.Name, api.DISK_ALLOC_FAILED, err.Error()) } diff --git a/pkg/compute/tasks/disk_reset_task.go b/pkg/compute/tasks/disk_reset_task.go index 16e48766d0..1b084cff67 100644 --- a/pkg/compute/tasks/disk_reset_task.go +++ b/pkg/compute/tasks/disk_reset_task.go @@ -174,7 +174,7 @@ func (self *DiskCleanUpSnapshotsTask) StartCleanUpSnapshots(ctx context.Context, self.SetStage("OnCleanUpSnapshots", nil) err := host.GetHostDriver().RequestCleanUpDiskSnapshots(ctx, host, disk, self.Params, self) if err != nil { - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/disk_save_task.go b/pkg/compute/tasks/disk_save_task.go index 97f9b903e7..84e55eb9f3 100644 --- a/pkg/compute/tasks/disk_save_task.go +++ b/pkg/compute/tasks/disk_save_task.go @@ -73,7 +73,7 @@ func (self *DiskSaveTask) StartBackupDisk(ctx context.Context, disk *models.SDis if err := host.GetHostDriver().RequestPrepareSaveDiskOnHost(ctx, host, disk, imageId, self); err != nil { log.Errorf("Backup failed: %v", err) disk.SetDiskReady(ctx, self.GetUserCred(), err.Error()) - self.TaskFailed(ctx, jsonutils.Marshal(err)) + self.TaskFailed(ctx, jsonutils.NewString(err.Error())) db.OpsLog.LogEvent(disk, db.ACT_SAVE_FAIL, err.Error(), self.GetUserCred()) } } @@ -99,7 +99,7 @@ func (self *DiskSaveTask) OnDiskBackupComplete(ctx context.Context, disk *models } if err := self.UploadDisk(ctx, host, disk, imageId, data); err != nil { log.Errorf("UploadDisk failed: %v", err) - self.TaskFailed(ctx, jsonutils.Marshal(err)) + self.TaskFailed(ctx, jsonutils.NewString(err.Error())) } self.RefreshImageCache(ctx, imageId) } diff --git a/pkg/compute/tasks/disk_syncstatus_task.go b/pkg/compute/tasks/disk_syncstatus_task.go index 474c2cf8e3..88980c5f38 100644 --- a/pkg/compute/tasks/disk_syncstatus_task.go +++ b/pkg/compute/tasks/disk_syncstatus_task.go @@ -38,7 +38,7 @@ func init() { func (self *DiskSyncstatusTask) taskFailed(ctx context.Context, disk *models.SDisk, err error) { disk.SetStatus(self.GetUserCred(), api.DISK_UNKNOWN, err.Error()) - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) db.OpsLog.LogEvent(disk, db.ACT_SYNC_STATUS, disk.GetShortDesc(ctx), self.GetUserCred()) logclient.AddActionLogWithContext(ctx, disk, logclient.ACT_SYNC_STATUS, err, self.UserCred, false) } diff --git a/pkg/compute/tasks/eip_associate_task.go b/pkg/compute/tasks/eip_associate_task.go index 2ae832b0cb..15f9e8679e 100644 --- a/pkg/compute/tasks/eip_associate_task.go +++ b/pkg/compute/tasks/eip_associate_task.go @@ -67,7 +67,7 @@ func (self *EipAssociateTask) OnInit(ctx context.Context, obj db.IStandaloneMode self.SetStage("OnAssociateEipComplete", nil) if err := driver.RequestAssociateEip(ctx, self.UserCred, server, eip, self); err != nil { - self.TaskFail(ctx, eip, jsonutils.Marshal(err), server) + self.TaskFail(ctx, eip, jsonutils.NewString(err.Error()), server) return } } diff --git a/pkg/compute/tasks/elasticcache_delete_task.go b/pkg/compute/tasks/elasticcache_delete_task.go index 46ace6d575..87fb859bea 100644 --- a/pkg/compute/tasks/elasticcache_delete_task.go +++ b/pkg/compute/tasks/elasticcache_delete_task.go @@ -54,7 +54,7 @@ func (self *ElasticcacheDeleteTask) OnInit(ctx context.Context, obj db.IStandalo self.SetStage("OnElasticcacheDeleteComplete", nil) if err := region.GetDriver().RequestDeleteElasticcache(ctx, self.GetUserCred(), ec, self); err != nil { - self.taskFail(ctx, ec, jsonutils.Marshal(err)) + self.taskFail(ctx, ec, jsonutils.NewString(err.Error())) return } else { ec.SetStatus(self.GetUserCred(), api.ELASTIC_CACHE_STATUS_RELEASED, "") diff --git a/pkg/compute/tasks/elasticcache_remote_update_task.go b/pkg/compute/tasks/elasticcache_remote_update_task.go index f9fc4f6921..e61e55c93a 100644 --- a/pkg/compute/tasks/elasticcache_remote_update_task.go +++ b/pkg/compute/tasks/elasticcache_remote_update_task.go @@ -53,7 +53,7 @@ func (self *ElasticcacheRemoteUpdateTask) OnInit(ctx context.Context, obj db.ISt replaceTags := jsonutils.QueryBoolean(self.Params, "replace_tags", false) if err := region.GetDriver().RequestRemoteUpdateElasticcache(ctx, self.GetUserCred(), ec, replaceTags, self); err != nil { - self.taskFail(ctx, ec, jsonutils.Marshal(err)) + self.taskFail(ctx, ec, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/elasticcache_renew_task.go b/pkg/compute/tasks/elasticcache_renew_task.go index 0c9852bab0..16e5fb0974 100644 --- a/pkg/compute/tasks/elasticcache_renew_task.go +++ b/pkg/compute/tasks/elasticcache_renew_task.go @@ -34,7 +34,7 @@ func (self *ElasticcacheRenewTask) OnInit(ctx context.Context, obj db.IStandalon db.OpsLog.LogEvent(instance, db.ACT_REW_FAIL, err, self.UserCred) logclient.AddActionLogWithStartable(self, instance, logclient.ACT_RENEW, err, self.UserCred, false) instance.SetStatus(self.GetUserCred(), api.ELASTIC_CACHE_RENEW_FAILED, err.Error()) - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) return } diff --git a/pkg/compute/tasks/elasticcache_set_auto_renew_task.go b/pkg/compute/tasks/elasticcache_set_auto_renew_task.go index 7c78915042..e3657d9db6 100644 --- a/pkg/compute/tasks/elasticcache_set_auto_renew_task.go +++ b/pkg/compute/tasks/elasticcache_set_auto_renew_task.go @@ -29,7 +29,7 @@ func (self *ElasticcacheSetAutoRenewTask) OnInit(ctx context.Context, obj db.ISt db.OpsLog.LogEvent(ec, db.ACT_SET_AUTO_RENEW_FAIL, err, self.UserCred) logclient.AddActionLogWithStartable(self, ec, logclient.ACT_SET_AUTO_RENEW, err, self.UserCred, false) ec.SetStatus(self.GetUserCred(), api.ELASTIC_CACHE_SET_AUTO_RENEW_FAILED, err.Error()) - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) return } diff --git a/pkg/compute/tasks/elasticcache_syncsecgroups_task.go b/pkg/compute/tasks/elasticcache_syncsecgroups_task.go index 9388d7f3ae..87d38b7757 100644 --- a/pkg/compute/tasks/elasticcache_syncsecgroups_task.go +++ b/pkg/compute/tasks/elasticcache_syncsecgroups_task.go @@ -54,7 +54,7 @@ func (self *ElasticcacheSyncsecgroupsTask) OnInit(ctx context.Context, obj db.IS self.SetStage("OnElasticcacheSyncSecgroupsComplete", nil) err := region.GetDriver().RequestSyncSecgroupsForElasticcache(ctx, self.GetUserCred(), cache, self) if err != nil { - self.taskFailed(ctx, cache, jsonutils.Marshal(err)) + self.taskFailed(ctx, cache, jsonutils.NewString(err.Error())) return } } @@ -65,25 +65,25 @@ func (self *ElasticcacheSyncsecgroupsTask) OnElasticcacheSyncSecgroupsComplete(c secgroups := []string{} err := data.Unmarshal(&secgroups, "ext_secgroup_ids") if err != nil { - self.taskFailed(ctx, cache, jsonutils.Marshal(err)) + self.taskFailed(ctx, cache, jsonutils.NewString(err.Error())) return } iregion, err := cache.GetIRegion() if err != nil { - self.taskFailed(ctx, cache, jsonutils.Marshal(err)) + self.taskFailed(ctx, cache, jsonutils.NewString(err.Error())) return } iec, err := iregion.GetIElasticcacheById(cache.GetExternalId()) if err != nil { - self.taskFailed(ctx, cache, jsonutils.Marshal(err)) + self.taskFailed(ctx, cache, jsonutils.NewString(err.Error())) return } err = iec.UpdateSecurityGroups(secgroups) if err != nil { - self.taskFailed(ctx, cache, jsonutils.Marshal(err)) + self.taskFailed(ctx, cache, jsonutils.NewString(err.Error())) return } diff --git a/pkg/compute/tasks/elasticcache_update_backup_policy_task.go b/pkg/compute/tasks/elasticcache_update_backup_policy_task.go index 82d7479b17..4c89fc4b02 100644 --- a/pkg/compute/tasks/elasticcache_update_backup_policy_task.go +++ b/pkg/compute/tasks/elasticcache_update_backup_policy_task.go @@ -54,7 +54,7 @@ func (self *ElasticcacheUpdateBackupPolicyTask) OnInit(ctx context.Context, obj self.SetStage("OnElasticcacheUpdateBackupPolicyComplete", nil) if err := region.GetDriver().RequestElasticcacheUpdateBackupPolicy(ctx, self.GetUserCred(), elasticcache, self); err != nil { - self.OnElasticcacheUpdateBackupPolicyCompleteFailed(ctx, elasticcache, jsonutils.Marshal(err)) + self.OnElasticcacheUpdateBackupPolicyCompleteFailed(ctx, elasticcache, jsonutils.NewString(err.Error())) return } diff --git a/pkg/compute/tasks/guest_backup_tasks.go b/pkg/compute/tasks/guest_backup_tasks.go index e862287c7c..0aa33edd69 100644 --- a/pkg/compute/tasks/guest_backup_tasks.go +++ b/pkg/compute/tasks/guest_backup_tasks.go @@ -59,7 +59,7 @@ func (self *GuestSwitchToBackupTask) OnEnsureMasterGuestStoped(ctx context.Conte self.SetStage("OnBackupGuestStoped", nil) err := guest.GetDriver().RequestStopOnHost(ctx, guest, backupHost, self) if err != nil { - self.OnFail(ctx, guest, jsonutils.Marshal(err)) + self.OnFail(ctx, guest, jsonutils.NewString(err.Error())) } } @@ -212,7 +212,7 @@ func (self *GuestStartAndSyncToBackupTask) checkTemplete(ctx context.Context, gu err := guest.GetDriver().CheckDiskTemplateOnStorage(ctx, self.UserCred, diskCat.Root.GetTemplateId(), diskCat.Root.DiskFormat, diskCat.Root.BackupStorageId, self) if err != nil { - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) } } else { self.OnCheckTemplete(ctx, guest, nil) @@ -223,7 +223,7 @@ func (self *GuestStartAndSyncToBackupTask) OnCheckTemplete(ctx context.Context, self.SetStage("OnStartBackupGuest", nil) host := models.HostManager.FetchHostById(guest.BackupHostId) if _, err := guest.GetDriver().RequestStartOnHost(ctx, guest, host, self.UserCred, self); err != nil { - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) } } @@ -248,7 +248,7 @@ func (self *GuestStartAndSyncToBackupTask) OnStartBackupGuest(ctx context.Contex self.SetStage("OnRequestSyncToBackup", nil) err = guest.GetDriver().RequestSyncToBackup(ctx, guest, self) if err != nil { - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) } } else { self.SetStageComplete(ctx, nil) diff --git a/pkg/compute/tasks/guest_batch_create_task.go b/pkg/compute/tasks/guest_batch_create_task.go index ddf6d448a2..f4fe1549c6 100644 --- a/pkg/compute/tasks/guest_batch_create_task.go +++ b/pkg/compute/tasks/guest_batch_create_task.go @@ -291,7 +291,7 @@ func (self *GuestBatchCreateTask) SaveScheduleResult(ctx context.Context, obj IS db.OpsLog.LogEvent(guest, db.ACT_ALLOCATE_FAIL, err, self.UserCred) logclient.AddActionLogWithStartable(self, obj, logclient.ACT_ALLOCATE, err, self.GetUserCred(), false) notifyclient.NotifySystemErrorWithCtx(ctx, guest.Id, guest.Name, api.VM_CREATE_FAILED, err.Error()) - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/guest_change_config_task.go b/pkg/compute/tasks/guest_change_config_task.go index 00429bc78a..8bd27af3d1 100644 --- a/pkg/compute/tasks/guest_change_config_task.go +++ b/pkg/compute/tasks/guest_change_config_task.go @@ -161,7 +161,7 @@ func (self *GuestChangeConfigTask) OnCreateDisksComplete(ctx context.Context, ob func (self *GuestChangeConfigTask) startGuestChangeCpuMemSpec(ctx context.Context, guest *models.SGuest, instanceType string, vcpuCount int64, vmemSize int64) { err := guest.GetDriver().RequestChangeVmConfig(ctx, guest, self, instanceType, vcpuCount, vmemSize) if err != nil { - self.markStageFailed(ctx, guest, jsonutils.Marshal(err)) + self.markStageFailed(ctx, guest, jsonutils.NewString(err.Error())) return } } diff --git a/pkg/compute/tasks/guest_convert_esxi_to_kvm_task.go b/pkg/compute/tasks/guest_convert_esxi_to_kvm_task.go index c83d268c46..cc9d689806 100644 --- a/pkg/compute/tasks/guest_convert_esxi_to_kvm_task.go +++ b/pkg/compute/tasks/guest_convert_esxi_to_kvm_task.go @@ -127,7 +127,7 @@ func (self *GuestConvertEsxiToKvmTask) SaveScheduleResult(ctx context.Context, o self.SetStage("OnHostCreateGuest", nil) if err = self.RequestHostCreateGuestFromEsxi(ctx, targetGuest, esxiAccessInfo); err != nil { - self.taskFailed(ctx, guest, jsonutils.Marshal(err)) + self.taskFailed(ctx, guest, jsonutils.NewString(err.Error())) return } host.ClearSchedDescCache() diff --git a/pkg/compute/tasks/guest_create_disk_task.go b/pkg/compute/tasks/guest_create_disk_task.go index 6625d9fe3b..2e71a15653 100644 --- a/pkg/compute/tasks/guest_create_disk_task.go +++ b/pkg/compute/tasks/guest_create_disk_task.go @@ -38,7 +38,7 @@ func (self *GuestCreateDiskTask) OnInit(ctx context.Context, obj db.IStandaloneM guest := obj.(*models.SGuest) err := guest.GetDriver().DoGuestCreateDisksTask(ctx, guest, self) if err != nil { - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/guest_delete_backup_task.go b/pkg/compute/tasks/guest_delete_backup_task.go index 4b1c1e415a..2df7e99073 100644 --- a/pkg/compute/tasks/guest_delete_backup_task.go +++ b/pkg/compute/tasks/guest_delete_backup_task.go @@ -56,7 +56,7 @@ func (self *GuestDeleteBackupTask) OnInit(ctx context.Context, obj db.IStandalon _, _, err := httputils.JSONRequest(httputils.GetDefaultClient(), ctx, "POST", url, self.GetTaskRequestHeader(), nil, false) if err != nil { - self.OnFail(ctx, guest, jsonutils.Marshal(err)) + self.OnFail(ctx, guest, jsonutils.NewString(err.Error())) return } } diff --git a/pkg/compute/tasks/guest_deploy_task.go b/pkg/compute/tasks/guest_deploy_task.go index 692ffcc088..95e30fd17a 100644 --- a/pkg/compute/tasks/guest_deploy_task.go +++ b/pkg/compute/tasks/guest_deploy_task.go @@ -75,7 +75,7 @@ func (self *GuestDeployTask) DeployOnHost(ctx context.Context, guest *models.SGu func (self *GuestDeployTask) OnDeployGuestFail(ctx context.Context, guest *models.SGuest, err error) { guest.SetStatus(self.UserCred, api.VM_DEPLOY_FAILED, err.Error()) - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) logclient.AddActionLogWithStartable(self, guest, logclient.ACT_VM_DEPLOY, err, self.UserCred, false) db.OpsLog.LogEvent(guest, db.ACT_VM_DEPLOY_FAIL, err.Error(), self.UserCred) } diff --git a/pkg/compute/tasks/guest_detach_disk_task.go b/pkg/compute/tasks/guest_detach_disk_task.go index 25d6510577..6d25cf5eb1 100644 --- a/pkg/compute/tasks/guest_detach_disk_task.go +++ b/pkg/compute/tasks/guest_detach_disk_task.go @@ -94,7 +94,7 @@ func (self *GuestDetachDiskTask) OnDetachDiskComplete(ctx context.Context, guest db.OpsLog.LogEvent(disk, db.ACT_DELETE, "", self.UserCred) err := guest.GetDriver().RequestDeleteDetachedDisk(ctx, disk, self, purge) if err != nil { - self.OnTaskFail(ctx, guest, disk, jsonutils.Marshal(err)) + self.OnTaskFail(ctx, guest, disk, jsonutils.NewString(err.Error())) } return } diff --git a/pkg/compute/tasks/guest_disk_snapshot_task.go b/pkg/compute/tasks/guest_disk_snapshot_task.go index 19efd9e200..dc14ee2e29 100644 --- a/pkg/compute/tasks/guest_disk_snapshot_task.go +++ b/pkg/compute/tasks/guest_disk_snapshot_task.go @@ -59,7 +59,7 @@ func (self *GuestDiskSnapshotTask) DoDiskSnapshot(ctx context.Context, guest *mo guest.SetStatus(self.UserCred, api.VM_SNAPSHOT, "") err = guest.GetDriver().RequestDiskSnapshot(ctx, guest, self, snapshotId, diskId) if err != nil { - self.TaskFailed(ctx, guest, jsonutils.Marshal(err)) + self.TaskFailed(ctx, guest, jsonutils.NewString(err.Error())) return } } diff --git a/pkg/compute/tasks/guest_live_migrate_task.go b/pkg/compute/tasks/guest_live_migrate_task.go index 7ddddfa07d..e30bc4cf22 100644 --- a/pkg/compute/tasks/guest_live_migrate_task.go +++ b/pkg/compute/tasks/guest_live_migrate_task.go @@ -180,7 +180,7 @@ func (self *GuestMigrateTask) OnCachedCdromComplete(ctx context.Context, guest * _, _, err := httputils.JSONRequest(httputils.GetDefaultClient(), ctx, "POST", url, header, body, false) if err != nil { - self.TaskFailed(ctx, guest, jsonutils.Marshal(err)) + self.TaskFailed(ctx, guest, jsonutils.NewString(err.Error())) return } } else { @@ -225,7 +225,7 @@ func (self *GuestMigrateTask) OnSrcPrepareComplete(ctx context.Context, guest *m _, _, err := httputils.JSONRequest(httputils.GetDefaultClient(), ctx, "POST", url, headers, body, false) if err != nil { - self.TaskFailed(ctx, guest, jsonutils.Marshal(err)) + self.TaskFailed(ctx, guest, jsonutils.NewString(err.Error())) } } @@ -365,7 +365,7 @@ func (self *GuestLiveMigrateTask) OnStartDestComplete(ctx context.Context, guest _, _, err = httputils.JSONRequest(httputils.GetDefaultClient(), ctx, "POST", url, headers, body, false) if err != nil { - self.OnLiveMigrateCompleteFailed(ctx, guest, jsonutils.Marshal(err)) + self.OnLiveMigrateCompleteFailed(ctx, guest, jsonutils.NewString(err.Error())) } } @@ -423,7 +423,7 @@ func (self *GuestLiveMigrateTask) OnLiveMigrateComplete(ctx context.Context, gue _, _, err := httputils.JSONRequest(httputils.GetDefaultClient(), ctx, "POST", url, headers, body, false) if err != nil { - self.OnResumeDestGuestCompleteFailed(ctx, guest, jsonutils.Marshal(err)) + self.OnResumeDestGuestCompleteFailed(ctx, guest, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/guest_publicip_to_eip_task.go b/pkg/compute/tasks/guest_publicip_to_eip_task.go index d3ac535f04..cef631b769 100644 --- a/pkg/compute/tasks/guest_publicip_to_eip_task.go +++ b/pkg/compute/tasks/guest_publicip_to_eip_task.go @@ -43,7 +43,7 @@ func (self *GuestPublicipToEipTask) OnInit(ctx context.Context, obj db.IStandalo db.OpsLog.LogEvent(guest, db.ACT_EIP_CONVERT_FAIL, err, self.UserCred) logclient.AddActionLogWithStartable(self, guest, logclient.ACT_EIP_CONVERT, err, self.UserCred, false) guest.SetStatus(self.GetUserCred(), api.VM_EIP_CONVERT_FAILED, err.Error()) - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) return } } diff --git a/pkg/compute/tasks/guest_renew_task.go b/pkg/compute/tasks/guest_renew_task.go index e792be8332..1544ca848c 100644 --- a/pkg/compute/tasks/guest_renew_task.go +++ b/pkg/compute/tasks/guest_renew_task.go @@ -51,7 +51,7 @@ func (self *GuestRenewTask) OnInit(ctx context.Context, obj db.IStandaloneModel, db.OpsLog.LogEvent(guest, db.ACT_REW_FAIL, err, self.UserCred) logclient.AddActionLogWithStartable(self, guest, logclient.ACT_RENEW, err, self.UserCred, false) guest.SetStatus(self.GetUserCred(), api.VM_RENEW_FAILED, msg) - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) return } diff --git a/pkg/compute/tasks/guest_reset_task.go b/pkg/compute/tasks/guest_reset_task.go index ddf04baf2b..f75a771dcf 100644 --- a/pkg/compute/tasks/guest_reset_task.go +++ b/pkg/compute/tasks/guest_reset_task.go @@ -41,7 +41,7 @@ func (self *GuestSoftResetTask) OnInit(ctx context.Context, obj db.IStandaloneMo if err == nil { self.SetStageComplete(ctx, nil) } else { - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/guest_set_auto_renew_task.go b/pkg/compute/tasks/guest_set_auto_renew_task.go index 683c1e0dad..81849e74d9 100644 --- a/pkg/compute/tasks/guest_set_auto_renew_task.go +++ b/pkg/compute/tasks/guest_set_auto_renew_task.go @@ -45,7 +45,7 @@ func (self *GuestSetAutoRenewTask) OnInit(ctx context.Context, obj db.IStandalon db.OpsLog.LogEvent(guest, db.ACT_SET_AUTO_RENEW_FAIL, err, self.UserCred) logclient.AddActionLogWithStartable(self, guest, logclient.ACT_SET_AUTO_RENEW, err, self.UserCred, false) guest.SetStatus(self.GetUserCred(), api.VM_SET_AUTO_RENEW_FAILED, err.Error()) - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) return } } diff --git a/pkg/compute/tasks/guest_sync_task.go b/pkg/compute/tasks/guest_sync_task.go index 66eb632d8f..886fcb26dd 100644 --- a/pkg/compute/tasks/guest_sync_task.go +++ b/pkg/compute/tasks/guest_sync_task.go @@ -44,7 +44,7 @@ func (self *GuestSyncConfTask) OnInit(ctx context.Context, obj db.IStandaloneMod } else { self.SetStage("on_sync_complete", nil) if err := guest.GetDriver().RequestSyncConfigOnHost(ctx, guest, host, self); err != nil { - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) log.Errorf("SyncConfTask faled %v", err) } } diff --git a/pkg/compute/tasks/guest_undeploy_task.go b/pkg/compute/tasks/guest_undeploy_task.go index b5534a3d8c..13c5a30045 100644 --- a/pkg/compute/tasks/guest_undeploy_task.go +++ b/pkg/compute/tasks/guest_undeploy_task.go @@ -82,5 +82,5 @@ func (self *GuestUndeployTask) OnStartDeleteGuestFail(ctx context.Context, err e return } } - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) } diff --git a/pkg/compute/tasks/host_import_libvirt_servers_task.go b/pkg/compute/tasks/host_import_libvirt_servers_task.go index 302a238a39..dac0a4e548 100644 --- a/pkg/compute/tasks/host_import_libvirt_servers_task.go +++ b/pkg/compute/tasks/host_import_libvirt_servers_task.go @@ -53,7 +53,7 @@ func (self *HostImportLibvirtServersTask) RequestHostPrepareImport( header := self.GetTaskRequestHeader() if _, err := host.Request(ctx, self.UserCred, "POST", "/servers/prepare-import-from-libvirt", header, self.Params); err != nil { - self.TaskFailed(ctx, host, jsonutils.Marshal(err)) + self.TaskFailed(ctx, host, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/host_storage_attach_task.go b/pkg/compute/tasks/host_storage_attach_task.go index 4b582f3008..6a8590b5b4 100644 --- a/pkg/compute/tasks/host_storage_attach_task.go +++ b/pkg/compute/tasks/host_storage_attach_task.go @@ -67,7 +67,7 @@ func (self *HostStorageAttachTask) OnInit(ctx context.Context, obj db.IStandalon self.SetStage("OnAttachStorageComplete", nil) err := host.GetHostDriver().RequestAttachStorage(ctx, hoststorage, host, storage, self) if err != nil { - self.taskFail(ctx, host, jsonutils.Marshal(err)) + self.taskFail(ctx, host, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/host_storage_detach_task.go b/pkg/compute/tasks/host_storage_detach_task.go index b53bb17d59..517ea835fe 100644 --- a/pkg/compute/tasks/host_storage_detach_task.go +++ b/pkg/compute/tasks/host_storage_detach_task.go @@ -59,7 +59,7 @@ func (self *HostStorageDetachTask) OnInit(ctx context.Context, obj db.IStandalon self.SetStage("OnDetachStorageComplete", nil) err = host.GetHostDriver().RequestDetachStorage(ctx, host, storage, self) if err != nil { - self.taskFail(ctx, host, jsonutils.Marshal(err)) + self.taskFail(ctx, host, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/loadbalancer_acl_create_task.go b/pkg/compute/tasks/loadbalancer_acl_create_task.go index 40bb81ebb0..f3ac517165 100644 --- a/pkg/compute/tasks/loadbalancer_acl_create_task.go +++ b/pkg/compute/tasks/loadbalancer_acl_create_task.go @@ -53,7 +53,7 @@ func (self *LoadbalancerAclCreateTask) OnInit(ctx context.Context, obj db.IStand } self.SetStage("OnLoadbalancerAclCreateComplete", nil) if err := region.GetDriver().RequestCreateLoadbalancerAcl(ctx, self.GetUserCred(), lbacl, self); err != nil { - self.taskFail(ctx, lbacl, jsonutils.Marshal(err)) + self.taskFail(ctx, lbacl, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/loadbalancer_acl_delete_task.go b/pkg/compute/tasks/loadbalancer_acl_delete_task.go index 92e8f328ba..db969bcaf6 100644 --- a/pkg/compute/tasks/loadbalancer_acl_delete_task.go +++ b/pkg/compute/tasks/loadbalancer_acl_delete_task.go @@ -53,7 +53,7 @@ func (self *LoadbalancerAclDeleteTask) OnInit(ctx context.Context, obj db.IStand } self.SetStage("OnLoadbalancerAclDeleteComplete", nil) if err := region.GetDriver().RequestDeleteLoadbalancerAcl(ctx, self.GetUserCred(), lbacl, self); err != nil { - self.taskFail(ctx, lbacl, jsonutils.Marshal(err)) + self.taskFail(ctx, lbacl, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/loadbalancer_acl_sync_task.go b/pkg/compute/tasks/loadbalancer_acl_sync_task.go index 24ac71225b..91fd87425e 100644 --- a/pkg/compute/tasks/loadbalancer_acl_sync_task.go +++ b/pkg/compute/tasks/loadbalancer_acl_sync_task.go @@ -53,7 +53,7 @@ func (self *LoadbalancerAclSyncTask) OnInit(ctx context.Context, obj db.IStandal } self.SetStage("OnLoadbalancerAclSyncComplete", nil) if err := region.GetDriver().RequestSyncLoadbalancerAcl(ctx, self.GetUserCred(), lbacl, self); err != nil { - self.taskFail(ctx, lbacl, jsonutils.Marshal(err)) + self.taskFail(ctx, lbacl, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/loadbalancer_backend_create_task.go b/pkg/compute/tasks/loadbalancer_backend_create_task.go index 1e56c4c5b8..73716734b9 100644 --- a/pkg/compute/tasks/loadbalancer_backend_create_task.go +++ b/pkg/compute/tasks/loadbalancer_backend_create_task.go @@ -58,7 +58,7 @@ func (self *LoadbalancerBackendCreateTask) OnInit(ctx context.Context, obj db.IS self.SetStage("OnLoadbalancerBackendCreateComplete", nil) if err := region.GetDriver().RequestCreateLoadbalancerBackend(ctx, self.GetUserCred(), lbb, self); err != nil { - self.taskFail(ctx, lbb, jsonutils.Marshal(err)) + self.taskFail(ctx, lbb, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/loadbalancer_backend_delete_task.go b/pkg/compute/tasks/loadbalancer_backend_delete_task.go index aa4995c6b9..f6cb9dbf0b 100644 --- a/pkg/compute/tasks/loadbalancer_backend_delete_task.go +++ b/pkg/compute/tasks/loadbalancer_backend_delete_task.go @@ -56,7 +56,7 @@ func (self *LoadbalancerBackendDeleteTask) OnInit(ctx context.Context, obj db.IS } self.SetStage("OnLoadbalancerBackendDeleteComplete", nil) if err := region.GetDriver().RequestDeleteLoadbalancerBackend(ctx, self.GetUserCred(), lbb, self); err != nil { - self.taskFail(ctx, lbb, jsonutils.Marshal(err)) + self.taskFail(ctx, lbb, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/loadbalancer_backend_sync_task.go b/pkg/compute/tasks/loadbalancer_backend_sync_task.go index 0b6c069fc7..72f1066f26 100644 --- a/pkg/compute/tasks/loadbalancer_backend_sync_task.go +++ b/pkg/compute/tasks/loadbalancer_backend_sync_task.go @@ -57,7 +57,7 @@ func (self *LoadbalancerBackendSyncTask) OnInit(ctx context.Context, obj db.ISta } self.SetStage("OnLoadbalancerBackendCreateComplete", nil) if err := region.GetDriver().RequestSyncLoadbalancerBackend(ctx, self.GetUserCred(), lbb, self); err != nil { - self.taskFail(ctx, lbb, jsonutils.Marshal(err)) + self.taskFail(ctx, lbb, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/loadbalancer_backendgroup_create_task.go b/pkg/compute/tasks/loadbalancer_backendgroup_create_task.go index 103e6b566d..c89427c6b3 100644 --- a/pkg/compute/tasks/loadbalancer_backendgroup_create_task.go +++ b/pkg/compute/tasks/loadbalancer_backendgroup_create_task.go @@ -72,7 +72,7 @@ func (self *LoadbalancerLoadbalancerBackendGroupCreateTask) OnInit(ctx context.C self.SetStage("OnLoadbalancerBackendGroupCreateComplete", nil) if err := region.GetDriver().RequestCreateLoadbalancerBackendGroup(ctx, self.GetUserCred(), lbbg, backends, self); err != nil { - self.taskFail(ctx, lbbg, jsonutils.Marshal(err)) + self.taskFail(ctx, lbbg, jsonutils.NewString(err.Error())) } } @@ -112,7 +112,7 @@ func (self *HuaweiLoadbalancerLoadbalancerBackendGroupCreateTask) OnInit(ctx con self.SetStage("OnLoadbalancerBackendGroupCreateComplete", nil) if err := region.GetDriver().RequestCreateLoadbalancerBackendGroup(ctx, self.GetUserCred(), lbbg, backends, self); err != nil { - self.taskFail(ctx, lbbg, jsonutils.Marshal(err)) + self.taskFail(ctx, lbbg, jsonutils.NewString(err.Error())) } } @@ -139,7 +139,7 @@ func (self *AwsLoadbalancerLoadbalancerBackendGroupCreateTask) OnInit(ctx contex self.SetStage("OnLoadbalancerBackendGroupCreateComplete", nil) if err := region.GetDriver().RequestCreateLoadbalancerBackendGroup(ctx, self.GetUserCred(), lbbg, backends, self); err != nil { - self.taskFail(ctx, lbbg, jsonutils.Marshal(err)) + self.taskFail(ctx, lbbg, jsonutils.NewString(err.Error())) } } @@ -153,7 +153,7 @@ func (self *OpenstackLoadbalancerLoadbalancerBackendGroupCreateTask) OnInit(ctx backends, err := lbbg.GetBackendsParams() if err != nil { - self.taskFail(ctx, lbbg, jsonutils.Marshal(err)) + self.taskFail(ctx, lbbg, jsonutils.NewString(err.Error())) return } @@ -167,6 +167,6 @@ func (self *OpenstackLoadbalancerLoadbalancerBackendGroupCreateTask) OnInit(ctx self.SetStage("OnLoadbalancerBackendGroupCreateComplete", nil) if err := region.GetDriver().RequestCreateLoadbalancerBackendGroup(ctx, self.GetUserCred(), lbbg, backends, self); err != nil { - self.taskFail(ctx, lbbg, jsonutils.Marshal(err)) + self.taskFail(ctx, lbbg, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/loadbalancer_backendgroup_delete_task.go b/pkg/compute/tasks/loadbalancer_backendgroup_delete_task.go index 5f13257194..c04dd92cc1 100644 --- a/pkg/compute/tasks/loadbalancer_backendgroup_delete_task.go +++ b/pkg/compute/tasks/loadbalancer_backendgroup_delete_task.go @@ -53,7 +53,7 @@ func (self *LoadbalancerBackendGroupDeleteTask) OnInit(ctx context.Context, obj } self.SetStage("OnLoadbalancerBackendGroupDeleteComplete", nil) if err := region.GetDriver().RequestDeleteLoadbalancerBackendGroup(ctx, self.GetUserCred(), lbbg, self); err != nil { - self.taskFail(ctx, lbbg, jsonutils.Marshal(err)) + self.taskFail(ctx, lbbg, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/loadbalancer_certificate_create_task.go b/pkg/compute/tasks/loadbalancer_certificate_create_task.go index e8d7851648..6336ef089b 100644 --- a/pkg/compute/tasks/loadbalancer_certificate_create_task.go +++ b/pkg/compute/tasks/loadbalancer_certificate_create_task.go @@ -53,7 +53,7 @@ func (self *LoadbalancerCertificateCreateTask) OnInit(ctx context.Context, obj d } self.SetStage("OnLoadbalancerCertificateCreateComplete", nil) if err := region.GetDriver().RequestCreateLoadbalancerCertificate(ctx, self.GetUserCred(), lbcert, self); err != nil { - self.taskFail(ctx, lbcert, jsonutils.Marshal(err)) + self.taskFail(ctx, lbcert, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/loadbalancer_certificate_delete_task.go b/pkg/compute/tasks/loadbalancer_certificate_delete_task.go index 05b319a2a1..6ca7fc76c0 100644 --- a/pkg/compute/tasks/loadbalancer_certificate_delete_task.go +++ b/pkg/compute/tasks/loadbalancer_certificate_delete_task.go @@ -53,7 +53,7 @@ func (self *LoadbalancerCertificateDeleteTask) OnInit(ctx context.Context, obj d } self.SetStage("OnLoadbalancerCertificateDeleteComplete", nil) if err := region.GetDriver().RequestDeleteLoadbalancerCertificate(ctx, self.GetUserCred(), lbcert, self); err != nil { - self.taskFail(ctx, lbcert, jsonutils.Marshal(err)) + self.taskFail(ctx, lbcert, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/loadbalancer_create_task.go b/pkg/compute/tasks/loadbalancer_create_task.go index fa49230699..03d4220790 100644 --- a/pkg/compute/tasks/loadbalancer_create_task.go +++ b/pkg/compute/tasks/loadbalancer_create_task.go @@ -53,7 +53,7 @@ func (self *LoadbalancerCreateTask) OnInit(ctx context.Context, obj db.IStandalo } self.SetStage("OnLoadbalancerCreateComplete", nil) if err := region.GetDriver().RequestCreateLoadbalancer(ctx, self.GetUserCred(), lb, self); err != nil { - self.taskFail(ctx, lb, jsonutils.Marshal(err)) + self.taskFail(ctx, lb, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/loadbalancer_delete_task.go b/pkg/compute/tasks/loadbalancer_delete_task.go index 5e2ecde6b7..d1355d2b85 100644 --- a/pkg/compute/tasks/loadbalancer_delete_task.go +++ b/pkg/compute/tasks/loadbalancer_delete_task.go @@ -53,7 +53,7 @@ func (self *LoadbalancerDeleteTask) OnInit(ctx context.Context, obj db.IStandalo } self.SetStage("OnLoadbalancerDeleteComplete", nil) if err := region.GetDriver().RequestDeleteLoadbalancer(ctx, self.GetUserCred(), lb, self); err != nil { - self.taskFail(ctx, lb, jsonutils.Marshal(err)) + self.taskFail(ctx, lb, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/loadbalancer_listener_create_task.go b/pkg/compute/tasks/loadbalancer_listener_create_task.go index a6b6dac1eb..13e7cdcc11 100644 --- a/pkg/compute/tasks/loadbalancer_listener_create_task.go +++ b/pkg/compute/tasks/loadbalancer_listener_create_task.go @@ -172,7 +172,7 @@ func (self *LoadbalancerListenerCreateTask) OnInit(ctx context.Context, obj db.I } self.SetStage("OnLoadbalancerListenerCreateComplete", nil) if err := region.GetDriver().RequestCreateLoadbalancerListener(ctx, self.GetUserCred(), lblis, self); err != nil { - self.taskFail(ctx, lblis, jsonutils.Marshal(err)) + self.taskFail(ctx, lblis, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/loadbalancer_listener_delete_task.go b/pkg/compute/tasks/loadbalancer_listener_delete_task.go index e454b93be6..03305581a9 100644 --- a/pkg/compute/tasks/loadbalancer_listener_delete_task.go +++ b/pkg/compute/tasks/loadbalancer_listener_delete_task.go @@ -53,7 +53,7 @@ func (self *LoadbalancerListenerDeleteTask) OnInit(ctx context.Context, obj db.I } self.SetStage("OnLoadbalancerListenerDeleteComplete", nil) if err := region.GetDriver().RequestDeleteLoadbalancerListener(ctx, self.GetUserCred(), lblis, self); err != nil { - self.taskFail(ctx, lblis, jsonutils.Marshal(err)) + self.taskFail(ctx, lblis, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/loadbalancer_listener_rule_create_task.go b/pkg/compute/tasks/loadbalancer_listener_rule_create_task.go index 670bdf4097..9de761285c 100644 --- a/pkg/compute/tasks/loadbalancer_listener_rule_create_task.go +++ b/pkg/compute/tasks/loadbalancer_listener_rule_create_task.go @@ -238,7 +238,7 @@ func (self *LoadbalancerListenerRuleCreateTask) OnCreateLoadbalancerListenerRule } self.SetStage("OnLoadbalancerListenerRuleCreateComplete", nil) if err := region.GetDriver().RequestCreateLoadbalancerListenerRule(ctx, self.GetUserCred(), lbr, self); err != nil { - self.taskFail(ctx, lbr, jsonutils.Marshal(err)) + self.taskFail(ctx, lbr, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/loadbalancer_listener_rule_delete_task.go b/pkg/compute/tasks/loadbalancer_listener_rule_delete_task.go index 5278151694..9d4fedc719 100644 --- a/pkg/compute/tasks/loadbalancer_listener_rule_delete_task.go +++ b/pkg/compute/tasks/loadbalancer_listener_rule_delete_task.go @@ -53,7 +53,7 @@ func (self *LoadbalancerListenerRuleDeleteTask) OnInit(ctx context.Context, obj } self.SetStage("OnLoadbalancerListenerRuleDeleteComplete", nil) if err := region.GetDriver().RequestDeleteLoadbalancerListenerRule(ctx, self.GetUserCred(), lbr, self); err != nil { - self.taskFail(ctx, lbr, jsonutils.Marshal(err)) + self.taskFail(ctx, lbr, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/loadbalancer_listener_start_task.go b/pkg/compute/tasks/loadbalancer_listener_start_task.go index e402afbf75..8eda66a1eb 100644 --- a/pkg/compute/tasks/loadbalancer_listener_start_task.go +++ b/pkg/compute/tasks/loadbalancer_listener_start_task.go @@ -53,7 +53,7 @@ func (self *LoadbalancerListenerStartTask) OnInit(ctx context.Context, obj db.IS } self.SetStage("OnLoadbalancerListenerStartComplete", nil) if err := region.GetDriver().RequestStartLoadbalancerListener(ctx, self.GetUserCred(), lblis, self); err != nil { - self.taskFail(ctx, lblis, jsonutils.Marshal(err)) + self.taskFail(ctx, lblis, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/loadbalancer_listener_stop_task.go b/pkg/compute/tasks/loadbalancer_listener_stop_task.go index 5b7b1f85e7..20ddcfc85f 100644 --- a/pkg/compute/tasks/loadbalancer_listener_stop_task.go +++ b/pkg/compute/tasks/loadbalancer_listener_stop_task.go @@ -53,7 +53,7 @@ func (self *LoadbalancerListenerStopTask) OnInit(ctx context.Context, obj db.ISt } self.SetStage("OnLoadbalancerListenerStopComplete", nil) if err := region.GetDriver().RequestStopLoadbalancerListener(ctx, self.GetUserCred(), lblis, self); err != nil { - self.taskFail(ctx, lblis, jsonutils.Marshal(err)) + self.taskFail(ctx, lblis, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/loadbalancer_listener_sync_task.go b/pkg/compute/tasks/loadbalancer_listener_sync_task.go index 5cd994ed9e..c2f6e0c2c8 100644 --- a/pkg/compute/tasks/loadbalancer_listener_sync_task.go +++ b/pkg/compute/tasks/loadbalancer_listener_sync_task.go @@ -57,7 +57,7 @@ func (self *LoadbalancerListenerSyncTask) OnInit(ctx context.Context, obj db.ISt userCred := self.GetUserCred() err := driver.RequestSyncLoadbalancerBackendGroup(ctx, userCred, lblis, self) if err != nil { - self.taskFail(ctx, lblis, jsonutils.Marshal(err)) + self.taskFail(ctx, lblis, jsonutils.NewString(err.Error())) } } @@ -69,7 +69,7 @@ func (self *LoadbalancerListenerSyncTask) OnLoadbalancerBackendgroupSyncComplete } self.SetStage("OnLoadbalancerListenerSyncComplete", nil) if err := region.GetDriver().RequestSyncLoadbalancerListener(ctx, self.GetUserCred(), lblis, self); err != nil { - self.taskFail(ctx, lblis, jsonutils.Marshal(err)) + self.taskFail(ctx, lblis, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/loadbalancer_listener_syncstatus_task.go b/pkg/compute/tasks/loadbalancer_listener_syncstatus_task.go index 71884ba684..687c4e3883 100644 --- a/pkg/compute/tasks/loadbalancer_listener_syncstatus_task.go +++ b/pkg/compute/tasks/loadbalancer_listener_syncstatus_task.go @@ -53,7 +53,7 @@ func (self *LoadbalancerListenerSyncstatusTask) OnInit(ctx context.Context, obj } self.SetStage("OnLoadbalancerListenerSyncstatusComplete", nil) if err := region.GetDriver().RequestSyncstatusLoadbalancerListener(ctx, self.GetUserCred(), lblis, self); err != nil { - self.taskFail(ctx, lblis, jsonutils.Marshal(err)) + self.taskFail(ctx, lblis, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/loadbalancer_remote_update_task.go b/pkg/compute/tasks/loadbalancer_remote_update_task.go index bac29970d8..d2d518a90b 100644 --- a/pkg/compute/tasks/loadbalancer_remote_update_task.go +++ b/pkg/compute/tasks/loadbalancer_remote_update_task.go @@ -53,7 +53,7 @@ func (self *LoadbalancerRemoteUpdateTask) OnInit(ctx context.Context, obj db.ISt replaceTags := jsonutils.QueryBoolean(self.Params, "replace_tags", false) if err := region.GetDriver().RequestRemoteUpdateLoadbalancer(ctx, self.GetUserCred(), lb, replaceTags, self); err != nil { - self.taskFail(ctx, lb, jsonutils.Marshal(err)) + self.taskFail(ctx, lb, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/loadbalancer_start_task.go b/pkg/compute/tasks/loadbalancer_start_task.go index 290acf853d..93697d1f23 100644 --- a/pkg/compute/tasks/loadbalancer_start_task.go +++ b/pkg/compute/tasks/loadbalancer_start_task.go @@ -53,7 +53,7 @@ func (self *LoadbalancerStartTask) OnInit(ctx context.Context, obj db.IStandalon } self.SetStage("OnLoadbalancerStartComplete", nil) if err := region.GetDriver().RequestStartLoadbalancer(ctx, self.GetUserCred(), lb, self); err != nil { - self.taskFail(ctx, lb, jsonutils.Marshal(err)) + self.taskFail(ctx, lb, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/loadbalancer_stop_task.go b/pkg/compute/tasks/loadbalancer_stop_task.go index 51524cc358..30ee07599e 100644 --- a/pkg/compute/tasks/loadbalancer_stop_task.go +++ b/pkg/compute/tasks/loadbalancer_stop_task.go @@ -53,7 +53,7 @@ func (self *LoadbalancerStopTask) OnInit(ctx context.Context, obj db.IStandalone } self.SetStage("OnLoadbalancerStopComplete", nil) if err := region.GetDriver().RequestStopLoadbalancer(ctx, self.GetUserCred(), lb, self); err != nil { - self.taskFail(ctx, lb, jsonutils.Marshal(err)) + self.taskFail(ctx, lb, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/loadbalancer_syncstatus_task.go b/pkg/compute/tasks/loadbalancer_syncstatus_task.go index 10944a8d3c..0fbb34b3bb 100644 --- a/pkg/compute/tasks/loadbalancer_syncstatus_task.go +++ b/pkg/compute/tasks/loadbalancer_syncstatus_task.go @@ -53,7 +53,7 @@ func (self *LoadbalancerSyncstatusTask) OnInit(ctx context.Context, obj db.IStan } self.SetStage("OnLoadbalancerSyncstatusComplete", nil) if err := region.GetDriver().RequestSyncstatusLoadbalancer(ctx, self.GetUserCred(), lb, self); err != nil { - self.taskFail(ctx, lb, jsonutils.Marshal(err)) + self.taskFail(ctx, lb, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/nat_common.go b/pkg/compute/tasks/nat_common.go index adb37034ba..56b165242c 100644 --- a/pkg/compute/tasks/nat_common.go +++ b/pkg/compute/tasks/nat_common.go @@ -46,7 +46,7 @@ func NatToBindIPStage(ctx context.Context, task iTask, nat models.INatHelper) { eipId, _ := task.GetParams().GetString("eip_id") if err := natgateway.GetRegion().GetDriver().RequestBindIPToNatgateway(ctx, task, natgateway, eipId); err != nil { - task.TaskFailed(ctx, nat, jsonutils.Marshal(err)) + task.TaskFailed(ctx, nat, jsonutils.NewString(err.Error())) return } } diff --git a/pkg/compute/tasks/natgateway_syncstatus_task.go b/pkg/compute/tasks/natgateway_syncstatus_task.go index 33e69f26ad..cf7fd564ee 100644 --- a/pkg/compute/tasks/natgateway_syncstatus_task.go +++ b/pkg/compute/tasks/natgateway_syncstatus_task.go @@ -54,7 +54,7 @@ func (self *NatGatewaySyncstatusTask) OnInit(ctx context.Context, obj db.IStanda self.SetStage("OnNatGatewaySyncStatusComplete", nil) err := region.GetDriver().RequestSyncNatGatewayStatus(ctx, self.GetUserCred(), natgateway, self) if err != nil { - self.taskFailed(ctx, natgateway, jsonutils.Marshal(err)) + self.taskFailed(ctx, natgateway, jsonutils.NewString(err.Error())) return } } diff --git a/pkg/compute/tasks/schedule.go b/pkg/compute/tasks/schedule.go index 11b6511669..e49d6164ef 100644 --- a/pkg/compute/tasks/schedule.go +++ b/pkg/compute/tasks/schedule.go @@ -133,7 +133,7 @@ func doScheduleObjects( s := auth.GetSession(ctx, task.GetUserCred(), options.Options.Region, "") output, err := modules.SchedManager.DoSchedule(s, schedInput, len(objs)) if err != nil { - onSchedulerRequestFail(ctx, task, objs, jsonutils.Marshal(err)) + onSchedulerRequestFail(ctx, task, objs, jsonutils.NewString(err.Error())) return } onSchedulerResults(ctx, task, objs, output.Candidates) diff --git a/pkg/compute/tasks/secgroup_group_cache_task.go b/pkg/compute/tasks/secgroup_group_cache_task.go index 307c9a145f..68755e12eb 100644 --- a/pkg/compute/tasks/secgroup_group_cache_task.go +++ b/pkg/compute/tasks/secgroup_group_cache_task.go @@ -71,7 +71,7 @@ func (self *SecurityGroupCacheTask) OnInit(ctx context.Context, obj db.IStandalo err = region.GetDriver().RequestCacheSecurityGroup(ctx, self.UserCred, region, vpc, secgroup, classic, "", self) if err != nil { - self.taskFailed(ctx, secgroup, jsonutils.Marshal(err)) + self.taskFailed(ctx, secgroup, jsonutils.NewString(err.Error())) return } } diff --git a/pkg/compute/tasks/security_group_delete_task.go b/pkg/compute/tasks/security_group_delete_task.go index 781db17b95..2824f52d84 100644 --- a/pkg/compute/tasks/security_group_delete_task.go +++ b/pkg/compute/tasks/security_group_delete_task.go @@ -39,7 +39,7 @@ func init() { func (self *SecurityGroupDeleteTask) taskFailed(ctx context.Context, secgroup *models.SSecurityGroup, err error) { secgroup.SetStatus(self.UserCred, api.SECGROUP_STATUS_READY, "") logclient.AddActionLogWithContext(ctx, secgroup, logclient.ACT_DELOCATE, err, self.UserCred, false) - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) } func (self *SecurityGroupDeleteTask) OnInit(ctx context.Context, obj db.IStandaloneModel, data jsonutils.JSONObject) { diff --git a/pkg/compute/tasks/snapshot_create_task.go b/pkg/compute/tasks/snapshot_create_task.go index 7614bffa11..50eb70350e 100644 --- a/pkg/compute/tasks/snapshot_create_task.go +++ b/pkg/compute/tasks/snapshot_create_task.go @@ -56,7 +56,7 @@ func (self *SnapshotCreateTask) TaskComplete(ctx context.Context, snapshot *mode func (self *SnapshotCreateTask) DoDiskSnapshot(ctx context.Context, snapshot *models.SSnapshot) { self.SetStage("OnCreateSnapshot", nil) if err := snapshot.GetRegionDriver().RequestCreateSnapshot(ctx, snapshot, self); err != nil { - self.TaskFailed(ctx, snapshot, jsonutils.Marshal(err)) + self.TaskFailed(ctx, snapshot, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/snapshot_delete_task.go b/pkg/compute/tasks/snapshot_delete_task.go index 9799ba495f..efec3d7065 100644 --- a/pkg/compute/tasks/snapshot_delete_task.go +++ b/pkg/compute/tasks/snapshot_delete_task.go @@ -73,7 +73,7 @@ func (self *SnapshotDeleteTask) OnInit(ctx context.Context, obj db.IStandaloneMo self.SetStage("OnRequestSnapshot", nil) if err := regionDriver.RequestDeleteSnapshot(ctx, snapshot, self); err != nil { - self.TaskFailed(ctx, snapshot, jsonutils.Marshal(err)) + self.TaskFailed(ctx, snapshot, jsonutils.NewString(err.Error())) } } @@ -126,7 +126,7 @@ func (self *SnapshotDeleteTask) OnReloadDiskSnapshot(ctx context.Context, snapsh self.SetStage("OnDeleteSnapshot", nil) err = guest.GetDriver().RequestDeleteSnapshot(ctx, guest, self, params) if err != nil { - self.TaskFailed(ctx, snapshot, jsonutils.Marshal(err)) + self.TaskFailed(ctx, snapshot, jsonutils.NewString(err.Error())) } } else { self.TaskComplete(ctx, snapshot, nil) @@ -180,7 +180,7 @@ func (self *BatchSnapshotsDeleteTask) StartStorageDeleteSnapshot(ctx context.Con self.SetStage("OnStorageDeleteSnapshot", nil) err := host.GetHostDriver().RequestDeleteSnapshotsWithStorage(ctx, host, snapshot, self) if err != nil { - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/snapshot_syncstatus_task.go b/pkg/compute/tasks/snapshot_syncstatus_task.go index e9fd1062c2..3c54710272 100644 --- a/pkg/compute/tasks/snapshot_syncstatus_task.go +++ b/pkg/compute/tasks/snapshot_syncstatus_task.go @@ -54,7 +54,7 @@ func (self *SnapshotSyncstatusTask) OnInit(ctx context.Context, obj db.IStandalo self.SetStage("OnSnapshotSyncStatusComplete", nil) err := region.GetDriver().RequestSyncSnapshotStatus(ctx, self.GetUserCred(), snapshot, self) if err != nil { - self.taskFailed(ctx, snapshot, jsonutils.Marshal(err)) + self.taskFailed(ctx, snapshot, jsonutils.NewString(err.Error())) return } } diff --git a/pkg/compute/tasks/snapshotpolicy_disk_task.go b/pkg/compute/tasks/snapshotpolicy_disk_task.go index 603c965e94..7c88500b72 100644 --- a/pkg/compute/tasks/snapshotpolicy_disk_task.go +++ b/pkg/compute/tasks/snapshotpolicy_disk_task.go @@ -83,7 +83,7 @@ func (self *SnapshotPolicyApplyTask) OnInit(ctx context.Context, obj db.IStandal if err := disk.GetStorage().GetRegion().GetDriver().RequestPreSnapshotPolicyApply(ctx, self.UserCred, self, disk, snapshotPolicy, data); err != nil { - self.taskFail(ctx, disk, &spd, jsonutils.Marshal(err)) + self.taskFail(ctx, disk, &spd, jsonutils.NewString(err.Error())) return } } @@ -125,7 +125,7 @@ func (self *SnapshotPolicyApplyTask) OnPreSnapshotPolicyApplyComplete(ctx contex if err := disk.GetStorage().GetRegion().GetDriver(). RequestApplySnapshotPolicy(ctx, self.UserCred, self, disk, &snapshotPolicy, data); err != nil { - self.taskFail(ctx, disk, &spd, jsonutils.Marshal(err)) + self.taskFail(ctx, disk, &spd, jsonutils.NewString(err.Error())) } } @@ -197,7 +197,7 @@ func (self *SnapshotPolicyCancelTask) OnInit(ctx context.Context, obj db.IStanda self.SetStage("OnSnapshotPolicyCancel", nil) if err := disk.GetStorage().GetRegion().GetDriver().RequestCancelSnapshotPolicy(ctx, self.UserCred, self, disk, snapshotPolicy, data); err != nil { - self.taskFail(ctx, disk, &spd, jsonutils.Marshal(err)) + self.taskFail(ctx, disk, &spd, jsonutils.NewString(err.Error())) // fmt.Sprintf("faile to detach snapshot policy %s and disk %s: %s", snapshotPolicy.Id, disk.Id, err.Error())) } } diff --git a/pkg/compute/tasks/storage_uncache_image_task.go b/pkg/compute/tasks/storage_uncache_image_task.go index 13804fb5af..49b063e09b 100644 --- a/pkg/compute/tasks/storage_uncache_image_task.go +++ b/pkg/compute/tasks/storage_uncache_image_task.go @@ -72,7 +72,7 @@ func (self *StorageUncacheImageTask) OnInit(ctx context.Context, obj db.IStandal err = host.GetHostDriver().RequestUncacheImage(ctx, host, storageCache, self) if err != nil { - self.OnTaskFailed(ctx, storageCache, jsonutils.Marshal(err)) + self.OnTaskFailed(ctx, storageCache, jsonutils.NewString(err.Error())) } } diff --git a/pkg/compute/tasks/vpc_create_task.go b/pkg/compute/tasks/vpc_create_task.go index 8d6c87ed81..da4282c983 100644 --- a/pkg/compute/tasks/vpc_create_task.go +++ b/pkg/compute/tasks/vpc_create_task.go @@ -56,7 +56,7 @@ func (self *VpcCreateTask) OnInit(ctx context.Context, obj db.IStandaloneModel, self.SetStage("OnCreateVpcComplete", nil) err = region.GetDriver().RequestCreateVpc(ctx, self.UserCred, region, vpc, self) if err != nil { - self.TaskFailed(ctx, vpc, jsonutils.Marshal(err)) + self.TaskFailed(ctx, vpc, jsonutils.NewString(err.Error())) return } } diff --git a/pkg/compute/tasks/vpc_delete_task.go b/pkg/compute/tasks/vpc_delete_task.go index f2db20c473..6eeed07287 100644 --- a/pkg/compute/tasks/vpc_delete_task.go +++ b/pkg/compute/tasks/vpc_delete_task.go @@ -56,7 +56,7 @@ func (self *VpcDeleteTask) OnInit(ctx context.Context, obj db.IStandaloneModel, self.SetStage("OnDeleteVpcComplete", nil) err = region.GetDriver().RequestDeleteVpc(ctx, self.UserCred, region, vpc, self) if err != nil { - self.taskFailed(ctx, vpc, jsonutils.Marshal(err)) + self.taskFailed(ctx, vpc, jsonutils.NewString(err.Error())) return } } diff --git a/pkg/devtool/tasks/template_binding_servers.go b/pkg/devtool/tasks/template_binding_servers.go index 52415824bf..8e2a8d6177 100644 --- a/pkg/devtool/tasks/template_binding_servers.go +++ b/pkg/devtool/tasks/template_binding_servers.go @@ -51,7 +51,7 @@ func (self *TemplateBindingServers) OnInit(ctx context.Context, obj db.IStandalo template := obj.(*models.SDevtoolTemplate) _, err := template.Binding(ctx, self.UserCred, nil, self.Params) if err != nil { - self.SetStageFailed(ctx, jsonutils.Marshal(err)) + self.SetStageFailed(ctx, jsonutils.NewString(err.Error())) } else { self.SetStageComplete(ctx, nil) }