HDDS-2045. Partially started compose cluster left running

Closes #1358
apache · Aug 29, 2019 · c749f62 · c749f62
1 parent 371c9eb
commit c749f62
Showing 1 changed file with 8 additions and 3 deletions.
diff --git 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.