This is an automated email from the ASF dual-hosted git repository. avijayan pushed a commit to branch HDDS-3698-upgrade in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
commit 1395451d2c5b2d08fa3f7227f31317311c8fb1a9 Author: maobaolong <[email protected]> AuthorDate: Fri Aug 28 14:39:44 2020 +0800 HDDS-4137. Turn on the verbose mode of safe mode check on testlib (#1343) --- hadoop-ozone/dist/src/main/compose/testlib.sh | 4 ++-- hadoop-ozone/dist/src/main/compose/upgrade/versions/ozone-0.5.0.sh | 1 + hadoop-ozone/dist/src/main/compose/upgrade/versions/ozone-1.0.0.sh | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hadoop-ozone/dist/src/main/compose/testlib.sh b/hadoop-ozone/dist/src/main/compose/testlib.sh index b000c91..228572f 100755 --- a/hadoop-ozone/dist/src/main/compose/testlib.sh +++ b/hadoop-ozone/dist/src/main/compose/testlib.sh @@ -63,7 +63,7 @@ find_tests(){ ## @description wait until safemode exit (or 180 seconds) wait_for_safemode_exit(){ # version-dependent - : ${OZONE_ADMIN_COMMAND:=admin} + : ${OZONE_SAFEMODE_STATUS_COMMAND:=ozone admin safemode status --verbose} #Reset the timer SECONDS=0 @@ -72,7 +72,7 @@ wait_for_safemode_exit(){ while [[ $SECONDS -lt 180 ]]; do #This line checks the safemode status in scm - local command="ozone ${OZONE_ADMIN_COMMAND} safemode status" + local command="${OZONE_SAFEMODE_STATUS_COMMAND}" if [[ "${SECURITY_ENABLED}" == 'true' ]]; then status=$(docker-compose exec -T scm bash -c "kinit -k HTTP/[email protected] -t /etc/security/keytabs/HTTP.keytab && $command" || true) else diff --git a/hadoop-ozone/dist/src/main/compose/upgrade/versions/ozone-0.5.0.sh b/hadoop-ozone/dist/src/main/compose/upgrade/versions/ozone-0.5.0.sh index 68f6c75..667ce95 100644 --- a/hadoop-ozone/dist/src/main/compose/upgrade/versions/ozone-0.5.0.sh +++ b/hadoop-ozone/dist/src/main/compose/upgrade/versions/ozone-0.5.0.sh @@ -16,3 +16,4 @@ # limitations under the License. export OZONE_ADMIN_COMMAND=scmcli +export OZONE_SAFEMODE_STATUS_COMMAND='ozone scmcli safemode status' diff --git a/hadoop-ozone/dist/src/main/compose/upgrade/versions/ozone-1.0.0.sh b/hadoop-ozone/dist/src/main/compose/upgrade/versions/ozone-1.0.0.sh index bab1dba..3ff23e0 100644 --- a/hadoop-ozone/dist/src/main/compose/upgrade/versions/ozone-1.0.0.sh +++ b/hadoop-ozone/dist/src/main/compose/upgrade/versions/ozone-1.0.0.sh @@ -16,3 +16,4 @@ # limitations under the License. export OZONE_ADMIN_COMMAND=admin +export OZONE_SAFEMODE_STATUS_COMMAND='ozone admin safemode status --verbose' --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
