pb-4844: Making changes for delete and maintenance, since they dont u…

…se DE CR, need to take value from job options for them Signed-off-by: root <[email protected]>
portworx · Dec 8, 2023 · 7cd42f6 · 7cd42f6
1 parent 57378b5
commit 7cd42f6
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 9 deletions.
diff --git a/pkg/drivers/kopiabackup/kopiabackup.go b/pkg/drivers/kopiabackup/kopiabackup.go
@@ -287,7 +287,7 @@ func jobFor(
 		"/data",
 	}, " ")
 
-	cmd = utils.CheckAndAddKopiaDebugModeAnnotationsCommand(cmd, jobOption)
+	cmd = utils.CheckAndAddKopiaDebugModeEnabled(cmd, jobOption)
 
 	if jobOption.Compression != "" {
 		splitCmd := strings.Split(cmd, " ")

diff --git a/pkg/drivers/kopiadelete/kopiadelete.go b/pkg/drivers/kopiadelete/kopiadelete.go
@@ -201,7 +201,7 @@ func jobFor(
 		jobOption.VolumeBackupDeleteNamespace,
 	}, " ")
 
-	cmd = utils.CheckAndAddKopiaDebugModeAnnotationsCommand(cmd, jobOption)
+	cmd = utils.CheckAndAddKopiaDebugModeEnabled(cmd, jobOption)
 
 	kopiaExecutorImage, imageRegistrySecret, err := utils.GetExecutorImageAndSecret(drivers.KopiaExecutorImage,
 		jobOption.KopiaImageExecutorSource,

diff --git a/pkg/drivers/kopiamaintenance/kopiamaintenance.go b/pkg/drivers/kopiamaintenance/kopiamaintenance.go
@@ -204,7 +204,7 @@ func jobFor(
 		jobOption.MaintenanceType,
 	}, " ")
 
-	cmd = utils.CheckAndAddKopiaDebugModeAnnotationsCommand(cmd, jobOption)
+	cmd = utils.CheckAndAddKopiaDebugModeEnabled(cmd, jobOption)
 
 	kopiaExecutorImage, imageRegistrySecret, err := utils.GetExecutorImageAndSecret(drivers.KopiaExecutorImage,
 		jobOption.KopiaImageExecutorSource,

diff --git a/pkg/drivers/kopiarestore/kopiarestore.go b/pkg/drivers/kopiarestore/kopiarestore.go
@@ -206,7 +206,7 @@ func jobFor(
 		vb.Status.SnapshotID,
 	}, " ")
 
-	cmd = utils.CheckAndAddKopiaDebugModeAnnotationsCommand(cmd, jobOption)
+	cmd = utils.CheckAndAddKopiaDebugModeEnabled(cmd, jobOption)
 
 	kopiaExecutorImage, imageRegistrySecret, err := utils.GetExecutorImageAndSecret(drivers.KopiaExecutorImage,
 		jobOption.KopiaImageExecutorSource,

diff --git a/pkg/drivers/utils/utils.go b/pkg/drivers/utils/utils.go
@@ -882,6 +882,10 @@ func IsJobPodMountFailed(job *batchv1.Job, namespace string) bool {
 }
 
 func IsKopiaDebugModeAnnotationsEnabled(jobOption drivers.JobOpts) bool {
+	if jobOption.KopiaDebugMode {
+		return true
+	}
+
 	dataExportCR, err := kdmpops.Instance().GetDataExport(context.Background(), jobOption.DataExportName, jobOption.Namespace)
 	if err != nil {
 		logrus.Tracef("error reading data export job: %v", err)
@@ -895,11 +899,16 @@ func IsKopiaDebugModeAnnotationsEnabled(jobOption drivers.JobOpts) bool {
 	return false
 }
 
-func CheckAndAddKopiaDebugModeAnnotationsCommand(cmd string, jobOption drivers.JobOpts) string {
+func CheckAndAddKopiaDebugModeEnabled(cmd string, jobOption drivers.JobOpts) string {
 	if IsKopiaDebugModeAnnotationsEnabled(jobOption) {
-		splitCmd := strings.Split(cmd, " ")
-		splitCmd = append(splitCmd, "--log-level", "debug")
-		cmd = strings.Join(splitCmd, " ")
+		cmd = AddKopiaDebugModeCommand(cmd)
 	}
 	return cmd
 }
+
+func AddKopiaDebugModeCommand(cmd string) string {
+	splitCmd := strings.Split(cmd, " ")
+	splitCmd = append(splitCmd, "--log-level", "debug")
+	cmd = strings.Join(splitCmd, " ")
+	return cmd
+}
diff --git a/pkg/executor/kopia/kopiabackup.go b/pkg/executor/kopia/kopiabackup.go
@@ -699,4 +699,4 @@ func addLogLevelDebugToCommand(kopiaCommand *kopia.Command, logLevelDebug string
 		kopiaCommand.AddArg("debug")
 	}
 	return kopiaCommand
-}
+}
-Original file line number
+Diff line change
@@ Expand Up @@
     		kopiaCommand.AddArg("debug")
     	}
     	return kopiaCommand
-    }
+    }