Skip to content

Commit

Permalink
fix: 避免卸载完已删除的磁盘后,磁盘状态为ready
Browse files Browse the repository at this point in the history
  • Loading branch information
Qu Xuan committed May 11, 2020
1 parent 1403fae commit 8a8d0f9
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pkg/compute/tasks/guest_detach_disk_task.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ func (self *GuestDetachDiskTask) OnDetachDiskComplete(ctx context.Context, guest
return
}
}
disk.SetStatus(self.UserCred, api.DISK_READY, "")
models.StartResourceSyncStatusTask(ctx, self.GetUserCred(), disk, "DiskSyncstatusTask", "")
keepDisk := jsonutils.QueryBoolean(self.Params, "keep_disk", true)
host := guest.GetHost()
purge := false
Expand Down Expand Up @@ -135,7 +135,7 @@ func (self *GuestDetachDiskTask) OnDetachDiskCompleteFailed(ctx context.Context,
}
disk := objDisk.(*models.SDisk)
db.OpsLog.LogEvent(disk, db.ACT_DETACH, reason.String(), self.UserCred)
disk.SetStatus(self.UserCred, api.DISK_READY, "")
models.StartResourceSyncStatusTask(ctx, self.GetUserCred(), disk, "DiskSyncstatusTask", "")
err = guest.AttachDisk(ctx, disk, self.UserCred, driver, cache, mountpoint)
if err != nil {
log.Warningf("recover attach disk %s(%s) for guest %s(%s) error: %v", disk.Name, disk.Id, guest.Name, guest.Id, err)
Expand Down

0 comments on commit 8a8d0f9

Please sign in to comment.