Skip to content

Commit

Permalink
HDDS-2185. createmrenv failure not reflected in acceptance test result
Browse files Browse the repository at this point in the history
  • Loading branch information
adoroszlai authored and ahussein committed Oct 29, 2019
1 parent 25e4e7e commit 7174369
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions hadoop-ozone/dist/src/main/compose/testlib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,14 @@ RESULT_DIR=${RESULT_DIR:-"$COMPOSE_DIR/result"}
RESULT_DIR_INSIDE="/tmp/smoketest/$(basename "$COMPOSE_ENV_NAME")/result"
SMOKETEST_DIR_INSIDE="${OZONE_DIR:-/opt/hadoop}/smoketest"

#delete previous results
rm -rf "$RESULT_DIR"
mkdir -p "$RESULT_DIR"
#Should be writeable from the docker containers where user is different.
chmod ogu+w "$RESULT_DIR"
## @description create results directory, purging any prior data
create_results_dir() {
#delete previous results
rm -rf "$RESULT_DIR"
mkdir -p "$RESULT_DIR"
#Should be writeable from the docker containers where user is different.
chmod ogu+w "$RESULT_DIR"
}

## @description print the number of datanodes up
## @param the docker-compose file
Expand Down Expand Up @@ -81,6 +84,8 @@ wait_for_datanodes(){
start_docker_env(){
local -i datanode_count=${1:-3}

create_results_dir

docker-compose -f "$COMPOSE_FILE" down
docker-compose -f "$COMPOSE_FILE" up -d --scale datanode="${datanode_count}" \
&& wait_for_datanodes "$COMPOSE_FILE" "${datanode_count}" \
Expand Down

0 comments on commit 7174369

Please sign in to comment.