This is an automated email from the ASF dual-hosted git repository.
elek pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new c749f62 HDDS-2045. Partially started compose cluster left running
c749f62 is described below
commit c749f6247075274954f8302dd45feee984d9bd10
Author: Doroszlai, Attila <adorosz...@apache.org>
AuthorDate: Thu Aug 29 09:46:50 2019 +0200
HDDS-2045. Partially started compose cluster left running
Closes #1358
---
hadoop-ozone/dist/src/main/compose/testlib.sh | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/hadoop-ozone/dist/src/main/compose/testlib.sh
b/hadoop-ozone/dist/src/main/compose/testlib.sh
index ffc6da2..9aa7c48 100755
--- a/hadoop-ozone/dist/src/main/compose/testlib.sh
+++ b/hadoop-ozone/dist/src/main/compose/testlib.sh
@@ -82,9 +82,14 @@ start_docker_env(){
local -i datanode_count=${1:-3}
docker-compose -f "$COMPOSE_FILE" down
- docker-compose -f "$COMPOSE_FILE" up -d --scale datanode="${datanode_count}"
- wait_for_datanodes "$COMPOSE_FILE" "${datanode_count}"
- sleep 10
+ docker-compose -f "$COMPOSE_FILE" up -d --scale datanode="${datanode_count}"
\
+ && wait_for_datanodes "$COMPOSE_FILE" "${datanode_count}" \
+ && sleep 10
+
+ if [[ $? -gt 0 ]]; then
+ docker-compose -f "$COMPOSE_FILE" down
+ return 1
+ fi
}
## @description Execute robot tests in a specific container.
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
