opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-29 17:58:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

scheduler: fix backup master host schedule failed

Browse Source
This commit is contained in:
Zexi Li
2019-02-22 12:28:54 +08:00
parent cc09b6e31f
commit ffd498566f
3 changed files with 52 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/scheduler/handler/backup_helper.go
+16 -9
View File
@@ -11,21 +11,21 @@ import (
schedman "yunion.io/x/onecloud/pkg/scheduler/manager"
)
func transToBackupSchedResult(result *core.SchedResultItemList, preferBackupHost string, count int64) interface{} {
func transToBackupSchedResult(result *core.SchedResultItemList, preferMasterHost, preferBackupHost string, count int64) interface{} {
// clean each result sched result item's count
for _, item := range result.Data {
item.Count = 0
}
apiResults := newBackupSchedResult(result, preferBackupHost, count)
apiResults := newBackupSchedResult(result, preferMasterHost, preferBackupHost, count)
return regionResponse(apiResults)
}
func newBackupSchedResult(result *core.SchedResultItemList, preferBackupHost string, count int64) []api.SchedResultItem {
func newBackupSchedResult(result *core.SchedResultItemList, preferMasterHost, preferBackupHost string, count int64) []api.SchedResultItem {
apiResults := make([]api.SchedResultItem, 0)
for i := 0; i < int(count); i++ {
log.V(10).Debugf("Select backup host from result: %s", result)
target, err := getSchedBackupResult(result, preferBackupHost)
target, err := getSchedBackupResult(result, preferMasterHost, preferBackupHost)
if err != nil {
apiResults = append(apiResults, api.SchedErrItem{Error: err.Error()})
continue
@@ -35,8 +35,8 @@ func newBackupSchedResult(result *core.SchedResultItemList, preferBackupHost str
return apiResults
}
func getSchedBackupResult(result *core.SchedResultItemList, preferBackupHost string) (*api.SchedBackupResultItem, error) {
masterHost := selectMasterHost(result.Data, preferBackupHost)
func getSchedBackupResult(result *core.SchedResultItemList, preferMasterHost, preferBackupHost string) (*api.SchedBackupResultItem, error) {
masterHost := selectMasterHost(result.Data, preferMasterHost, preferBackupHost)
if masterHost == nil {
return nil, fmt.Errorf("Can't find master host")
}
@@ -64,19 +64,26 @@ func markHostUsed(host *core.SchedResultItem) {
// selectMasterID find master host id run VM
// return nil if not found
func selectMasterHost(result []*core.SchedResultItem, preferBackupHost string) *core.SchedResultItem {
func selectMasterHost(result []*core.SchedResultItem, preferMasterHost, preferBackupHost string) *core.SchedResultItem {
if len(result) == 0 {
return nil
}
host := result[0]
if host.Capacity >= 1 && host.ID != preferBackupHost {
return host
if len(preferMasterHost) == 0 {
return host
}
if len(result) == 1 {
return nil
}
restHosts := result[1:]
return selectMasterHost(restHosts, preferMasterHost, preferBackupHost)
}
if len(result) == 1 {
return nil
}
restHosts := result[1:]
return selectMasterHost(restHosts, preferBackupHost)
return selectMasterHost(restHosts, preferMasterHost, preferBackupHost)
}
func selectBackupHost(masterID, preferBackupHost string, result []*core.SchedResultItem) *core.SchedResultItem {
pkg/scheduler/handler/handler.go
+1 -1
View File
@@ -261,7 +261,7 @@ func doSyncSchedule(c *gin.Context) {
count := schedInfo.Data.Count
var resp interface{}
if schedInfo.Data.Backup {
resp = transToBackupSchedResult(result, schedInfo.Data.BackupHostID, count)
resp = transToBackupSchedResult(result, schedInfo.Data.HostID, schedInfo.Data.BackupHostID, count)
} else {
resp = transToRegionSchedResult(result.Data, count)
}