From 6b92a37af1ca5a14d3cf580b366f5a1e4f04ac2e Mon Sep 17 00:00:00 2001
From: Anastasia Filippova <157118483+afilpp@users.noreply.github.com>
Date: Fri, 5 Apr 2024 15:52:51 +0300
Subject: [PATCH] HDDS-10644. Intermittent failure in testBalancer.robot
(#6481)
---
.../dist/src/main/compose/ozone-balancer/docker-config | 3 ---
.../dist/src/main/smoketest/balancer/testBalancer.robot | 7 ++++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-balancer/docker-config b/hadoop-ozone/dist/src/main/compose/ozone-balancer/docker-config
index 60e8afe6e1..5e715e5a56 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-balancer/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/ozone-balancer/docker-config
@@ -51,9 +51,6 @@ OZONE-SITE.XML_ozone.scm.primordial.node.id=scm1
OZONE-SITE.XML_hdds.container.report.interval=30s
OZONE-SITE.XML_ozone.om.s3.grpc.server_enabled=true
OZONE-SITE.XML_ozone.recon.db.dir=/data/metadata/recon
-OZONE-SITE.XML_ozone.recon.address=recon:9891
-OZONE-SITE.XML_ozone.recon.http-address=0.0.0.0:9888
-OZONE-SITE.XML_ozone.recon.https-address=0.0.0.0:9889
OZONE-SITE.XML_dfs.container.ratis.datastream.enabled=true
OZONE_CONF_DIR=/etc/hadoop
diff --git a/hadoop-ozone/dist/src/main/smoketest/balancer/testBalancer.robot b/hadoop-ozone/dist/src/main/smoketest/balancer/testBalancer.robot
index 6e2fb9d85a..49679587be 100644
--- a/hadoop-ozone/dist/src/main/smoketest/balancer/testBalancer.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/balancer/testBalancer.robot
@@ -95,15 +95,16 @@ Get Uuid
Close All Containers
FOR ${INDEX} IN RANGE 15
${container} = Execute ozone admin container list --state OPEN | jq -r 'select(.replicationConfig.replicationFactor == "THREE") | .containerID' | head -1
- EXIT FOR LOOP IF "${container}" == ""
- Execute ozone admin container close "${container}"
+ EXIT FOR LOOP IF "${container}" == "${EMPTY}"
+ ${message} = Execute And Ignore Error ozone admin container close "${container}"
+ Run Keyword If '${message}' != '${EMPTY}' Should Contain ${message} is in closing state
${output} = Execute ozone admin container info "${container}"
Should contain ${output} CLOS
END
Wait until keyword succeeds 3min 10sec All container is closed
All container is closed
- ${output} = Execute ozone admin container list --state OPEN
+ ${output} = Execute ozone admin container list --state OPEN
Should Be Empty ${output}
Get Datanode Ozone Used Bytes Info
--
GitLab