UniqueSoft/swirl
2
0
Fork 0
mirror of https://github.com/cuigh/swirl synced 2025-02-07 05:17:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add step/window options to scaler

Browse Source
This commit is contained in:
cuigh 2018-04-12 10:57:48 +08:00
parent 02ffa6c0f1
commit 4e698446e8
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
scaler/scaler.go
View File

@ -66,23 +66,24 @@ func tryScale(service *swarm.Service, opts data.Options) {
return return
} }
// ignore services that have been updated in 3 minutes
if service.UpdatedAt.Add(3 * time.Minute).After(time.Now()) {
return
}
var ( var (
min = uint64(2) min uint64 = 2
max = uint64(5) max uint64 = 8
step uint64 = 2
window = 3 * time.Minute
policy = policyAny policy = policyAny
args data.Options args data.Options
) )
for _, opt := range opts { for _, opt := range opts {
switch opt.Name { switch opt.Name {
case "min": case "min":
min = cast.ToUint64(opt.Value, 1) min = cast.ToUint64(opt.Value, min)
case "max": case "max":
max = cast.ToUint64(opt.Value, 2) max = cast.ToUint64(opt.Value, max)
case "step":
step = cast.ToUint64(opt.Value, step)
case "window":
window = cast.ToDuration(opt.Value, window)
case "policy": case "policy":
policy = policyType(opt.Value) policy = policyType(opt.Value)
default: default:
@ -90,6 +91,11 @@ func tryScale(service *swarm.Service, opts data.Options) {
} }
} }
// ignore services that have been updated in window period.
if service.UpdatedAt.Add(window).After(time.Now()) {
return
}
result := check(service, policy, args) result := check(service, policy, args)
if result.Type == scaleNone { if result.Type == scaleNone {
return return
@ -98,12 +104,12 @@ func tryScale(service *swarm.Service, opts data.Options) {
replicas := *service.Spec.Mode.Replicated.Replicas replicas := *service.Spec.Mode.Replicated.Replicas
if result.Type == scaleUp { if result.Type == scaleUp {
if replicas < max { if replicas < max {
docker.ServiceScale(service.Spec.Name, service.Version.Index, replicas+1) docker.ServiceScale(service.Spec.Name, service.Version.Index, replicas+step)
log.Get("scaler").Infof("scaler > Service '%s' scaled up for: %v", service.Spec.Name, result.Reasons) log.Get("scaler").Infof("scaler > Service '%s' scaled up for: %v", service.Spec.Name, result.Reasons)
} }
} else if result.Type == scaleDown { } else if result.Type == scaleDown {
if replicas > min { if replicas > min {
docker.ServiceScale(service.Spec.Name, service.Version.Index, replicas-1) docker.ServiceScale(service.Spec.Name, service.Version.Index, replicas-step)
log.Get("scaler").Infof("scaler > Service '%s' scaled down for: %v", service.Spec.Name, result.Reasons) log.Get("scaler").Infof("scaler > Service '%s' scaled down for: %v", service.Spec.Name, result.Reasons)
} }
} }
@ -158,7 +164,7 @@ func checkArg(service string, arg data.Option) (scaleType, float64) {
} }
func cpuChecker(service string, low, high float64) (scaleType, float64) { func cpuChecker(service string, low, high float64) (scaleType, float64) {
query := fmt.Sprintf(`avg(rate(container_cpu_user_seconds_total{container_label_com_docker_swarm_service_name="%s"}[5m]) * 100)`, service) query := fmt.Sprintf(`avg(rate(container_cpu_user_seconds_total{container_label_com_docker_swarm_service_name="%s"}[1m]) * 100)`, service)
vector, err := biz.Metric.GetVector(query, "", time.Now()) vector, err := biz.Metric.GetVector(query, "", time.Now())
if err != nil { if err != nil {
log.Get("scaler").Error("scaler > Failed to query metrics: ", err) log.Get("scaler").Error("scaler > Failed to query metrics: ", err)