tidyup

Author: leon-ape

controllers/parameters/auto_reload_policy.go

@@ -29,7 +29,6 @@ func init() {
 
 type autoReloadPolicy struct{}
 
-func (receiver autoReloadPolicy) Upgrade(params reconfigureContext) (returnedStatus, error) {
-	_ = params
+func (receiver autoReloadPolicy) Upgrade(reconfigureContext) (returnedStatus, error) {
 	return makeReturnedStatus(ESNone), nil
 }

controllers/parameters/combine_upgrade_policy_test.go

@@ -23,29 +23,32 @@ import (
 	parametersv1alpha1 "github.com/apecloud/kubeblocks/apis/parameters/v1alpha1"
 )
 
-var combineUpgradePolicyInstance = &combineUpgradePolicy{
-	policyExecutors: []reconfigurePolicy{
-		syncPolicyInstance,
-		restartPolicyInstance,
-	},
+func init() {
+	registerPolicy(parametersv1alpha1.DynamicReloadAndRestartPolicy, combinedPolicyInst)
 }
 
-type combineUpgradePolicy struct {
-	policyExecutors []reconfigurePolicy
+var combinedPolicyInst = &combinedPolicy{
+	policies: []reconfigurePolicy{
+		syncPolicyInst,
+		restartPolicyInst,
+	},
 }
 
-func init() {
-	registerPolicy(parametersv1alpha1.DynamicReloadAndRestartPolicy, combineUpgradePolicyInstance)
+type combinedPolicy struct {
+	policies []reconfigurePolicy
 }
 
-func (h *combineUpgradePolicy) Upgrade(rctx reconfigureContext) (returnedStatus, error) {
-	var ret returnedStatus
-	for _, executor := range h.policyExecutors {
-		retStatus, err := executor.Upgrade(rctx)
+func (h *combinedPolicy) Upgrade(rctx reconfigureContext) (returnedStatus, error) {
+	var (
+		status returnedStatus
+		err    error
+	)
+	for _, policy := range h.policies {
+		status, err = policy.Upgrade(rctx)
 		if err != nil {
-			return retStatus, err
+			return status, err
 		}
-		ret = retStatus
 	}
-	return ret, nil
+	// TODO: how to merge the status?
+	return status, nil
 }

…ers/parameters/combine_upgrade_policy.go controllers/parameters/combined_policy.gocontrollers/parameters/combine_upgrade_policy.go renamed to controllers/parameters/combined_policy.go controllers/parameters/combine_upgrade_policy.go renamed to controllers/parameters/combined_policy.go

@@ -0,0 +1,134 @@
+/*
+Copyright (C) 2022-2025 ApeCloud Co., Ltd
+
+This file is part of KubeBlocks project
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package parameters
+
+import (
+	"fmt"
+
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("Reconfigure combinedPolicy test", func() {
+	var (
+		rctx reconfigureContext
+	)
+
+	BeforeEach(func() {
+		rctx = newMockReconfigureParams("combinedPolicy", k8sClient,
+			withConfigSpec("test", map[string]string{
+				"key": "value",
+			}),
+			withClusterComponent(2))
+	})
+
+	AfterEach(func() {
+	})
+
+	Context("combine reconfigure policy", func() {
+		It("dummy policy", func() {
+			policies := &combinedPolicy{
+				policies: []reconfigurePolicy{
+					&dummyPolicy{
+						status: ESNone,
+						err:    nil,
+					}},
+			}
+			status, err := policies.Upgrade(rctx)
+			Expect(err).Should(BeNil())
+			Expect(status.Status).Should(BeEquivalentTo(ESNone))
+		})
+
+		It("error policy", func() {
+			policies := &combinedPolicy{
+				policies: []reconfigurePolicy{
+					&dummyPolicy{
+						status: ESFailedAndRetry,
+						err:    fmt.Errorf("error"),
+					}},
+			}
+			status, err := policies.Upgrade(rctx)
+			Expect(err).ShouldNot(BeNil())
+			Expect(status.Status).Should(BeEquivalentTo(ESFailedAndRetry))
+		})
+
+		It("ok + error policy", func() {
+			policies := &combinedPolicy{
+				policies: []reconfigurePolicy{
+					&dummyPolicy{
+						status: ESNone,
+						err:    nil,
+					},
+					&dummyPolicy{
+						status: ESFailedAndRetry,
+						err:    fmt.Errorf("error"),
+					}},
+			}
+			status, err := policies.Upgrade(rctx)
+			Expect(err).ShouldNot(BeNil())
+			Expect(status.Status).Should(BeEquivalentTo(ESFailedAndRetry))
+		})
+
+		It("error + ok policy", func() {
+			policies := &combinedPolicy{
+				policies: []reconfigurePolicy{
+					&dummyPolicy{
+						status: ESFailedAndRetry,
+						err:    fmt.Errorf("error"),
+					},
+					&dummyPolicy{
+						status: ESNone,
+						err:    nil,
+					},
+				},
+			}
+			status, err := policies.Upgrade(rctx)
+			Expect(err).ShouldNot(BeNil())
+			Expect(status.Status).Should(BeEquivalentTo(ESFailedAndRetry))
+		})
+
+		It("retry + none policy", func() {
+			policies := &combinedPolicy{
+				policies: []reconfigurePolicy{
+					&dummyPolicy{
+						status: ESRetry,
+						err:    nil,
+					},
+					&dummyPolicy{
+						status: ESNone,
+						err:    nil,
+					},
+				},
+			}
+			status, err := policies.Upgrade(rctx)
+			Expect(err).Should(BeNil())
+			Expect(status.Status).Should(BeEquivalentTo(ESNone)) // TODO: should be ESRetry
+		})
+	})
+})
+
+type dummyPolicy struct {
+	status ExecStatus
+	err    error
+}
+
+func (t *dummyPolicy) Upgrade(reconfigureContext) (returnedStatus, error) {
+	return makeReturnedStatus(t.status), t.err
+}