bugfix: 1. fix sched fill disk desc (#13)

2. fix image server not handle error
This commit is contained in:
wanyaoqi
2019-03-27 11:58:13 +08:00
committed by Zexi Li
parent d8e7e2fc74
commit ff9f64279d
3 changed files with 8 additions and 1 deletions
+4 -1
View File
@@ -3924,7 +3924,10 @@ func (self *SGuest) FillDiskSchedDesc(desc *api.ServerConfigs) {
return
}
for i := 0; i < len(guestDisks); i++ {
desc.Disks = append(desc.Disks, guestDisks[i].ToDiskConfig())
diskConf := guestDisks[i].ToDiskConfig()
// HACK: storage used by self, so earse it
diskConf.Storage = ""
desc.Disks = append(desc.Disks, diskConf)
}
}
+1
View File
@@ -219,6 +219,7 @@ func onSchedulerResults(
// backup schedule
onMasterSlaveScheduleSucc(ctx, task, obj, result, result.BackupCandidate)
}
succCount += 1
}
if succCount == 0 {
task.OnScheduleFailed(ctx, "Schedule failed")
+3
View File
@@ -391,6 +391,9 @@ func (self *SImage) SaveImageFromStream(reader io.Reader) error {
localPath := self.GetPath("")
sp, err := self.saveImageFromStream(localPath, reader)
if err != nil {
return err
}
virtualSizeBytes := int64(0)
format := ""