Skip to content

HDDS-4762. Merge ozone-ha and ozone-om-ha-s3 #1855

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
elek merged 2 commits into from
Feb 5, 2021
Merged

HDDS-4762. Merge ozone-ha and ozone-om-ha-s3 #1855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e65ee53
HDDS-4760. Intermittent failure in ozone-ha acceptance test
adoroszlai Jan 29, 2021
fdbe66c
HDDS-4762. Merge ozone-ha and ozone-om-ha-s3
adoroszlai Jan 29, 2021
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
1 change: 0 additions & 1 deletion hadoop-ozone/dist/src/main/compose/ozone-ha/docker-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ OZONE-SITE.XML_ozone.scm.block.client.address=scm
OZONE-SITE.XML_ozone.scm.container.size=1GB
OZONE-SITE.XML_ozone.metadata.dirs=/data/metadata
OZONE-SITE.XML_ozone.scm.client.address=scm
OZONE-SITE.XML_ozone.client.failover.max.attempts=6
OZONE-SITE.XML_hdds.datanode.dir=/data/hdds
OZONE-SITE.XML_ozone.datanode.pipeline.limit=1

Expand Down
3 changes: 3 additions & 0 deletions hadoop-ozone/dist/src/main/compose/ozone-ha/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ source "$COMPOSE_DIR/../testlib.sh"
start_docker_env

execute_robot_test scm basic/ozone-shell-single.robot
execute_robot_test scm basic/links.robot
execute_robot_test scm s3
execute_robot_test scm freon

stop_docker_env

Expand Down
19 changes: 0 additions & 19 deletions hadoop-ozone/dist/src/main/compose/ozone-om-ha-s3/.env
View file
Open in desktop

This file was deleted.

99 changes: 0 additions & 99 deletions hadoop-ozone/dist/src/main/compose/ozone-om-ha-s3/docker-compose.yaml
View file
Open in desktop

This file was deleted.

41 changes: 0 additions & 41 deletions hadoop-ozone/dist/src/main/compose/ozone-om-ha-s3/docker-config
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions hadoop-ozone/dist/src/main/compose/ozone-om-ha-s3/test.sh
View file
Open in desktop

This file was deleted.