From ac127fab23d11a79a4ed0eff79010e20fc6a33dd Mon Sep 17 00:00:00 2001 From: maobaolong <307499405@qq.com> Date: Mon, 24 Aug 2020 20:57:07 +0800 Subject: [PATCH 1/4] HDDS-4137. Turn on the verbose mode of safe mode check on testlib --- hadoop-ozone/dist/src/main/compose/testlib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-ozone/dist/src/main/compose/testlib.sh b/hadoop-ozone/dist/src/main/compose/testlib.sh index b000c913c1f7..bdd264be1021 100755 --- a/hadoop-ozone/dist/src/main/compose/testlib.sh +++ b/hadoop-ozone/dist/src/main/compose/testlib.sh @@ -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 ${OZONE_ADMIN_COMMAND} safemode status --verbose" if [[ "${SECURITY_ENABLED}" == 'true' ]]; then status=$(docker-compose exec -T scm bash -c "kinit -k HTTP/scm@EXAMPLE.COM -t /etc/security/keytabs/HTTP.keytab && $command" || true) else From 58c79eab4b2c65b1f2989a8f5ba1147ea6c3554c Mon Sep 17 00:00:00 2001 From: baoloongmao Date: Wed, 26 Aug 2020 00:04:42 +0800 Subject: [PATCH 2/4] Fix upgrade acceptance test. --- hadoop-ozone/dist/src/main/compose/testlib.sh | 2 +- .../dist/src/main/compose/upgrade/versions/ozone-0.5.0.sh | 1 + .../dist/src/main/compose/upgrade/versions/ozone-1.0.0.sh | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hadoop-ozone/dist/src/main/compose/testlib.sh b/hadoop-ozone/dist/src/main/compose/testlib.sh index bdd264be1021..24a7de3b170b 100755 --- a/hadoop-ozone/dist/src/main/compose/testlib.sh +++ b/hadoop-ozone/dist/src/main/compose/testlib.sh @@ -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 --verbose" + local command="${OZONE_SAFEMODE_STATUS_COMMAND}" if [[ "${SECURITY_ENABLED}" == 'true' ]]; then status=$(docker-compose exec -T scm bash -c "kinit -k HTTP/scm@EXAMPLE.COM -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 68f6c75764df..667ce959026a 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 bab1dba91baf..3ff23e0441bc 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' From ec492f969532e11d20f4743c28d25af34a88c693 Mon Sep 17 00:00:00 2001 From: baoloongmao Date: Thu, 27 Aug 2020 10:38:29 +0800 Subject: [PATCH 3/4] Init the OZONE_SAFEMODE_STATUS_COMMAND and set a default value. --- hadoop-ozone/dist/src/main/compose/testlib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-ozone/dist/src/main/compose/testlib.sh b/hadoop-ozone/dist/src/main/compose/testlib.sh index 24a7de3b170b..228572fe2c73 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 From 183296f50fbc084cc49995eeb51c0797a09b4c00 Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Thu, 27 Aug 2020 16:10:59 +0200 Subject: [PATCH 4/4] trigger new CI check