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

Automatic merge from release/2.2.0 -> release/2.3.0

Browse Source 
* commit 'd08b1721617b2be3be7f136c675e98fcc5aad73b':
  Remove local terraform code
  卸载磁盘时，磁盘状态跟随变化
  guests: allow change nic bandwidth to 0
  处理卸载磁盘失败后情况: 重新挂载原有磁盘到虚拟机上
This commit is contained in:
邱剑
2018-10-18 18:37:04 +08:00
parent eeb1969349 d08b172161
commit 2fd597681c
3 changed files with 53 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/guestnetworks.go
+1 -1
View File
@@ -122,7 +122,7 @@ func (manager *SGuestnetworkManager) newGuestNetwork(ctx context.Context, userCr
driver = "virtio"
}
gn.Driver = driver
if bwLimit > 0 {
if bwLimit >= 0 {
gn.BwLimit = bwLimit
}
pkg/compute/models/guests.go
+7 -3
View File
@@ -1695,6 +1695,10 @@ func (self *SGuest) getMaxDiskIndex() int8 {
return int8(len(guestdisks))
}
func (self *SGuest) AttachDisk(disk *SDisk, userCred mcclient.TokenCredential, driver string, cache string, mountpoint string) error {
return self.attach2Disk(disk, userCred, driver, cache, mountpoint)
}
func (self *SGuest) attach2Disk(disk *SDisk, userCred mcclient.TokenCredential, driver string, cache string, mountpoint string) error {
if self.isAttach2Disk(disk) {
return fmt.Errorf("Guest has been attached to disk")
@@ -2917,9 +2921,9 @@ func (self *SGuest) PerformChangeBandwidth(ctx context.Context, userCred mcclien
return nil, httperrors.NewBadRequestError("Index Not fount or out of NIC index")
}
bandwidth, err := data.Int("bandwidth")
if err != nil || bandwidth <= 0 {
logclient.AddActionLog(self, logclient.ACT_VM_CHANGE_BANDWIDTH, "Bandwidth must be larger than 0", userCred, false)
return nil, httperrors.NewBadRequestError("Bandwidth must be larger than 0")
if err != nil || bandwidth < 0 {
logclient.AddActionLog(self, logclient.ACT_VM_CHANGE_BANDWIDTH, "Bandwidth must non-negative", userCred, false)
return nil, httperrors.NewBadRequestError("Bandwidth must be non-negative")
}
guestnic := &guestnics[index]
if guestnic.BwLimit != int(bandwidth) {
pkg/compute/tasks/guest_detach_disk_task.go
+45 -9
View File
@@ -26,20 +26,30 @@ func (self *GuestDetachDiskTask) OnInit(ctx context.Context, obj db.IStandaloneM
diskId, _ := self.Params.GetString("disk_id")
objDisk, err := models.DiskManager.FetchById(diskId)
if err != nil {
self.OnTaskFail(ctx, guest, err)
self.OnTaskFail(ctx, guest, nil, err)
return
}
disk := objDisk.(*models.SDisk)
if disk == nil {
self.OnTaskFail(ctx, guest, fmt.Errorf("Connot find disk %s", diskId))
self.OnTaskFail(ctx, guest, nil, fmt.Errorf("Connot find disk %s", diskId))
return
}
guestdisks := disk.GetGuestdisks()
if len(guestdisks) > 0 {
guestdisk := guestdisks[0]
self.Params.Add(jsonutils.NewString(guestdisk.Driver), "driver")
self.Params.Add(jsonutils.NewString(guestdisk.CacheMode), "cache")
self.Params.Add(jsonutils.NewString(guestdisk.Mountpoint), "mountpoint")
}
guest.DetachDisk(ctx, disk, self.UserCred)
if disk.Status == models.DISK_INIT {
self.OnSyncConfigComplete(ctx, guest, nil)
return
}
disk.SetStatus(self.UserCred, models.DISK_DETACHING, "Disk detach")
host := guest.GetHost()
purge := false
if host != nil && host.Status == models.HOST_DISABLED && jsonutils.QueryBoolean(self.Params, "purge", false) {
@@ -47,13 +57,12 @@ func (self *GuestDetachDiskTask) OnInit(ctx context.Context, obj db.IStandaloneM
}
detachStatus, err := guest.GetDriver().GetDetachDiskStatus()
if err != nil {
self.OnTaskFail(ctx, guest, err)
self.OnTaskFail(ctx, guest, disk, err)
return
}
if utils.IsInStringArray(guest.Status, detachStatus) && !purge {
self.SetStage("on_sync_config_complete", nil)
guest.GetDriver().RequestDetachDisk(ctx, guest, self)
disk.SetStatus(self.UserCred, models.DISK_READY, "Disk detach")
} else {
self.OnSyncConfigComplete(ctx, guest, nil)
}
@@ -63,14 +72,15 @@ func (self *GuestDetachDiskTask) OnSyncConfigComplete(ctx context.Context, guest
diskId, _ := self.Params.GetString("disk_id")
objDisk, err := models.DiskManager.FetchById(diskId)
if err != nil {
self.OnTaskFail(ctx, guest, err)
self.OnTaskFail(ctx, guest, nil, err)
return
}
disk := objDisk.(*models.SDisk)
if disk == nil {
self.OnTaskFail(ctx, guest, fmt.Errorf("Connot find disk %s", diskId))
self.OnTaskFail(ctx, guest, nil, fmt.Errorf("Connot find disk %s", diskId))
return
}
disk.SetDiskReady(ctx, self.UserCred, "")
keepDisk := jsonutils.QueryBoolean(self.Params, "keep_disk", true)
host := guest.GetHost()
purge := false
@@ -81,12 +91,14 @@ func (self *GuestDetachDiskTask) OnSyncConfigComplete(ctx context.Context, guest
db.OpsLog.LogEvent(disk, db.ACT_DELETE, "", self.UserCred)
disk.RealDelete(ctx, self.UserCred)
self.SetStageComplete(ctx, nil)
} else if (disk.Status == models.DISK_READY || !keepDisk) && disk.GetGuestDiskCount() == 0 && disk.AutoDelete {
return
}
if !keepDisk && disk.GetGuestDiskCount() == 0 && disk.AutoDelete {
self.SetStage("on_disk_delete_complete", nil)
db.OpsLog.LogEvent(disk, db.ACT_DELETE, "", self.UserCred)
err := guest.GetDriver().RequestDeleteDetachedDisk(ctx, disk, self, purge)
if err != nil {
self.OnTaskFail(ctx, guest, err)
self.OnTaskFail(ctx, guest, disk, err)
return
}
} else {
@@ -94,7 +106,31 @@ func (self *GuestDetachDiskTask) OnSyncConfigComplete(ctx context.Context, guest
}
}
func (self *GuestDetachDiskTask) OnTaskFail(ctx context.Context, guest *models.SGuest, err error) {
func (self *GuestDetachDiskTask) OnSyncConfigCompleteFailed(ctx context.Context, obj db.IStandaloneModel, resion jsonutils.JSONObject) {
guest := obj.(*models.SGuest)
driver, _ := self.Params.GetString("driver")
cache, _ := self.Params.GetString("cache")
mountpoint, _ := self.Params.GetString("mountpoint")
diskId, _ := self.Params.GetString("disk_id")
objDisk, err := models.DiskManager.FetchById(diskId)
if err != nil {
self.OnTaskFail(ctx, guest, nil, err)
return
}
disk := objDisk.(*models.SDisk)
db.OpsLog.LogEvent(disk, db.ACT_DETACH, resion.String(), self.UserCred)
disk.SetDiskReady(ctx, self.UserCred, "")
err = guest.AttachDisk(disk, self.UserCred, driver, cache, mountpoint)
if err != nil {
self.OnTaskFail(ctx, guest, disk, err)
return
}
}
func (self *GuestDetachDiskTask) OnTaskFail(ctx context.Context, guest *models.SGuest, disk *models.SDisk, err error) {
if disk != nil {
disk.SetDiskReady(ctx, self.UserCred, "")
}
self.SetStageFailed(ctx, err.Error())
log.Errorf("Guest %s GuestDetachDiskTask failed %s", guest.Id, err.Error())
}