test: fix test fail

lwpk110 · Aug 22, 2024 · 90d558d · 90d558d
1 parent c129348
commit 90d558d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/internal/common/util.go b/internal/common/util.go
@@ -249,7 +249,7 @@ func GetCommonVolumes(clusterConfig *hdfsv1alpha1.ClusterConfigSpec, instanceNam
 	limit := resource.MustParse("150Mi")
 	volumes := []corev1.Volume{
 		{
-			Name: LogVolumeName(),
+			Name: hdfsv1alpha1.KubedoopLogVolumeMountName,
 			VolumeSource: corev1.VolumeSource{
 				EmptyDir: &corev1.EmptyDirVolumeSource{
 					SizeLimit: &limit,
@@ -299,14 +299,10 @@ func GetCommonCommand() []string {
 	return []string{"/bin/bash", "-x", "-euo", "pipefail", "-c"}
 }
 
-func LogVolumeName() string {
-	return "log"
-}
-
 func GetCommonVolumeMounts(clusterConfig *hdfsv1alpha1.ClusterConfigSpec) []corev1.VolumeMount {
 	mounts := []corev1.VolumeMount{
 		{
-			Name:      LogVolumeName(),
+			Name:      hdfsv1alpha1.KubedoopLogVolumeMountName,
 			MountPath: constants.KubedoopLogDir,
 		},
 	}

diff --git a/internal/controller/name/container/format_namenode.go b/internal/controller/name/container/format_namenode.go
@@ -60,7 +60,7 @@ func (f *FormatNameNodeContainerBuilder) VolumeMount() []corev1.VolumeMount {
 		},
 		{
 			Name:      hdfsv1alpha1.DataVolumeMountName,
-			MountPath: constants.KubedoopConfigDir,
+			MountPath: constants.KubedoopDataDir,
 		},
 	}
 	return append(mounts, fnMounts...)
@@ -86,6 +86,7 @@ cp /kubedoop/mount/config/format-namenodes/format-namenodes.log4j.properties /ku
 
 {{- end }}
 
+
 echo "Start formatting namenode $POD_NAME. Checking for active namenodes:"
 ` + fmt.Sprintf("for namenode_id in %s", namenodeIds) + "\n" +
 		`do

diff --git a/internal/controller/name/container/namenode.go b/internal/controller/name/container/namenode.go
@@ -60,7 +60,7 @@ func (n *NameNodeContainerBuilder) VolumeMount() []corev1.VolumeMount {
 		},
 		{
 			Name:      hdfsv1alpha1.DataVolumeMountName,
-			MountPath: constants.KubedoopConfigDir,
+			MountPath: constants.KubedoopDataDir,
 		},
 	}
 	return append(mounts, nnMounts...)
@@ -115,6 +115,9 @@ func (n *NameNodeContainerBuilder) CommandArgs() []string {
 	args = append(args, `mkdir -p /kubedoop/config/namenode
 cp /kubedoop/mount/config/namenode/*.xml /kubedoop/config/namenode
 cp /kubedoop/mount/config/namenode/namenode.log4j.properties /kubedoop/config/namenode/log4j.properties`)
+
+	// args = append(args, "while true; do sleep 1; done")
+
 	if common.IsKerberosEnabled(n.clusterConfig) {
 		args = append(args, `{{ if .kerberosEnabled}}
 {{- .kerberosEnv}}

diff --git a/test/e2e/vector/hdfs.yaml b/test/e2e/vector/hdfs.yaml
@@ -10,9 +10,6 @@ metadata:
   name: hdfscluster-sample
   namespace: ($namespace)
 spec:
-  image:
-    repository: quay.io/zncdatadev/hadoop
-    tag: 3.3.4
   clusterConfig:
     zookeeperConfigMapName: sample-hdfs-znode
     vectorAggregatorConfigMapName: vector-aggregator-discovery