You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by el...@apache.org on 2021/02/05 10:49:53 UTC
[ozone] branch master updated: HDDS-4762. Merge ozone-ha and
ozone-om-ha-s3 (#1855)
This is an automated email from the ASF dual-hosted git repository.
elek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 557d094 HDDS-4762. Merge ozone-ha and ozone-om-ha-s3 (#1855)
557d094 is described below
commit 557d094b7d0c085b48ed35e95bb5c244d77255f0
Author: Doroszlai, Attila <64...@users.noreply.github.com>
AuthorDate: Fri Feb 5 11:49:32 2021 +0100
HDDS-4762. Merge ozone-ha and ozone-om-ha-s3 (#1855)
---
.../dist/src/main/compose/ozone-ha/test.sh | 3 +
.../dist/src/main/compose/ozone-om-ha-s3/.env | 19 -----
.../compose/ozone-om-ha-s3/docker-compose.yaml | 99 ----------------------
.../src/main/compose/ozone-om-ha-s3/docker-config | 41 ---------
.../dist/src/main/compose/ozone-om-ha-s3/test.sh | 38 ---------
5 files changed, 3 insertions(+), 197 deletions(-)
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-ha/test.sh b/hadoop-ozone/dist/src/main/compose/ozone-ha/test.sh
index a14aa9c..51bff59 100755
--- a/hadoop-ozone/dist/src/main/compose/ozone-ha/test.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozone-ha/test.sh
@@ -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
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-om-ha-s3/.env b/hadoop-ozone/dist/src/main/compose/ozone-om-ha-s3/.env
deleted file mode 100644
index 9279c5b..0000000
--- a/hadoop-ozone/dist/src/main/compose/ozone-om-ha-s3/.env
+++ /dev/null
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-HDDS_VERSION=${hdds.version}
-OZONE_RUNNER_VERSION=${docker.ozone-runner.version}
-OZONE_OPTS=
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-om-ha-s3/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozone-om-ha-s3/docker-compose.yaml
deleted file mode 100644
index 0f385e4..0000000
--- a/hadoop-ozone/dist/src/main/compose/ozone-om-ha-s3/docker-compose.yaml
+++ /dev/null
@@ -1,99 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-version: "3"
-services:
- datanode:
- image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
- privileged: true #required by the profiler
- volumes:
- - ../..:/opt/hadoop
- ports:
- - 9864
- command: ["/opt/hadoop/bin/ozone","datanode"]
- env_file:
- - ./docker-config
- environment:
- OZONE_OPTS:
- om1:
- image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
- privileged: true #required by the profiler
- volumes:
- - ../..:/opt/hadoop
- ports:
- - 9880:9874
- - 9890:9872
- environment:
- ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
- OZONE_OPTS:
- env_file:
- - ./docker-config
- command: ["/opt/hadoop/bin/ozone","om"]
- om2:
- image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
- privileged: true #required by the profiler
- volumes:
- - ../..:/opt/hadoop
- ports:
- - 9882:9874
- - 9892:9872
- environment:
- ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
- OZONE_OPTS:
- env_file:
- - ./docker-config
- command: ["/opt/hadoop/bin/ozone","om"]
- om3:
- image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
- privileged: true #required by the profiler
- volumes:
- - ../..:/opt/hadoop
- ports:
- - 9884:9874
- - 9894:9872
- environment:
- ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
- OZONE_OPTS:
- env_file:
- - ./docker-config
- command: ["/opt/hadoop/bin/ozone","om"]
- scm:
- image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
- privileged: true #required by the profiler
- volumes:
- - ../..:/opt/hadoop
- ports:
- - 9876:9876
- - 9860:9860
- env_file:
- - ./docker-config
- environment:
- ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION
- OZONE-SITE.XML_hdds.scm.safemode.min.datanode: "${OZONE_SAFEMODE_MIN_DATANODES:-1}"
- OZONE_OPTS:
- command: ["/opt/hadoop/bin/ozone","scm"]
- s3g:
- image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
- volumes:
- - ../..:/opt/hadoop
- ports:
- - 9878:9878
- env_file:
- - ./docker-config
- environment:
- OZONE_OPTS:
- command: ["ozone","s3g"]
-
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-om-ha-s3/docker-config b/hadoop-ozone/dist/src/main/compose/ozone-om-ha-s3/docker-config
deleted file mode 100644
index 3d7aed7..0000000
--- a/hadoop-ozone/dist/src/main/compose/ozone-om-ha-s3/docker-config
+++ /dev/null
@@ -1,41 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-CORE-SITE.XML_fs.defaultFS=ofs://id1
-
-OZONE-SITE.XML_ozone.om.service.ids=id1
-OZONE-SITE.XML_ozone.om.nodes.id1=om1,om2,om3
-OZONE-SITE.XML_ozone.om.address.id1.om1=om1
-OZONE-SITE.XML_ozone.om.address.id1.om2=om2
-OZONE-SITE.XML_ozone.om.address.id1.om3=om3
-OZONE-SITE.XML_ozone.om.ratis.enable=true
-OZONE-SITE.XML_ozone.scm.container.size=1GB
-OZONE-SITE.XML_ozone.scm.pipeline.creation.interval=30s
-OZONE-SITE.XML_ozone.scm.pipeline.owner.container.count=1
-OZONE-SITE.XML_ozone.scm.names=scm
-OZONE-SITE.XML_ozone.scm.datanode.id.dir=/data
-OZONE-SITE.XML_ozone.scm.block.client.address=scm
-OZONE-SITE.XML_ozone.metadata.dirs=/data/metadata
-OZONE-SITE.XML_ozone.handler.type=distributed
-OZONE-SITE.XML_ozone.scm.client.address=scm
-OZONE-SITE.XML_ozone.replication=3
-OZONE-SITE.XML_hdds.datanode.dir=/data/hdds
-OZONE-SITE.XML_hdds.profiler.endpoint.enabled=true
-
-OZONE_CONF_DIR=/etc/hadoop
-OZONE_LOG_DIR=/var/log/hadoop
-
-no_proxy=om,scm,s3g,recon,kdc,localhost,127.0.0.1
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-om-ha-s3/test.sh b/hadoop-ozone/dist/src/main/compose/ozone-om-ha-s3/test.sh
deleted file mode 100644
index 4f2bd09..0000000
--- a/hadoop-ozone/dist/src/main/compose/ozone-om-ha-s3/test.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-export COMPOSE_DIR
-
-export SECURITY_ENABLED=false
-export OM_SERVICE_ID="id1"
-
-# shellcheck source=/dev/null
-source "$COMPOSE_DIR/../testlib.sh"
-
-start_docker_env
-
-execute_robot_test scm s3
-
-execute_robot_test scm freon
-
-execute_robot_test scm basic/links.robot
-
-stop_docker_env
-
-generate_report
-
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org