Minimum validation for multitenant formations #5199
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -596,6 +596,16 @@ | |
| Computed: true, | ||
| Description: "Can memory scale down as well as up.", | ||
| }, | ||
| "cpu_enforcement_ratio_ceiling_mb": { | ||
| Type: schema.TypeInt, | ||
| Optional: true, | ||
| Description: "The amount of memory required before the cpu/memory ratio is no longer enforced. (multitenant only).", | ||
| }, | ||
| "cpu_enforcement_ratio_mb": { | ||
| Type: schema.TypeInt, | ||
| Optional: true, | ||
| Description: "The maximum memory allowed per CPU until the ratio ceiling is reached. (multitenant only).", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
|
|
@@ -987,21 +997,23 @@ | |
| } | ||
|
|
||
| type GroupResource struct { | ||
| Units string | ||
| Allocation int | ||
| Minimum int | ||
| Maximum int | ||
| StepSize int | ||
| IsAdjustable bool | ||
| IsOptional bool | ||
| CanScaleDown bool | ||
| CPUEnforcementRatioCeilingMb int | ||
| CPUEnforcementRatioMb int | ||
| } | ||
|
|
||
| type HostFlavorGroupResource struct { | ||
| ID string | ||
| } | ||
|
|
||
| func getDefaultScalingGroups(_service string, _plan string, _hostFlavor string, meta interface{}) (groups []clouddatabasesv5.Group, err error) { | ||
| cloudDatabasesClient, err := meta.(conns.ClientSession).CloudDatabasesV5() | ||
| if err != nil { | ||
| return groups, fmt.Errorf("[ERROR] Error getting database client settings: %s", err) | ||
|
|
@@ -1033,6 +1045,9 @@ | |
| } | ||
|
|
||
| getDefaultScalingGroupsOptions := cloudDatabasesClient.NewGetDefaultScalingGroupsOptions(service) | ||
| if _hostFlavor != "" { | ||
| getDefaultScalingGroupsOptions.SetHostFlavor(_hostFlavor) | ||
| } | ||
|
|
||
| getDefaultScalingGroupsResponse, _, err := cloudDatabasesClient.GetDefaultScalingGroups(getDefaultScalingGroupsOptions) | ||
| if err != nil { | ||
|
|
@@ -1043,7 +1058,7 @@ | |
| } | ||
|
|
||
| func getInitialNodeCount(service string, plan string, meta interface{}) (int, error) { | ||
| groups, err := getDefaultScalingGroups(service, plan, "", meta) | ||
|
|
||
| if err != nil { | ||
| return 0, err | ||
|
|
@@ -2702,14 +2717,16 @@ | |
| } | ||
|
|
||
| group.Memory = &GroupResource{ | ||
| Units: *g.Memory.Units, | ||
| Allocation: int(*g.Memory.AllocationMb), | ||
| Minimum: int(*g.Memory.MinimumMb), | ||
| Maximum: int(*g.Memory.MaximumMb), | ||
| StepSize: int(*g.Memory.StepSizeMb), | ||
| IsAdjustable: *g.Memory.IsAdjustable, | ||
| IsOptional: *g.Memory.IsOptional, | ||
| CanScaleDown: *g.Memory.CanScaleDown, | ||
| CPUEnforcementRatioCeilingMb: getCPUEnforcementRatioCeilingMb(g.Memory), | ||
| CPUEnforcementRatioMb: getCPUEnforcementRatioMb(g.Memory), | ||
| } | ||
|
|
||
| group.Disk = &GroupResource{ | ||
|
|
@@ -2745,6 +2762,22 @@ | |
| return groups | ||
| } | ||
|
|
||
| func getCPUEnforcementRatioCeilingMb(groupMemory *clouddatabasesv5.GroupMemory) int { | ||
| if groupMemory.CPUEnforcementRatioCeilingMb != nil { | ||
| return int(*groupMemory.CPUEnforcementRatioCeilingMb) | ||
| } | ||
|
|
||
| return 0 | ||
| } | ||
|
|
||
| func getCPUEnforcementRatioMb(groupMemory *clouddatabasesv5.GroupMemory) int { | ||
| if groupMemory.CPUEnforcementRatioMb != nil { | ||
| return int(*groupMemory.CPUEnforcementRatioMb) | ||
| } | ||
|
|
||
| return 0 | ||
| } | ||
|
|
||
| func expandGroups(_groups []interface{}) []*Group { | ||
| if len(_groups) == 0 { | ||
| return nil | ||
|
|
@@ -2837,6 +2870,39 @@ | |
| return nil | ||
| } | ||
|
|
||
| func validateMultitenantMemoryCpu(groupId string, resourceName string, resourceDefaults *Group, group *Group) error { | ||
|
There was a problem hiding this comment. Do you need There was a problem hiding this comment. Nope! Thank you for catching that 😄 |
||
| // TODO: Replace this with resourceDefaults.Memory.CPUEnforcementRatioCeiling when it is fixed | ||
| cpuEnforcementRatioCeiling := 16384 | ||
|
There was a problem hiding this comment. When will this fix go in? Will that be before merging this PR? There was a problem hiding this comment. @obai-1 This fix won't go in until the next release cut and deployment, so we're looking at around May. This PR will be merged sometime thing week. So that's why we gotta hard code the cpuEnforcementRatioCeiling for now. |
||
| cpuEnforcmentRationMb := resourceDefaults.Memory.CPUEnforcementRatioMb | ||
|
|
||
| // This means the CPUEnforcementRatioMb was not sent, which means we are dealing with a non-multitenant going to a multitenat | ||
| if cpuEnforcmentRationMb == 0 { | ||
| cpuEnforcmentRationMb = 8192 | ||
| } | ||
|
There was a problem hiding this comment. if There was a problem hiding this comment. @obai-1 There is an edge case, when a user is has an existing databases and is going from However, the So we have one of 2 options:
There was a problem hiding this comment.
Hmm.. unless I am missing something, they are not going away anytime soon.. There was a problem hiding this comment. Also hardcoding these numbers here is not safe. Those numbers could change down the line, and could also be db specific. Remember once we release it out to the wild, it is hard to take it back :) |
||
|
|
||
| if resourceDefaults.Members == nil { | ||
| return nil | ||
| } | ||
|
|
||
| if group.Memory.Allocation < resourceDefaults.Memory.Minimum/resourceDefaults.Members.Allocation { | ||
| return fmt.Errorf("We were unable to complete your request: group.memory requires a minimum of %d megabytes. Try again with valid values or contact support if the issue persists.", resourceDefaults.Memory.Minimum/resourceDefaults.Members.Allocation) | ||
| } | ||
|
|
||
| if group.CPU == nil { | ||
| return nil | ||
| } | ||
|
|
||
| if group.CPU != nil && group.CPU.Allocation > 2 { | ||
|
There was a problem hiding this comment. should be something like |
||
| return nil | ||
| } | ||
|
|
||
| if group.CPU != nil && group.Memory.Allocation*resourceDefaults.Members.Allocation < cpuEnforcementRatioCeiling*resourceDefaults.Members.Allocation && group.Memory.Allocation*resourceDefaults.Members.Allocation > group.CPU.Allocation*cpuEnforcmentRationMb { | ||
| return fmt.Errorf("We were unable to complete your request: group.memory %d with group.cpu %d is not valid. Try again with valid values or contact support if the issue persists.", group.Memory.Allocation, group.CPU.Allocation) | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func validateGroupsDiff(_ context.Context, diff *schema.ResourceDiff, meta interface{}) (err error) { | ||
| instanceID := diff.Id() | ||
| service := diff.Get("service").(string) | ||
|
|
@@ -2846,11 +2912,23 @@ | |
| var currentGroups []Group | ||
| var groupList []clouddatabasesv5.Group | ||
| var groupIds []string | ||
| groups := expandGroups(group.(*schema.Set).List()) | ||
| var memberGroup *Group | ||
| for _, g := range groups { | ||
| if g.ID == "member" { | ||
| memberGroup = g | ||
| break | ||
| } | ||
| } | ||
|
|
||
| if instanceID != "" { | ||
| groupList, err = getGroups(instanceID, meta) | ||
| } else { | ||
| if memberGroup.HostFlavor != nil { | ||
| groupList, err = getDefaultScalingGroups(service, plan, memberGroup.HostFlavor.ID, meta) | ||
| } else { | ||
| groupList, err = getDefaultScalingGroups(service, plan, "", meta) | ||
| } | ||
| } | ||
|
|
||
| if err != nil { | ||
|
|
@@ -2892,8 +2970,8 @@ | |
| // set current nodeCount | ||
| nodeCount := groupDefaults.Members.Allocation | ||
|
|
||
| if group.Memory != nil && group.HostFlavor != nil && group.HostFlavor.ID != "" && group.HostFlavor.ID == "multitenant" && groupDefaults.Memory.CPUEnforcementRatioCeilingMb != 0 && groupDefaults.Memory.CPUEnforcementRatioMb != 0 { | ||
| err = validateMultitenantMemoryCpu(groupId, "memory", groupDefaults, group) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
@@ -2906,6 +2984,13 @@ | |
| } | ||
| } | ||
|
|
||
| if group.Members != nil { | ||
| err = validateGroupScaling(groupId, "members", group.Members.Allocation, groupDefaults.Members, 1) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| } | ||
|
|
||
| if group.Memory != nil { | ||
| err = validateGroupScaling(groupId, "memory", group.Memory.Allocation, groupDefaults.Memory, nodeCount) | ||
| if err != nil { | ||
|
|
@@ -2972,7 +3057,7 @@ | |
|
|
||
| // TODO: Use Capability API | ||
| // RBAC roles supported for Redis 6.0 and above | ||
| if (service == "databases-for-redis") && !(version > 0 && version < 6) { | ||
| err = change.New.ValidateRBACRole() | ||
| } else if service == "databases-for-mongodb" && change.New.Type == "ops_manager" { | ||
| err = change.New.ValidateOpsManagerRole() | ||
|
|
||
GitHub Actions 
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure what Go conventions are (just learning), but you might be able to put guard clauses in here to simplify the rest of your code. Like in the first line of this method: