[Feature] PVCResize action concurrency limit

arangodb · Aug 15, 2023 · b6239c6 · b6239c6
1 parent 147d6bf
commit b6239c6
Show file tree

Hide file tree

Showing 42 changed files with 210 additions and 34 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Change Log
 
 ## [master](https://github.com/arangodb/kube-arangodb/tree/master) (N/A)
+- (Feature) PVCResize action concurrency limit
 
 ## [1.2.32](https://github.com/arangodb/kube-arangodb/tree/1.2.32) (2023-08-07)
 - (Feature) Backup lifetime - remove Backup once its lifetime has been reached

diff --git a/cmd/cmd.go b/cmd/cmd.go
@@ -51,6 +51,7 @@ import (
 	"github.com/arangodb/kube-arangodb/pkg/crd"
 	"github.com/arangodb/kube-arangodb/pkg/deployment/agency/cache"
 	"github.com/arangodb/kube-arangodb/pkg/deployment/features"
+	"github.com/arangodb/kube-arangodb/pkg/deployment/reconcile"
 	"github.com/arangodb/kube-arangodb/pkg/generated/clientset/versioned/scheme"
 	"github.com/arangodb/kube-arangodb/pkg/logging"
 	"github.com/arangodb/kube-arangodb/pkg/metrics/collector"
@@ -236,6 +237,9 @@ func init() {
 	if err := cache.Init(&cmdMain); err != nil {
 		panic(err.Error())
 	}
+	if err := reconcile.ActionsConfigGlobal.Init(&cmdMain); err != nil {
+		panic(err.Error())
+	}
 }
 
 func Execute() int {

diff --git a/internal/actions.config.go.tmpl b/internal/actions.config.go.tmpl
@@ -0,0 +1,43 @@
+{{- $root := . -}}
+//
+// Copyright 2023 ArangoDB GmbH, Cologne, Germany
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Copyright holder is ArangoDB GmbH, Cologne, Germany
+//
+
+package reconcile
+
+import "github.com/spf13/cobra"
+
+var ActionsConfigGlobal ActionsConfig
+
+type ActionsConfig struct {
+{{- range .configurable }}
+    // {{ . }} keeps configuration for action api.ActionType{{ . }}
+    {{ . }} Action{{ . }}Config
+{{- end }}
+}
+
+// Init initializes all registered features.
+// If a feature is not provided via process's argument, then it is taken from environment variable
+// or from enabled by default setting.
+func (a *ActionsConfig) Init(cmd *cobra.Command) error {
+{{- range .configurable }}
+    if err := a.{{ . }}.Init(cmd); err != nil {
+        return err
+    }
+{{- end }}
+    return nil
+}
diff --git a/internal/actions.go b/internal/actions.go
@@ -46,6 +46,9 @@ var actionsGoTemplate []byte
 //go:embed actions.register.go.tmpl
 var actionsRegisterGoTemplate []byte
 
+//go:embed actions.config.go.tmpl
+var actionsConfigGoTemplate []byte
+
 //go:embed actions.register.test.go.tmpl
 var actionsRegisterTestGoTemplate []byte
 
@@ -175,6 +178,16 @@ func (i ActionsInput) Timeouts() map[string]string {
 	return r
 }
 
+func (i ActionsInput) Configurable() []string {
+	var r []string
+	for k, a := range i.Actions {
+		if a.Configurable {
+			r = append(r, k)
+		}
+	}
+	return r
+}
+
 type Action struct {
 	Timeout                   *meta.Duration `json:"timeout,omitempty"`
 	StartupFailureGracePeriod *meta.Duration `json:"startupFailureGracePeriod,omitempty"`
@@ -188,6 +201,8 @@ type Action struct {
 	IsInternal bool `json:"isInternal"`
 
 	Optional bool `json:"optional"`
+
+	Configurable bool `json:"configurable"`
 }
 
 func (a Action) InScope(scope string) bool {
@@ -267,6 +282,30 @@ func RenderActions(root string) error {
 		}
 	}
 
+	{
+		actions := path.Join(root, "pkg", "deployment", "reconcile", "action.config.generated.go")
+
+		out, err := os.OpenFile(actions, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0644)
+		if err != nil {
+			return err
+		}
+
+		i, err := template.New("actions").Parse(string(actionsConfigGoTemplate))
+		if err != nil {
+			return err
+		}
+
+		if err := i.Execute(out, map[string]interface{}{
+			"configurable": in.Configurable(),
+		}); err != nil {
+			return err
+		}
+
+		if err := out.Close(); err != nil {
+			return err
+		}
+	}
+
 	{
 		actions := path.Join(root, "pkg", "deployment", "reconcile", "action.register.generated_test.go")
 

diff --git a/internal/actions.yaml b/internal/actions.yaml
@@ -106,6 +106,7 @@ actions:
   PVCResize:
     description: Start the resize procedure. Updates PVC Requests field
     timeout: 30m
+    configurable: true
   PVCResized:
     description: Waits for PVC resize to be completed
     timeout: 15m

diff --git a/pkg/api/jwt.go b/pkg/api/jwt.go
diff --git a/pkg/apis/deployment/v1/member_status_list.go b/pkg/apis/deployment/v1/member_status_list.go
@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2022 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2023 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/apis/deployment/v2alpha1/member_status_list.go b/pkg/apis/deployment/v2alpha1/member_status_list.go
@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2022 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2023 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/deployment/acs/acs.community.go b/pkg/deployment/acs/acs.community.go
@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2022 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2023 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/deployment/chaos/monkey.go b/pkg/deployment/chaos/monkey.go
@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2022 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2023 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/deployment/member/state.go b/pkg/deployment/member/state.go
@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2022 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2023 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/deployment/members.community.go b/pkg/deployment/members.community.go
@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2022 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2023 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/deployment/pod/topology.community.go b/pkg/deployment/pod/topology.community.go
@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2022 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2023 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/deployment/reconcile/action.config.generated.go b/pkg/deployment/reconcile/action.config.generated.go
@@ -0,0 +1,38 @@
+//
+// Copyright 2023 ArangoDB GmbH, Cologne, Germany
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Copyright holder is ArangoDB GmbH, Cologne, Germany
+//
+
+package reconcile
+
+import "github.com/spf13/cobra"
+
+var ActionsConfigGlobal ActionsConfig
+
+type ActionsConfig struct {
+	// PVCResize keeps configuration for action api.ActionTypePVCResize
+	PVCResize ActionPVCResizeConfig
+}
+
+// Init initializes all registered features.
+// If a feature is not provided via process's argument, then it is taken from environment variable
+// or from enabled by default setting.
+func (a *ActionsConfig) Init(cmd *cobra.Command) error {
+	if err := a.PVCResize.Init(cmd); err != nil {
+		return err
+	}
+	return nil
+}
diff --git a/pkg/deployment/reconcile/action_bootstrap_set_password.go b/pkg/deployment/reconcile/action_bootstrap_set_password.go
@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2022 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2023 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/deployment/reconcile/action_member_maintenance_disable.community.go b/pkg/deployment/reconcile/action_member_maintenance_disable.community.go
@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2022 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2023 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/deployment/reconcile/action_member_maintenance_enable.community.go b/pkg/deployment/reconcile/action_member_maintenance_enable.community.go
@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2022 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2023 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/deployment/reconcile/action_placeholder.community.go b/pkg/deployment/reconcile/action_placeholder.community.go
@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2022 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2023 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/deployment/reconcile/action_pvc_resize.go b/pkg/deployment/reconcile/action_pvc_resize.go
@@ -23,6 +23,7 @@ package reconcile
 import (
 	"context"
 
+	"github.com/spf13/cobra"
 	core "k8s.io/api/core/v1"
 	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
 
@@ -32,6 +33,18 @@ import (
 	"github.com/arangodb/kube-arangodb/pkg/util/k8sutil"
 )
 
+type ActionPVCResizeConfig struct {
+	Concurrency int
+}
+
+func (a *ActionPVCResizeConfig) Init(cmd *cobra.Command) error {
+	f := cmd.Flags()
+
+	f.IntVar(&a.Concurrency, "action.PVCResize.concurrency", 32, "Define limit of concurrent PVC Resizes on the cluster")
+
+	return nil
+}
+
 // newRotateMemberAction creates a new Action that implements the given
 // planned RotateMember action.
 func newPVCResizeAction(action api.Action, actionCtx ActionContext) Action {

diff --git a/pkg/deployment/reconcile/action_rebalancer_check.community.go b/pkg/deployment/reconcile/action_rebalancer_check.community.go
@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2022 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2023 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/deployment/reconcile/action_rebalancer_clean.community.go b/pkg/deployment/reconcile/action_rebalancer_clean.community.go
@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2022 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2023 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/deployment/reconcile/action_rebalancer_generate.community.go b/pkg/deployment/reconcile/action_rebalancer_generate.community.go
@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2022 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2023 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/deployment/reconcile/action_topology_disable.community.go b/pkg/deployment/reconcile/action_topology_disable.community.go
@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2022 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2023 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/deployment/reconcile/action_topology_enable.community.go b/pkg/deployment/reconcile/action_topology_enable.community.go
@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2022 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2023 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/deployment/reconcile/action_topology_member_assignment.community.go b/pkg/deployment/reconcile/action_topology_member_assignment.community.go
@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2022 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2023 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/deployment/reconcile/action_topology_zones_update.community.go b/pkg/deployment/reconcile/action_topology_zones_update.community.go
@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2022 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2023 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/pkg/deployment/reconcile/plan_builder_maintenance.community.go b/pkg/deployment/reconcile/plan_builder_maintenance.community.go
@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2016-2022 ArangoDB GmbH, Cologne, Germany
+// Copyright 2016-2023 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.