Skip to content
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.

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

HDDS-4204. upgrade docker environment does not work with KEEP_RUNNING=true #1388

Merged
merged 2 commits into from
Sep 7, 2020

Conversation

adoroszlai
Copy link
Contributor

@adoroszlai adoroszlai commented Sep 3, 2020

What changes were proposed in this pull request?

Ozone upgrade test fails if run with KEEP_RUNNING=true. The variable is applied to both runs (pre- and post-upgrade), but pre-upgrade containers should be stopped regardless, since they will be replaced by the new ones.

Also remove leftover debug directory creation.

https://issues.apache.org/jira/browse/HDDS-4204

How was this patch tested?

Tested locally:

$ cd hadoop-ozone/dist/target/ozone-1.1.0-SNAPSHOT/compose/upgrade
$ KEEP_RUNNING=true ./test.sh
...
Stopping upgrade_om_1    ...
...
Readdata :: Smoketest ozone cluster startup                           | PASS |
...

Regular CI:
https://github.com/adoroszlai/hadoop-ozone/runs/1067273739

@adoroszlai adoroszlai self-assigned this Sep 3, 2020
@@ -26,7 +26,6 @@ export COMPOSE_DIR
export OZONE_VOLUME

mkdir -p "${OZONE_VOLUME}"/{dn1,dn2,dn3,om,recon,s3g,scm}
mkdir -p "${OZONE_VOLUME}/debug"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/debug is leftover means it is unused now?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. I had added it for a debug container while trying to find out the cause of permission problems in GitHub Actions (it was working fine locally). I removed the container in the final version, but forgot about the directory.

Copy link
Member

@elek elek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 thanks the fix

@elek elek merged commit 53353c0 into apache:master Sep 7, 2020
@adoroszlai adoroszlai deleted the HDDS-4204 branch September 9, 2020 00:20
@adoroszlai
Copy link
Contributor Author

Thanks @amaliujia for the review, and @elek for reviewing and committing it.

llemec pushed a commit to llemec/hadoop-ozone that referenced this pull request Sep 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants