support databackup

Signed-off-by: xliuqq <xlzq1992@gmail.com>

Author: xliuqq

charts/fluid-databackup/alluxio/templates/databackup.yaml

@@ -89,6 +89,11 @@ spec:
           mountPath: /etc/group
           readOnly: true
         {{- end}}
+  {{- if .Values.dataBackup.affinity }}
+  affinity:
+{{ toYaml .Values.dataBackup.affinity | indent 4 }}
+  {{- end }}
+
   restartPolicy: Never
   volumes:
     {{- if .Values.dataBackup.workdir }}

charts/fluid-databackup/alluxio/values.yaml

@@ -45,6 +45,8 @@ dataBackup:
   # Description: optional image pull secrets on DataLoad pods
   imagePullSecrets: []
 
+  affinity:
+
 initUsers:
   enabled: false
   image: registry.cn-hangzhou.aliyuncs.com/fluid/init-users

charts/fluid-dataprocess/common/templates/job.yaml

@@ -71,7 +71,7 @@ spec:
           {{- end }}
       {{- if .Values.dataProcess.scriptProcessor.affinity }}
       affinity:
-        {{ .Values.dataProcess.scriptProcessor.affinity }}
+{{ toYaml .Values.dataProcess.scriptProcessor.affinity | indent 8  }}
       {{- end }}
       volumes:
         - name: script-cm-vol

pkg/controllers/v1alpha1/databackup/status_handler.go

@@ -17,6 +17,8 @@
 package databackup
 
 import (
+	"fmt"
+	"github.com/fluid-cloudnative/fluid/pkg/dataflow"
 	"time"
 
 	"github.com/fluid-cloudnative/fluid/api/v1alpha1"
@@ -51,6 +53,14 @@ func (o *OnceHandler) GetOperationStatus(ctx runtime.ReconcileRequestContext, op
 	if !kubeclient.IsFinishedPod(backupPod) {
 		return
 	}
+	// set the node labels in status when job finished
+	if result.NodeLabels == nil {
+		// generate the node labels
+		result.NodeLabels, err = dataflow.GenerateNodeLabels(ctx.Client, backupPod)
+		if err != nil {
+			return nil, fmt.Errorf("error to generate the node labels: %v", err)
+		}
+	}
 
 	var finishTime time.Time
 	if len(backupPod.Status.Conditions) != 0 {

pkg/ddc/alluxio/backup_data.go

@@ -18,6 +18,7 @@ package alluxio
 
 import (
 	"fmt"
+	"github.com/fluid-cloudnative/fluid/pkg/dataflow"
 	"os"
 	"strconv"
 	"strings"
@@ -132,6 +133,12 @@ func (e *AlluxioEngine) generateDataBackupValueFile(ctx cruntime.ReconcileReques
 	dataBackup.PVCName = pvcName
 	dataBackup.Path = path
 
+	// inject the node affinity by previous operation pod.
+	dataBackup.Affinity, err = dataflow.InjectAffinityByRunAfterOp(e.Client, databackup.Spec.RunAfter, databackup.Namespace, nil)
+	if err != nil {
+		return "", err
+	}
+
 	dataBackupValue := cdatabackup.DataBackupValue{DataBackup: dataBackup}
 
 	dataBackupValue.InitUsers = common.InitUsers{

pkg/ddc/goosefs/backup_data.go

@@ -21,6 +21,7 @@ import (
 	datav1alpha1 "github.com/fluid-cloudnative/fluid/api/v1alpha1"
 	"github.com/fluid-cloudnative/fluid/pkg/common"
 	cdatabackup "github.com/fluid-cloudnative/fluid/pkg/databackup"
+	"github.com/fluid-cloudnative/fluid/pkg/dataflow"
 	"github.com/fluid-cloudnative/fluid/pkg/ddc/goosefs/operations"
 	cruntime "github.com/fluid-cloudnative/fluid/pkg/runtime"
 	"github.com/fluid-cloudnative/fluid/pkg/utils"
@@ -132,6 +133,12 @@ func (e *GooseFSEngine) generateDataBackupValueFile(ctx cruntime.ReconcileReques
 	dataBackup.PVCName = pvcName
 	dataBackup.Path = path
 
+	// inject the node affinity by previous operation pod.
+	dataBackup.Affinity, err = dataflow.InjectAffinityByRunAfterOp(e.Client, databackup.Spec.RunAfter, databackup.Namespace, nil)
+	if err != nil {
+		return "", err
+	}
+
 	dataBackupValue := cdatabackup.DataBackupValue{DataBackup: dataBackup}
 
 	dataBackupValue.InitUsers = common.InitUsers{

pkg/utils/kubeclient/job.go

@@ -52,7 +52,7 @@ func GetSucceedPodForJob(c client.Client, job *v1.Job) (*corev1.Pod, error) {
 	})
 
 	for _, pod := range podList.Items {
-		if pod.Status.Phase == corev1.PodSucceeded {
+		if IsSucceededPod(&pod) {
 			return &pod, nil
 		}
 	}