opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6102 from rainzm/automated-cherry-pick-of-#6101-upstream-release-3.2

Browse Source 
Automated cherry pick of #6101: fix/autoscaling: Chang the format of CoolingTime
This commit is contained in:
Zexi Li
2020-04-29 13:09:35 +08:00
committed by GitHub
parent 1fc3614d7c 76788bfa9d
commit 8767b92bc2
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/scaling_group.go
+4 -1
View File
@@ -493,6 +493,8 @@ func (sg *SScalingGroup) exec(ctx context.Context, action IScalingAction) (ret s
return
}
var CoolingTimeLocation, _ = time.LoadLocation("Asia/Shanghai")
// Scale will modify SScalingGroup.DesireInstanceNumber and generate SScalingActivity based on the trigger and its
// corresponding SScalingPolicy.
func (sg *SScalingGroup) Scale(ctx context.Context, triggerDesc IScalingTriggerDesc, action IScalingAction,
@@ -514,7 +516,8 @@ func (sg *SScalingGroup) Scale(ctx context.Context, triggerDesc IScalingTriggerD
}
if action.CheckCoolTime() && !sg.AllowScale() {
err = scalingActivity.SetReject("",
fmt.Sprintf("The Cooling Time limit the execution time of the policy to at least: %s", sg.AllowScaleTime.Format("2006-01-02 15:04:05")))
fmt.Sprintf("The Cooling Time limit the execution time of the policy to at least: %s",
sg.AllowScaleTime.In(CoolingTimeLocation).Format("2006-01-02 15:04:05 -0700")))
return nil
}
pkg/compute/models/scaling_policy.go
+11
View File
@@ -239,6 +239,17 @@ func (spm *SScalingPolicyManager) ValidateCreateData(ctx context.Context, userCr
return input, err
}
func (sp *SScalingPolicy) CustomizeCreate(ctx context.Context, userCred mcclient.TokenCredential,
ownerId mcclient.IIdentityProvider, query jsonutils.JSONObject, data jsonutils.JSONObject) error {
// sp.Project must be same with sp.ScalingGroup
sg, err := sp.ScalingGroup()
if err != nil {
return err
}
ownerId = sg.GetOwnerId()
return sp.SVirtualResourceBase.CustomizeCreate(ctx, userCred, ownerId, query, data)
}
func (sp *SScalingPolicy) Delete(ctx context.Context, userCred mcclient.TokenCredential) error {
// do nothing
sp.SetStatus(userCred, api.SP_STATUS_DELETING, "")