fix(tenantop): supplement type of modifying resource pools

oceanbase · Sep 3, 2024 · 2162374 · 2162374
1 parent 9a22682
commit 2162374
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 0 deletions.
diff --git a/api/constants/tenant.go b/api/constants/tenant.go
@@ -30,6 +30,7 @@ const (
 	TenantOpSetConnectWhiteList types.TenantOperationType = "SET_CONNECT_WHITE_LIST"
 	TenantOpAddResourcePools    types.TenantOperationType = "ADD_RESOURCE_POOLS"
 	TenantOpDeleteResourcePools types.TenantOperationType = "DELETE_RESOURCE_POOLS"
+	TenantOpModifyResourcePools types.TenantOperationType = "MODIFY_RESOURCE_POOLS"
 	TenantOpSetCharset          types.TenantOperationType = "SET_CHARSET"
 	TenantOpSetForceDelete      types.TenantOperationType = "SET_FORCE_DELETE"
 )

diff --git a/api/v1alpha1/obtenantoperation_types.go b/api/v1alpha1/obtenantoperation_types.go
@@ -44,6 +44,7 @@ type OBTenantOperationSpec struct {
 	UnitNumber          int                `json:"unitNumber,omitempty"`
 	ConnectWhiteList    string             `json:"connectWhiteList,omitempty"`
 	Charset             string             `json:"charset,omitempty"`
+	ModifyResourcePools []ResourcePoolSpec `json:"modifyResourcePools,omitempty"`
 	AddResourcePools    []ResourcePoolSpec `json:"addResourcePools,omitempty"`
 	DeleteResourcePools []string           `json:"deleteResourcePools,omitempty"`
 	ForceDelete         *bool              `json:"forceDelete,omitempty"`

diff --git a/api/v1alpha1/obtenantoperation_webhook.go b/api/v1alpha1/obtenantoperation_webhook.go
@@ -304,6 +304,20 @@ func (r *OBTenantOperation) validateMutation() error {
 				allErrs = append(allErrs, field.Invalid(field.NewPath("spec").Child("addResourcePools"), r.Spec.AddResourcePools, "The resource pool does not exist in the cluster"))
 			}
 		}
+	case constants.TenantOpModifyResourcePools:
+		if len(r.Spec.ModifyResourcePools) == 0 {
+			allErrs = append(allErrs, field.Required(field.NewPath("spec").Child("modifyResourcePools"), "modifyResourcePools is required"))
+			break
+		}
+		pools := make(map[string]any)
+		for _, pool := range obtenant.Spec.Pools {
+			pools[pool.Zone] = struct{}{}
+		}
+		for _, pool := range r.Spec.ModifyResourcePools {
+			if _, ok := pools[pool.Zone]; !ok {
+				allErrs = append(allErrs, field.Invalid(field.NewPath("spec").Child("modifyResourcePools"), r.Spec.ModifyResourcePools, "The resource pool does not exist"))
+			}
+		}
 	case constants.TenantOpDeleteResourcePools:
 		if len(r.Spec.DeleteResourcePools) == 0 {
 			allErrs = append(allErrs, field.Required(field.NewPath("spec").Child("deleteResourcePools"), "deleteResourcePools is required"))

diff --git a/internal/resource/obtenantoperation/obtenantoperation_task.go b/internal/resource/obtenantoperation/obtenantoperation_task.go
@@ -369,6 +369,17 @@ func UpdateOBTenantResource(m *ObTenantOperationManager) tasktypes.TaskError {
 		for _, pool := range m.Resource.Spec.AddResourcePools {
 			obtenant.Spec.Pools = append(obtenant.Spec.Pools, pool)
 		}
+	case constants.TenantOpModifyResourcePools:
+		modifiedPools := make(map[string]*v1alpha1.ResourcePoolSpec)
+		for _, pool := range m.Resource.Spec.ModifyResourcePools {
+			modifiedPools[pool.Zone] = &pool
+		}
+		for i := range obtenant.Spec.Pools {
+			pool := obtenant.Spec.Pools[i]
+			if modified, ok := modifiedPools[pool.Zone]; ok {
+				obtenant.Spec.Pools[i] = *modified
+			}
+		}
 	case constants.TenantOpDeleteResourcePools:
 		deletedPools := make(map[string]any)
 		for _, pool := range m.Resource.Spec.DeleteResourcePools {