opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-29 17:58:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge from release/2.6.0 -> release/2.7.0

Browse Source 
* commit '8be49a8d69072e8afe18fd5cb8d8536345257e10':
  guest do not sync status on guest delete
This commit is contained in:
邱剑
2019-03-15 20:21:05 +08:00
parent fb73a69036 8be49a8d69
commit b48dc22b3d
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/guest_actions.go
+11
View File
@@ -453,6 +453,17 @@ func (self *SGuest) StartSyncTask(ctx context.Context, userCred mcclient.TokenCr
log.Errorf(err.Error())
return err
}
return self.doSyncTask(ctx, data, userCred, parentTaskId)
}
func (self *SGuest) StartSyncTaskWithoutSyncstatus(ctx context.Context, userCred mcclient.TokenCredential, fwOnly bool, parentTaskId string) error {
data := jsonutils.NewDict()
data.Set("without_sync_status", jsonutils.JSONTrue)
data.Set("fw_only", jsonutils.NewBool(fwOnly))
return self.doSyncTask(ctx, data, userCred, parentTaskId)
}
func (self *SGuest) doSyncTask(ctx context.Context, data *jsonutils.JSONDict, userCred mcclient.TokenCredential, parentTaskId string) error {
if task, err := taskman.TaskManager.NewTask(ctx, "GuestSyncConfTask", self, userCred, data, parentTaskId, "", nil); err != nil {
log.Errorf(err.Error())
return err
pkg/compute/tasks/guest_delete_task.go
+1 -1
View File
@@ -126,7 +126,7 @@ func (self *GuestDeleteTask) doClearSecurityGroupComplete(ctx context.Context, g
guest.RevokeAllSecgroups(ctx, self.UserCred)
// sync revoked secgroups to remote cloud
self.SetStage("OnSyncConfigComplete", nil)
guest.StartSyncTask(ctx, self.UserCred, false, self.GetTaskId())
guest.StartSyncTaskWithoutSyncstatus(ctx, self.UserCred, false, self.GetTaskId())
}
func (self *GuestDeleteTask) OnSyncConfigComplete(ctx context.Context, obj db.IStandaloneModel, data jsonutils.JSONObject) {
pkg/compute/tasks/guest_sync_task.go
+1 -1
View File
@@ -47,7 +47,7 @@ func (self *GuestSyncConfTask) OnSyncComplete(ctx context.Context, obj db.IStand
}
func (self *GuestSyncConfTask) OnDiskSyncComplete(ctx context.Context, guest *models.SGuest, data jsonutils.JSONObject) {
if self.HasParentTask() {
if jsonutils.QueryBoolean(self.Params, "without_sync_status", false) {
self.OnSyncStatusComplete(ctx, guest, nil)
} else {
self.SetStage("on_sync_status_complete", nil)