fix disk create from snapshot

This commit is contained in:
wanyaoqi
2019-07-13 19:12:53 +08:00
parent 633a949002
commit 7d3577c2f0
2 changed files with 11 additions and 5 deletions
+2
View File
@@ -1431,6 +1431,8 @@ func fillDiskConfigBySnapshot(userCred mcclient.TokenCredential, diskConfig *api
diskConfig.DiskType = snapshot.DiskType
diskConfig.SizeMb = snapshot.Size
diskConfig.Backend = storage.StorageType
diskConfig.Fs = ""
diskConfig.Mountpoint = ""
}
return nil
}
+9 -5
View File
@@ -730,12 +730,16 @@ func (s *SKVMGuestInstance) SyncStatus() {
func (s *SKVMGuestInstance) CheckBlockOrRunning(jobs int) {
var status = compute.VM_RUNNING
if jobs > 0 {
mirrorStatus := s.MirrorJobStatus()
if mirrorStatus.InProcess() {
if s.IsMaster() {
mirrorStatus := s.MirrorJobStatus()
if mirrorStatus.InProcess() {
status = compute.VM_BLOCK_STREAM
} else if mirrorStatus.IsFailed() {
status = compute.VM_BLOCK_STREAM_FAIL
s.SyncMirrorJobFailed("Block job missing")
}
} else {
status = compute.VM_BLOCK_STREAM
} else if mirrorStatus.IsFailed() {
status = compute.VM_BLOCK_STREAM_FAIL
s.SyncMirrorJobFailed("Block job missing")
}
}
_, err := hostutils.UpdateServerStatus(context.Background(), s.Id, status)