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

Merge pull request #125 in YUNIONIO/onecloud from ~QUXUAN/onecloud:bufix/qx-disk-delete to release/2.1.0

Browse Source 
* commit 'e6b77164c4e830737b266ded205cdefedc981105':
  修复删除回收站时未删除数据库记录bug
This commit is contained in:
李泽玺
2018-08-28 10:12:03 +08:00
parent b37b2742e6 e6b77164c4
commit 51dffdadb1
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/hostdrivers/aliyun.go
+5 -1
View File
@@ -95,9 +95,13 @@ func (self *SAliyunHostDriver) RequestDeallocateDiskOnHost(host *models.SHost, s
return err
} else if iDisk, err := iCloudStorage.GetIDisk(disk.GetExternalId()); err != nil {
return err
} else if err := iDisk.Delete(); err != nil {
return err
} else {
return iDisk.Delete()
data := jsonutils.NewDict()
task.ScheduleRun(data)
}
return nil
}
func (self *SAliyunHostDriver) RequestResizeDiskOnHostOnline(host *models.SHost, storage *models.SStorage, disk *models.SDisk, size int64, task taskman.ITask) error {