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

Merge pull request #18977 from zexi/automated-cherry-pick-of-#18975-upstream-release-3.11

Browse Source 
Automated cherry pick of #18975: fix(monitor): consider whether the target host is in source host of mem balancer
This commit is contained in:
Zexi Li
2023-12-13 13:38:28 +08:00
committed by GitHub
parent d2bf8c44ad 796bea5d7c
commit a5f2194afc
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/monitor/controller/balancer/cpu.go
+1 -1
View File
@@ -108,7 +108,7 @@ func (m *cpuCondition) IsFitTarget(settings *monitor.MigrationAlertSettings, t I
// only when srcHostIds isn't empty
if len(srcHostIds) != 0 {
if !ltThreshold && !sets.NewString(srcHostIds...).Has(t.GetId()) && tScore < MAX_THRESHOLD {
// if target host is not in source specified hosts and calculate score less than MAX_THRESHOLD
// if target host is not in source specified hosts and calculated score is less than MAX_THRESHOLD
log.Infof("let host:%s:current(%f) + guest:%s:score(%f) < MAX_THRESHOLD(%f) to fit target, because it's not in source specified hosts", t.GetName(), t.GetCurrent(), c.GetName(), c.GetScore(), MAX_THRESHOLD)
return nil
}
pkg/monitor/controller/balancer/mem.go
+22 -1
View File
@@ -16,7 +16,9 @@ package balancer
import (
"yunion.io/x/jsonutils"
"yunion.io/x/log"
"yunion.io/x/pkg/errors"
"yunion.io/x/pkg/util/sets"
"yunion.io/x/onecloud/pkg/apis/monitor"
"yunion.io/x/onecloud/pkg/monitor/tsdb"
@@ -81,9 +83,28 @@ func (m *memCondition) GetSourceThresholdDelta(threshold float64, host IHost) fl
}
func (m *memCondition) IsFitTarget(settings *monitor.MigrationAlertSettings, t ITarget, c ICandidate) error {
if t.GetCurrent()-c.GetScore() > m.GetThreshold() {
tScore := t.GetCurrent() - c.GetScore()
gtThreshold := tScore > m.GetThreshold()
if gtThreshold {
return nil
}
// 1G = 1 * 1024 * 1024 * 1024 (bytes)
MAX_THRESHOLD := float64(1 * 1024 * 1024 * 1024)
src := settings.Source
srcHostIds := []string{}
if src != nil {
srcHostIds = src.HostIds
}
// only when srcHostIds isn't empty
if len(srcHostIds) != 0 {
if !gtThreshold && !sets.NewString(srcHostIds...).Has(t.GetId()) && tScore > MAX_THRESHOLD {
// if target host is not in source specified hosts and calculated score is greater than MAX_THRESHOLD
log.Infof("let host:%s:current(%f) + guest:%s:score(%f) > MAX_THRESHOLD(%f) to fit target, because it's not in source specified hosts", t.GetName(), t.GetCurrent(), c.GetName(), c.GetScore(), MAX_THRESHOLD)
return nil
}
}
return errors.Errorf("host:%s:current(%f) - guest:%s:score(%f) <= threshold(%f)", t.GetName(), t.GetCurrent(), c.GetName(), c.GetScore(), m.GetThreshold())
}