From 532f5ae1affe7283b2ba8e1b59e22f0ee387831c Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Sat, 17 Nov 2018 17:27:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=9C=BA=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E6=97=B6=E5=A6=82=E6=9E=9C=E5=B7=B2=E7=BB=8F=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=EF=BC=8C=E4=BC=9A=E4=B8=A2=E5=A4=B1start=E7=9A=84osplog?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/compute/models/disks.go | 2 ++ pkg/compute/models/guests.go | 1 + pkg/compute/tasks/guest_start_task.go | 5 +++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/compute/models/disks.go b/pkg/compute/models/disks.go index 13fad325ae..c0a992900b 100644 --- a/pkg/compute/models/disks.go +++ b/pkg/compute/models/disks.go @@ -1101,6 +1101,7 @@ type DiskInfo struct { MediumType string Driver string Cache string + DiskType string } func (self *SDisk) ToDiskInfo() DiskInfo { @@ -1110,6 +1111,7 @@ func (self *SDisk) ToDiskInfo() DiskInfo { MountPoint: self.GetMountPoint(), Format: self.DiskFormat, Size: int64(self.DiskSize), + DiskType: self.DiskType, } storage := self.GetStorage() if storage == nil { diff --git a/pkg/compute/models/guests.go b/pkg/compute/models/guests.go index a8911ac012..0212771866 100644 --- a/pkg/compute/models/guests.go +++ b/pkg/compute/models/guests.go @@ -3913,6 +3913,7 @@ func (self *SGuest) GetSpec(checkStatus bool) *jsonutils.JSONDict { diskSpec.Set("size", jsonutils.NewInt(info.Size)) diskSpec.Set("backend", jsonutils.NewString(info.Backend)) diskSpec.Set("medium_type", jsonutils.NewString(info.MediumType)) + diskSpec.Set("disk_type", jsonutils.NewString(info.DiskType)) diskSpecs.Add(diskSpec) } spec.Set("disk", diskSpecs) diff --git a/pkg/compute/tasks/guest_start_task.go b/pkg/compute/tasks/guest_start_task.go index 99dae67cf3..2eb1ca3db7 100644 --- a/pkg/compute/tasks/guest_start_task.go +++ b/pkg/compute/tasks/guest_start_task.go @@ -48,8 +48,9 @@ func (self *GuestStartTask) startStart(ctx context.Context, guest *models.SGuest self.onStartGuestFailed(ctx, guest, err) } else { if result != nil && jsonutils.QueryBoolean(result, "is_running", false) { - guest.SetStatus(self.UserCred, models.VM_RUNNING, "start") - self.taskComplete(ctx, guest) + self.OnStartComplete(ctx, guest, nil) + // guest.SetStatus(self.UserCred, models.VM_RUNNING, "start") + // self.taskComplete(ctx, guest) } } }