mirror of
https://github.com/yunionio/cloudpods.git
synced 2026-08-31 01:35:56 +08:00
bugfix: 1. fix sched fill disk desc (#13)
2. fix image server not handle error
This commit is contained in:
@@ -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)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -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 := ""
|
||||
|
||||
Reference in New Issue
Block a user