Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDDS-2185. createmrenv failure not reflected in acceptance test result 

Closes #1533
This commit is contained in:
Doroszlai, Attila 2019-09-27 12:47:25 +02:00 committed by Márton Elek
parent 8a9ede5cff
commit a93a139b5d
No known key found for this signature in database
GPG Key ID: D51EA8F00EE79B28
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hadoop-ozone/dist/src/main/compose/testlib.sh vendored
View File

@ -22,11 +22,14 @@ RESULT_DIR=${RESULT_DIR:-"$COMPOSE_DIR/result"}
RESULT_DIR_INSIDE="/tmp/smoketest/$(basename "$COMPOSE_ENV_NAME")/result" RESULT_DIR_INSIDE="/tmp/smoketest/$(basename "$COMPOSE_ENV_NAME")/result"
SMOKETEST_DIR_INSIDE="${OZONE_DIR:-/opt/hadoop}/smoketest" SMOKETEST_DIR_INSIDE="${OZONE_DIR:-/opt/hadoop}/smoketest"
#delete previous results ## @description create results directory, purging any prior data
rm -rf "$RESULT_DIR" create_results_dir() {
mkdir -p "$RESULT_DIR" #delete previous results
#Should be writeable from the docker containers where user is different. rm -rf "$RESULT_DIR"
chmod ogu+w "$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 ## @description print the number of datanodes up
## @param the docker-compose file ## @param the docker-compose file
@ -81,6 +84,8 @@ wait_for_datanodes(){
start_docker_env(){ start_docker_env(){
local -i datanode_count=${1:-3} local -i datanode_count=${1:-3}
create_results_dir
docker-compose -f "$COMPOSE_FILE" down docker-compose -f "$COMPOSE_FILE" down
docker-compose -f "$COMPOSE_FILE" up -d --scale datanode="${datanode_count}" \ docker-compose -f "$COMPOSE_FILE" up -d --scale datanode="${datanode_count}" \
&& wait_for_datanodes "$COMPOSE_FILE" "${datanode_count}" \ && wait_for_datanodes "$COMPOSE_FILE" "${datanode_count}" \