Skip to content

Commit c3b3980

Browse files
authored
HDDS-14635. kubernetes check fails after restarting datanodes (#9772)
1 parent 6f36abf commit c3b3980

3 files changed

Lines changed: 25 additions & 4 deletions

File tree

hadoop-ozone/dist/src/main/k8s/definitions/ozone/config.yaml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@ data:
3838
OZONE-SITE.XML_ozone.scm.client.address: "scm-0.scm"
3939
OZONE-SITE.XML_ozone.scm.datanode.id.dir: "/data/metadata"
4040
OZONE-SITE.XML_ozone.scm.names: "scm-0.scm"
41-
LOG4J.PROPERTIES_log4j.rootLogger: "INFO, stdout"
42-
LOG4J.PROPERTIES_log4j.appender.stdout: "org.apache.log4j.ConsoleAppender"
43-
LOG4J.PROPERTIES_log4j.appender.stdout.layout: "org.apache.log4j.PatternLayout"
44-
LOG4J.PROPERTIES_log4j.appender.stdout.layout.ConversionPattern: "%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n"
41+
OZONE-SITE.XML_ozone.client.max.retries: "15"
42+
OZONE-SITE.XML_ozone.client.retry.interval: "1"
43+
LOG4J.PROPERTIES_hadoop.root.logger: "INFO,console"
44+
LOG4J.PROPERTIES_log4j.rootLogger: "${hadoop.root.logger}"
45+
LOG4J.PROPERTIES_log4j.appender.console: "org.apache.log4j.ConsoleAppender"
46+
LOG4J.PROPERTIES_log4j.appender.console.layout: "org.apache.log4j.PatternLayout"
47+
LOG4J.PROPERTIES_log4j.appender.console.layout.ConversionPattern: "%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n"

hadoop-ozone/dist/src/main/k8s/examples/ozone/test.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ execute_robot_test ${SCM} -v PREFIX:pre smoketest/freon/validate.robot
3535
kubectl delete pod datanode-0 datanode-1 datanode-2
3636

3737
wait_for_startup
38+
wait_for_pipeline
3839

3940
execute_robot_test ${SCM} -v PREFIX:pre smoketest/freon/validate.robot
4041
execute_robot_test ${SCM} -v PREFIX:post smoketest/freon/generate.robot

hadoop-ozone/dist/src/main/k8s/examples/testlib.sh

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,23 @@ wait_for_startup(){
5050
fi
5151
}
5252

53+
wait_for_pipeline() {
54+
retry assert_pipeline_exists
55+
}
56+
57+
execute_command_in_container() {
58+
CONTAINER="$1"
59+
shift 1 #Remove first argument which was the container name
60+
61+
kubectl exec "${CONTAINER}" -- "$@"
62+
}
63+
64+
assert_pipeline_exists() {
65+
local count
66+
count=$(execute_command_in_container scm-0 ozone admin pipeline list --state OPEN --filter-by-factor THREE --json | jq -r 'length')
67+
[[ $count -gt 0 ]]
68+
}
69+
5370
all_pods_are_running() {
5471
local -i running=$(kubectl get pod --field-selector status.phase=Running | grep -v 'STATUS' | wc -l)
5572
local -i all=$(kubectl get pod | grep -v 'STATUS' | wc -l)

0 commit comments

Comments
 (0)