Delay jon when a share is deleted

If the share cleanup job is executed right after the share deletion, it
might be possible that the other manila components have not yet been
notified about the event. The result is that the job has no effect.
This patch introduces a parameter for the ManilaJob that is supposed to
delay the command. A constant has been defined to properly indentify the
delay time associated with the service cleanup.

Signed-off-by: Francesco Pantano <[email protected]>

controllers/manila_controller.go

@@ -374,6 +374,7 @@ func (r *ManilaReconciler) reconcileInit(
 		nil,
 		manila.DBSyncJobName,
 		manila.DBSyncCommand,
+		0, // no need to delay dbSync
 	)
 	dbSyncjob := job.NewJob(
 		jobDef,
@@ -799,6 +800,7 @@ func (r *ManilaReconciler) reconcileNormal(ctx context.Context, instance *manila
 			ptr.To(manila.TTL),
 			fmt.Sprintf("%s-%s", manila.SvcCleanupJobName, hash[:manila.TruncateHash]),
 			manila.SvcCleanupCommand,
+			manila.ManilaServiceCleanupDelay,
 		)
 		shareCleanupJob := job.NewJob(
 			jobDef,

pkg/manila/const.go

@@ -43,12 +43,12 @@ const (
 	ManilaUserID int64 = 42429
 	// ManilaGroupID -
 	ManilaGroupID int64 = 42429
-
 	// ManilaPublicPort -
 	ManilaPublicPort int32 = 8786
 	// ManilaInternalPort -
 	ManilaInternalPort int32 = 8786
-
+	// ManilaServiceCleanupDelay -
+	ManilaServiceCleanupDelay int32 = 120
 	// ManilaExtraVolTypeUndefined can be used to label an extraMount which
 	// is not associated with a specific backend
 	ManilaExtraVolTypeUndefined storage.ExtraVolType = "Undefined"

pkg/manila/job.go

@@ -17,6 +17,7 @@ func Job(
 	ttl *int32,
 	jobName string,
 	jobCommand string,
+	delay int32,
 ) *batchv1.Job {
 	var config0644AccessMode int32 = 0644
 	// Unlike the individual manila services, DbSyncJob or a Job executing a
@@ -69,7 +70,8 @@ func Job(
 		},
 	}
 
-	args := []string{"-c", jobCommand}
+	delayCommand := fmt.Sprintf("sleep %d", delay)
+	args := []string{"-c", fmt.Sprintf("%s && %s", delayCommand, jobCommand)}
 
 	// add CA cert if defined
 	if instance.Spec.ManilaAPI.TLS.CaBundleSecretName != "" {