Allow to specify the minimum uptime seconds (#582)

* Allow to specify the minimum uptime seconds

* Set the default also in code

Author: johscheuer

api/v1beta1/foundationdbcluster_types.go

@@ -269,6 +269,13 @@ type FoundationDBClusterSpec struct {
 	// This means that you end up with ProcessCounts["storage"] * StorageServersPerPod
 	// storage processes
 	StorageServersPerPod int `json:"storageServersPerPod,omitempty"`
+
+	// MinimumUptimeSecondsForBounce defines the minimum time, in seconds, that the
+	// processes in the cluster must have been up for before the operator can
+	// execute a bounce.
+	// +kubebuilder:validation:Minimum=1
+	// +kubebuilder:default:=600
+	MinimumUptimeSecondsForBounce int `json:"minimumUptimeSecondsForBounce,omitempty"`
 }
 
 // FoundationDBClusterStatus defines the observed state of FoundationDBCluster

config/crd/bases/apps.foundationdb.org_foundationdbclusters.yaml

@@ -1437,6 +1437,10 @@ spec:
                         type: object
                       type: array
                   type: object
+                minimumUptimeSecondsForBounce:
+                  default: 600
+                  minimum: 1
+                  type: integer
                 nextInstanceID:
                   type: integer
                 pendingRemovals:

controllers/bounce_processes.go

@@ -105,7 +105,7 @@ func (b BounceProcesses) Reconcile(r *FoundationDBClusterReconciler, context ctx
 			return false, ReconciliationNotReadyError{message: "Kills are disabled"}
 		}
 
-		if minimumUptime < MinimumUptimeSecondsForBounce {
+		if minimumUptime < float64(cluster.Spec.MinimumUptimeSecondsForBounce) {
 			r.Recorder.Event(cluster, corev1.EventTypeNormal, "NeedsBounce",
 				fmt.Sprintf("Spec require a bounce of some processes, but the cluster has only been up for %f seconds", minimumUptime))
 			cluster.Status.Generations.NeedsBounce = cluster.ObjectMeta.Generation

controllers/cluster_controller.go

@@ -160,7 +160,6 @@ func (r *FoundationDBClusterReconciler) Reconcile(ctx context.Context, request c
 
 	for _, subReconciler := range subReconcilers {
 		cluster.Spec = *(normalizedSpec.DeepCopy())
-
 		canContinue, err := subReconciler.Reconcile(r, ctx, cluster)
 		if !canContinue || err != nil {
 			log.Info("Reconciliation terminated early", "namespace", cluster.Namespace, "name", cluster.Name, "lastAction", fmt.Sprintf("%T", subReconciler))

controllers/controllers.go

@@ -45,11 +45,6 @@ const (
 	// deployments to a cluster.
 	BackupDeploymentLabel = "foundationdb.org/backup-for"
 
-	// MinimumUptimeSecondsForBounce defines the minimum time, in seconds, that the
-	// processes in the cluster must have been up for before the operator can
-	// execute a bounce.
-	MinimumUptimeSecondsForBounce = 600
-
 	// PublicIPSourceAnnotation is an annotation key that specifies where a pod
 	// gets its public IP from.
 	PublicIPSourceAnnotation = "foundationdb.org/public-ip-source"

controllers/pod_models.go

@@ -1247,6 +1247,12 @@ func NormalizeClusterSpec(spec *fdbtypes.FoundationDBClusterSpec, options Deprec
 		template.Spec.InitContainers = customizeContainerFromList(template.Spec.InitContainers, "foundationdb-kubernetes-init", sidecarUpdater)
 		template.Spec.Containers = customizeContainerFromList(template.Spec.Containers, "foundationdb-kubernetes-sidecar", sidecarUpdater)
 	})
+
+	// Setting the default since the CRD default enforces the default in the runtime
+	if spec.MinimumUptimeSecondsForBounce == 0 {
+		spec.MinimumUptimeSecondsForBounce = 600
+	}
+
 	return nil
 }
 

controllers/suite_test.go

@@ -166,6 +166,7 @@ func createDefaultCluster() *fdbtypes.FoundationDBCluster {
 					FailureDetectionTimeSeconds: &failureDetectionWindow,
 				},
 			},
+			MinimumUptimeSecondsForBounce: 1,
 		},
 		Status: fdbtypes.FoundationDBClusterStatus{
 			RequiredAddresses: fdbtypes.RequiredAddressSet{

docs/cluster_spec.md

@@ -273,6 +273,7 @@ FoundationDBClusterSpec defines the desired state of a cluster.
 | customParameters | CustomParameters defines additional parameters to pass to the fdbserver processes. **Deprecated: use the Processes field instead.** | []string | false |
 | pendingRemovals | PendingRemovals defines the processes that are pending removal. This maps the name of a pod to its IP address. If a value is left blank, the controller will provide the pod's current IP.  **Deprecated: To indicate that a process should be removed, use the InstancesToRemove field. To get information about pending removals, use the PendingRemovals field in the status.** | map[string]string | false |
 | storageServersPerPod | StorageServersPerPod defines how many Storage Servers should run in a single Instance (Pod). This number defines the number of processes running in one Pod whereas the ProcessCounts defines the number of Pods created. This means that you end up with ProcessCounts[\"storage\"] * StorageServersPerPod storage processes | int | false |
+| minimumUptimeSecondsForBounce | MinimumUptimeSecondsForBounce defines the minimum time, in seconds, that the processes in the cluster must have been up for before the operator can execute a bounce. | int | false |
 
 [Back to TOC](#table-of-contents)