Skip to content

HDDS-4137. Turn on the verbose mode of safe mode check on testlib #1343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adoroszlai merged 4 commits into from
Aug 28, 2020
Merged

HDDS-4137. Turn on the verbose mode of safe mode check on testlib #1343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ac127fa
HDDS-4137. Turn on the verbose mode of safe mode check on testlib
maobaolong Aug 24, 2020
58c79ea
Fix upgrade acceptance test.
maobaolong Aug 25, 2020
ec492f9
Init the OZONE_SAFEMODE_STATUS_COMMAND and set a default value.
maobaolong Aug 27, 2020
183296f
trigger new CI check
adoroszlai Aug 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions hadoop-ozone/dist/src/main/compose/testlib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions hadoop-ozone/dist/src/main/compose/upgrade/versions/ozone-0.5.0.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@
# limitations under the License.

export OZONE_ADMIN_COMMAND=scmcli
export OZONE_SAFEMODE_STATUS_COMMAND='ozone scmcli safemode status'
1 change: 1 addition & 0 deletions hadoop-ozone/dist/src/main/compose/upgrade/versions/ozone-1.0.0.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@
# limitations under the License.

export OZONE_ADMIN_COMMAND=admin
export OZONE_SAFEMODE_STATUS_COMMAND='ozone admin safemode status --verbose'