Fixed some problems found in testings (#574)

Author: powerfooI

api/constants/tenant.go

@@ -31,7 +31,6 @@ const (
 	TenantOpAddResourcePools    types.TenantOperationType = "ADD_RESOURCE_POOLS"
 	TenantOpDeleteResourcePools types.TenantOperationType = "DELETE_RESOURCE_POOLS"
 	TenantOpModifyResourcePools types.TenantOperationType = "MODIFY_RESOURCE_POOLS"
-	TenantOpSetCharset          types.TenantOperationType = "SET_CHARSET"
 )
 
 const (

api/v1alpha1/obtenant_webhook.go

@@ -109,15 +109,21 @@ func (r *OBTenant) ValidateCreate() (admission.Warnings, error) {
 
 // ValidateUpdate implements webhook.Validator so a webhook will be registered for the type
 func (r *OBTenant) ValidateUpdate(old runtime.Object) (admission.Warnings, error) {
-	_ = old
+	oldTenant, ok := old.(*OBTenant)
+	if !ok {
+		return nil, apierrors.NewBadRequest("Invalid old object")
+	}
 	if r.Status.Status == tenantstatus.Running {
 		switch {
-		case r.Spec.ClusterName != old.(*OBTenant).Spec.ClusterName:
+		case r.Spec.ClusterName != oldTenant.Spec.ClusterName:
 			return nil, apierrors.NewBadRequest("Cannot change clusterName when tenant is running")
-		case r.Spec.TenantName != old.(*OBTenant).Spec.TenantName:
+		case r.Spec.TenantName != oldTenant.Spec.TenantName:
 			return nil, apierrors.NewBadRequest("Cannot change tenantName when tenant is running")
 		}
 	}
+	if r.Spec.Charset != oldTenant.Spec.Charset {
+		return nil, apierrors.NewBadRequest("Cannot change charset of tenant")
+	}
 	return nil, r.validateMutation()
 }
 

api/v1alpha1/obtenantbackuppolicy_webhook.go

@@ -293,7 +293,7 @@ func validateScheduleFormat(schedule string, fldPath *field.Path) *field.Error {
 	return nil
 }
 
-func (r *OBTenantBackupPolicy) validateDestination(cluster *OBCluster, dest *apitypes.BackupDestination, fieldName string) *field.Error {
+func (r *OBTenantBackupPolicy) validateDestination(cluster *OBCluster, dest *apitypes.BackupDestination, fieldName string) error {
 	if dest.Type == constants.BackupDestTypeNFS && cluster.Spec.BackupVolume == nil {
 		return field.Invalid(field.NewPath("spec").Child("backupVolume"), cluster.Spec.BackupVolume, "backupVolume of obcluster is required when backing up data to NFS")
 	}

api/v1alpha1/obtenantoperation_webhook.go

@@ -69,7 +69,7 @@ func (r *OBTenantOperation) Default() {
 	} else if r.Spec.Type == constants.TenantOpSwitchover && r.Spec.Switchover != nil {
 		targetTenantName = r.Spec.Switchover.PrimaryTenant
 		secondaryTenantName = r.Spec.Switchover.StandbyTenant
-	} else if (r.Spec.Type == constants.TenantOpUpgrade || r.Spec.Type == constants.TenantOpReplayLog) && r.Spec.TargetTenant != nil {
+	} else if r.Spec.TargetTenant != nil {
 		targetTenantName = *r.Spec.TargetTenant
 	}
 	references := r.GetOwnerReferences()
@@ -261,10 +261,6 @@ func (r *OBTenantOperation) validateMutation() error {
 		if r.Spec.ConnectWhiteList == "" {
 			allErrs = append(allErrs, field.Required(field.NewPath("spec").Child("connectWhiteList"), "connectWhiteList is required"))
 		}
-	case constants.TenantOpSetCharset:
-		if r.Spec.Charset == "" {
-			allErrs = append(allErrs, field.Required(field.NewPath("spec").Child("charset"), "charset is required"))
-		}
 	case constants.TenantOpAddResourcePools:
 		if len(r.Spec.AddResourcePools) == 0 {
 			allErrs = append(allErrs, field.Required(field.NewPath("spec").Child("addResourcePools"), "addResourcePools is required"))

internal/resource/obtenantoperation/obtenantoperation_task.go

@@ -361,8 +361,6 @@ func UpdateOBTenantResource(m *ObTenantOperationManager) tasktypes.TaskError {
 		obtenant.Spec.UnitNumber = m.Resource.Spec.UnitNumber
 	case constants.TenantOpSetConnectWhiteList:
 		obtenant.Spec.ConnectWhiteList = m.Resource.Spec.ConnectWhiteList
-	case constants.TenantOpSetCharset:
-		obtenant.Spec.Charset = m.Resource.Spec.Charset
 	case constants.TenantOpAddResourcePools:
 		for _, pool := range m.Resource.Spec.AddResourcePools {
 			obtenant.Spec.Pools = append(obtenant.Spec.Pools, pool)

internal/resource/obtenantoperation/utils.go

@@ -13,6 +13,8 @@ See the Mulan PSL v2 for more details.
 package obtenantoperation
 
 import (
+	"time"
+
 	"github.com/pkg/errors"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/util/retry"
@@ -98,6 +100,7 @@ func (m *ObTenantOperationManager) waitForOBTenantToBeStatus(waitSeconds int, ma
 		if matcher(tenant) {
 			return nil
 		}
+		time.Sleep(time.Second)
 	}
 	return errors.Errorf("wait for tenant %s to be in desired status timeout", m.Resource.Name)
 }