Set env vars for datamover batching (#895)

openshift · Feb 1, 2023 · 0264a37 · 0264a37
1 parent c2f9912
commit 0264a37
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 22 deletions.
diff --git a/api/v1alpha1/oadp_types.go b/api/v1alpha1/oadp_types.go
@@ -176,10 +176,10 @@ type DataMover struct {
 	Timeout string `json:"timeout,omitempty"`
 	// the number of batched volumeSnapshotBackups that can be inProgress at once, default value is 10
 	// +optional
-	MaxConcurrentBackupVolumes *int64 `json:"maxConcurrentBackupVolumes,omitempty"`
+	MaxConcurrentBackupVolumes string `json:"maxConcurrentBackupVolumes,omitempty"`
 	// the number of batched volumeSnapshotRestores that can be inProgress at once, default value is 10
 	// +optional
-	MaxConcurrentRestoreVolumes *int64 `json:"maxConcurrentRestoreVolumes,omitempty"`
+	MaxConcurrentRestoreVolumes string `json:"maxConcurrentRestoreVolumes,omitempty"`
 }
 
 // Features defines the configuration for the DPA to enable the tech preview features

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/bundle/manifests/oadp.openshift.io_dataprotectionapplications.yaml b/bundle/manifests/oadp.openshift.io_dataprotectionapplications.yaml
@@ -348,12 +348,10 @@ spec:
                           type: boolean
                         maxConcurrentBackupVolumes:
                           description: the number of batched volumeSnapshotBackups that can be inProgress at once, default value is 10
-                          format: int64
-                          type: integer
+                          type: string
                         maxConcurrentRestoreVolumes:
                           description: the number of batched volumeSnapshotRestores that can be inProgress at once, default value is 10
-                          format: int64
-                          type: integer
+                          type: string
                         timeout:
                           description: User supplied timeout to be used for VolumeSnapshotBackup and VolumeSnapshotRestore to complete, default value is 10m
                           type: string

diff --git a/config/crd/bases/oadp.openshift.io_dataprotectionapplications.yaml b/config/crd/bases/oadp.openshift.io_dataprotectionapplications.yaml
@@ -348,12 +348,10 @@ spec:
                           type: boolean
                         maxConcurrentBackupVolumes:
                           description: the number of batched volumeSnapshotBackups that can be inProgress at once, default value is 10
-                          format: int64
-                          type: integer
+                          type: string
                         maxConcurrentRestoreVolumes:
                           description: the number of batched volumeSnapshotRestores that can be inProgress at once, default value is 10
-                          format: int64
-                          type: integer
+                          type: string
                         timeout:
                           description: User supplied timeout to be used for VolumeSnapshotBackup and VolumeSnapshotRestore to complete, default value is 10m
                           type: string

diff --git a/controllers/datamover.go b/controllers/datamover.go
@@ -28,6 +28,12 @@ const (
 	ResticRepository = "RESTIC_REPOSITORY"
 	ResticsecretName = "dm-credential"
 
+	// batchNumbers vars
+	DefaultConcurrentBackupVolumes  = "10"
+	DefaultConcurrentRestoreVolumes = "10"
+	DataMoverConcurrentBackup       = "DATAMOVER_CONCURRENT_BACKUP"
+	DataMoverConcurrentRestore      = "DATAMOVER_CONCURRENT_RESTORE"
+
 	// AWS vars
 	AWSAccessKey     = "AWS_ACCESS_KEY_ID"
 	AWSSecretKey     = "AWS_SECRET_ACCESS_KEY"
@@ -105,7 +111,7 @@ func (r *DPAReconciler) ReconcileDataMoverController(log logr.Logger) (bool, err
 		return true, nil
 	}
 
-	op, err := controllerutil.CreateOrPatch(r.Context, r.Client, dataMoverDeployment, func() error {
+	op, err := controllerutil.CreateOrUpdate(r.Context, r.Client, dataMoverDeployment, func() error {
 
 		// Setting Deployment selector if a new object is created as it is immutable
 		if dataMoverDeployment.ObjectMeta.CreationTimestamp.IsZero() {
@@ -195,6 +201,51 @@ func (r *DPAReconciler) buildDataMoverDeployment(dataMoverDeployment *appsv1.Dep
 		},
 	}
 
+	var dataMoverContainer *corev1.Container
+	for i, container := range datamoverContainer {
+		if container.Name == common.DataMoverControllerContainer {
+			dataMoverContainer = &datamoverContainer[i]
+			break
+		}
+	}
+
+	if err := r.customizeDataMoverContainer(dpa, dataMoverContainer); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (r *DPAReconciler) customizeDataMoverContainer(dpa *oadpv1alpha1.DataProtectionApplication, dataMoverContainer *corev1.Container) error {
+
+	if dataMoverContainer == nil {
+		return fmt.Errorf("could not find dataMover container in Deployment")
+	}
+
+	if len(dpa.Spec.Features.DataMover.MaxConcurrentBackupVolumes) > 0 {
+		dataMoverContainer.Env = append(dataMoverContainer.Env, corev1.EnvVar{
+			Name:  DataMoverConcurrentBackup,
+			Value: dpa.Spec.Features.DataMover.MaxConcurrentBackupVolumes,
+		})
+	} else {
+		dataMoverContainer.Env = append(dataMoverContainer.Env, corev1.EnvVar{
+			Name:  DataMoverConcurrentBackup,
+			Value: DefaultConcurrentBackupVolumes,
+		})
+	}
+
+	if len(dpa.Spec.Features.DataMover.MaxConcurrentRestoreVolumes) > 0 {
+		dataMoverContainer.Env = append(dataMoverContainer.Env, corev1.EnvVar{
+			Name:  DataMoverConcurrentRestore,
+			Value: dpa.Spec.Features.DataMover.MaxConcurrentRestoreVolumes,
+		})
+	} else {
+		dataMoverContainer.Env = append(dataMoverContainer.Env, corev1.EnvVar{
+			Name:  DataMoverConcurrentRestore,
+			Value: DefaultConcurrentRestoreVolumes,
+		})
+	}
+
 	return nil
 }
 

diff --git a/controllers/datamover_test.go b/controllers/datamover_test.go
@@ -134,6 +134,16 @@ func TestDPAReconciler_buildDataMoverDeployment(t *testing.T) {
 									Image:           common.DataMoverImage,
 									Name:            common.DataMoverControllerContainer,
 									ImagePullPolicy: corev1.PullAlways,
+									Env: []corev1.EnvVar{
+										{
+											Name:  DataMoverConcurrentBackup,
+											Value: DefaultConcurrentBackupVolumes,
+										},
+										{
+											Name:  DataMoverConcurrentRestore,
+											Value: DefaultConcurrentRestoreVolumes,
+										},
+									},
 								},
 							},
 							ServiceAccountName: "openshift-adp-controller-manager",