remove set +x and add format-zookeeper test

Author: maltesander

rust/operator-binary/src/container.rs

@@ -746,10 +746,8 @@ impl ContainerConfig {
                     r###"
                     echo "Attempt to format ZooKeeper..."
                     if [[ "0" -eq "$(echo $POD_NAME | sed -e 's/.*-//')" ]] ; then
-                      set +e
                       exclude_from_capture {hadoop_home}/bin/hdfs zkfc -formatZK -nonInteractive
                       EXITCODE=$?
-                      set -e
                       if [[ $EXITCODE -eq 0 ]]; then
                         echo "Successfully formatted"
                       elif [[ $EXITCODE -eq 2 ]]; then

tests/templates/kuttl/logging/hdfs-vector-aggregator-values.yaml.j2

@@ -102,12 +102,27 @@ customConfig:
         .pod == "test-hdfs-automatic-log-namenode-default-1" &&
         .container == "format-namenodes" &&
         .file == "container.stderr.log"
-    filteredAutomaticLogConfigNameNode0FormatZookeeper:
+    filteredAutomaticLogConfigNameNode0FormatZookeeperLog4j:
       type: filter
       inputs: [validEvents]
       condition: >-
         .pod == "test-hdfs-automatic-log-namenode-default-0" &&
-        .container == "format-zookeeper"
+        .container == "format-zookeeper" &&
+        .file == "format-zookeeper.log4j.xml"
+    filteredAutomaticLogConfigNameNode0FormatZookeeperStdout:
+      type: filter
+      inputs: [validEvents]
+      condition: >-
+        .pod == "test-hdfs-automatic-log-namenode-default-0" &&
+        .container == "format-zookeeper" &&
+        .file == "container.stdout.log"
+    filteredAutomaticLogConfigNameNode0FormatZookeeperStderr:
+      type: filter
+      inputs: [validEvents]
+      condition: >-
+        .pod == "test-hdfs-automatic-log-namenode-default-0" &&
+        .container == "format-zookeeper" &&
+        .file == "container.stderr.log"
     filteredAutomaticLogConfigDataNode0:
       type: filter
       inputs: [validEvents]