sharding determine with topology and user specified

apecloud · Dec 18, 2024 · 7cf567a · 7cf567a
1 parent 0fd38ad
commit 7cf567a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/controllers/apps/cluster_plan_builder.go b/controllers/apps/cluster_plan_builder.go
@@ -115,9 +115,11 @@ func (c *clusterTransformContext) sharding(name string) (bool, error) {
 	// sharding defined in cd topology
 	if len(c.Cluster.Spec.ClusterDef) > 0 && len(c.Cluster.Spec.Topology) > 0 {
 		if c.clusterDef == nil {
-			if err := loadNCheckClusterDefinition(c, c.Cluster); err != nil {
+			cd, err := loadClusterDefinition(c, c.Cluster)
+			if err != nil {
 				return false, err
 			}
+			c.clusterDef = cd
 		}
 		for _, topo := range c.clusterDef.Spec.Topologies {
 			if c.Cluster.Spec.Topology != topo.Name {

diff --git a/controllers/apps/transformer_cluster_validation.go b/controllers/apps/transformer_cluster_validation.go
@@ -137,15 +137,23 @@ func (t *clusterValidationTransformer) checkNUpdateClusterTopology(transCtx *clu
 	return nil
 }
 
-func loadNCheckClusterDefinition(transCtx *clusterTransformContext, cluster *appsv1.Cluster) error {
+func loadClusterDefinition(transCtx *clusterTransformContext, cluster *appsv1.Cluster) (*appsv1.ClusterDefinition, error) {
 	var cd *appsv1.ClusterDefinition
 	if len(cluster.Spec.ClusterDef) > 0 {
 		cd = &appsv1.ClusterDefinition{}
 		key := types.NamespacedName{Name: cluster.Spec.ClusterDef}
 		if err := transCtx.Client.Get(transCtx.Context, key, cd); err != nil {
-			return err
+			return nil, err
 		}
 	}
+	return cd, nil
+}
+
+func loadNCheckClusterDefinition(transCtx *clusterTransformContext, cluster *appsv1.Cluster) error {
+	cd, err := loadClusterDefinition(transCtx, cluster)
+	if err != nil {
+		return err
+	}
 	if cd != nil {
 		if cd.Generation != cd.Status.ObservedGeneration {
 			return fmt.Errorf("the referenced ClusterDefinition is not up to date: %s", cd.Name)