fix

kizuna-lek · kizuna-lek · commit e3b3e9402aa0 · 2025-12-26T10:25:10.000+08:00
diff --git a/controllers/apps/cluster/transformer_cluster_component.go b/controllers/apps/cluster/transformer_cluster_component.go
@@ -1466,15 +1466,14 @@ func lifecycleAction4Sharding(transCtx *clusterTransformContext, comp *appsv1.Co
 }
 
 func handleShardingAddNPostProvision(transCtx *clusterTransformContext, dag *graph.DAG, shardingDef *appsv1.ShardingDefinition, comp *appsv1.Component, shardingName string) error {
-	var err error
 	// if both post-provision and shard-add annotations exist, do post-provision first
 	if comp.Annotations[kbShardingPostProvisionKey] != "" {
-		err = doShardingLifecycleAction(transCtx, dag, shardingDef, comp, shardingName, kbShardingPostProvisionAction)
+		return doShardingLifecycleAction(transCtx, dag, shardingDef, comp, shardingName, kbShardingPostProvisionAction)
 	} else if comp.Annotations[kbShardingAddKey] != "" {
-		err = doShardingLifecycleAction(transCtx, dag, shardingDef, comp, shardingName, kbShardingAddAction)
+		return doShardingLifecycleAction(transCtx, dag, shardingDef, comp, shardingName, kbShardingAddAction)
 	}
 
-	return err
+	return nil
 }
 
 func doShardingLifecycleAction(transCtx *clusterTransformContext,

Original file line number	Diff line number	Diff line change
`@@ -1466,15 +1466,14 @@ func lifecycleAction4Sharding(transCtx clusterTransformContext, comp appsv1.Co`
`1466`	`1466`	`}`
`1467`	`1467`
`1468`	`1468`	`func handleShardingAddNPostProvision(transCtx clusterTransformContext, dag graph.DAG, shardingDef appsv1.ShardingDefinition, comp appsv1.Component, shardingName string) error {`
`1469`		`- var err error`
`1470`	`1469`	`// if both post-provision and shard-add annotations exist, do post-provision first`
`1471`	`1470`	`if comp.Annotations[kbShardingPostProvisionKey] != "" {`
`1472`		`- err = doShardingLifecycleAction(transCtx, dag, shardingDef, comp, shardingName, kbShardingPostProvisionAction)`
	`1471`	`+ return doShardingLifecycleAction(transCtx, dag, shardingDef, comp, shardingName, kbShardingPostProvisionAction)`
`1473`	`1472`	`} else if comp.Annotations[kbShardingAddKey] != "" {`
`1474`		`- err = doShardingLifecycleAction(transCtx, dag, shardingDef, comp, shardingName, kbShardingAddAction)`
	`1473`	`+ return doShardingLifecycleAction(transCtx, dag, shardingDef, comp, shardingName, kbShardingAddAction)`
`1475`	`1474`	`}`
`1476`	`1475`
`1477`		`- return err`
	`1476`	`+ return nil`
`1478`	`1477`	`}`
`1479`	`1478`
`1480`	`1479`	`func doShardingLifecycleAction(transCtx *clusterTransformContext,`