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.6.0 -> release/2.7.0

Browse Source 
* commit '7aab8b7b69248eeadcd0e18fc7819cbcef740fb7':
  scheduler: fix prefer backup host schedule fail
This commit is contained in:
万垚奇
2019-02-22 11:20:28 +08:00
parent 6a0444335c 7aab8b7b69
commit 65f7f660ad
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/scheduler/api/sched.go
+6
View File
@@ -167,6 +167,12 @@ func NewSchedData(sjson *simplejson.Json, count int64, byTest bool) (*SchedData,
if backupHostID, ok := sjson.CheckGet("prefer_backup_host_id"); ok {
if backHost, err := backupHostID.String(); err == nil {
data.BackupHostID = backHost
candidates = append(candidates, backHost)
}
} else if backupHostID, ok := sjson.CheckGet("prefer_backup_host"); ok {
if backHost, err := backupHostID.String(); err == nil {
data.BackupHostID = backHost
candidates = append(candidates, backHost)
}
}