You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sh...@apache.org on 2018/08/26 00:44:18 UTC
[06/50] [abbrv] hadoop git commit: HDDS-218. add existing
docker-compose files to the ozone release artifact. Contributed by Elek
Marton.
HDDS-218. add existing docker-compose files to the ozone release artifact. Contributed by Elek Marton.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9dd5d5ba
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9dd5d5ba
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9dd5d5ba
Branch: refs/heads/HDFS-12943
Commit: 9dd5d5ba713240c559b102fa3172b10077f5da87
Parents: fa121eb
Author: Xiaoyu Yao <xy...@apache.org>
Authored: Fri Aug 17 07:58:24 2018 -0700
Committer: Xiaoyu Yao <xy...@apache.org>
Committed: Fri Aug 17 07:58:24 2018 -0700
----------------------------------------------------------------------
dev-support/bin/ozone-dist-layout-stitching | 2 +
hadoop-dist/pom.xml | 17 -------
hadoop-dist/src/main/compose/README.md | 51 ++++++++++++++++++++
.../src/main/compose/ozone/docker-compose.yaml | 6 +--
.../main/compose/ozoneperf/docker-compose.yaml | 6 +--
hadoop-ozone/docs/content/GettingStarted.md | 2 +-
6 files changed, 60 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9dd5d5ba/dev-support/bin/ozone-dist-layout-stitching
----------------------------------------------------------------------
diff --git a/dev-support/bin/ozone-dist-layout-stitching b/dev-support/bin/ozone-dist-layout-stitching
index c30a37d..2ba7791 100755
--- a/dev-support/bin/ozone-dist-layout-stitching
+++ b/dev-support/bin/ozone-dist-layout-stitching
@@ -151,6 +151,8 @@ cp "${ROOT}/hadoop-ozone/ozonefs/target/hadoop-ozone-filesystem-${HDDS_VERSION}.
cp -r "${ROOT}/hadoop-ozone/docs/target/classes/webapps/docs" ./share/hadoop/ozone/webapps/ozoneManager/
cp -r "${ROOT}/hadoop-ozone/docs/target/classes/webapps/docs" ./share/hadoop/hdds/webapps/scm/
+#Copy docker compose files
+run cp -p -r "${ROOT}/hadoop-dist/src/main/compose" .
mkdir -p ./share/hadoop/mapreduce
mkdir -p ./share/hadoop/yarn
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9dd5d5ba/hadoop-dist/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-dist/pom.xml b/hadoop-dist/pom.xml
index 5de6759..da05015 100644
--- a/hadoop-dist/pom.xml
+++ b/hadoop-dist/pom.xml
@@ -277,23 +277,6 @@
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
- <id>copy-docker-compose</id>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <phase>prepare-package</phase>
- <configuration>
- <outputDirectory>${project.build.directory}/compose
- </outputDirectory>
- <resources>
- <resource>
- <directory>src/main/compose</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- <execution>
<id>copy-dockerfile</id>
<goals>
<goal>copy-resources</goal>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9dd5d5ba/hadoop-dist/src/main/compose/README.md
----------------------------------------------------------------------
diff --git a/hadoop-dist/src/main/compose/README.md b/hadoop-dist/src/main/compose/README.md
new file mode 100644
index 0000000..8189d2c
--- /dev/null
+++ b/hadoop-dist/src/main/compose/README.md
@@ -0,0 +1,51 @@
+<!---
+ Licensed 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. See accompanying LICENSE file.
+-->
+
+# Docker cluster definitions
+
+This directory contains multiple docker cluster definitions to start local pseudo cluster with different configuration.
+
+It helps to start local (multi-node like) pseudo cluster with docker and docker-compose and obviously it's not for production.
+
+You may find more information in the specific subdirectories but in generic you can use the following commands:
+
+## Usage
+
+To start a cluster go to a subdirectory and start the cluster:
+
+```
+docker-compose up -d
+```
+
+You can check the logs of all the components with:
+
+```
+docker-compose logs
+```
+
+In case of a problem you can destroy the cluster an delete all the local state with:
+
+```
+docker-compose down
+```
+
+(Note: a simple docker-compose stop may not delete all the local data).
+
+You can scale up and down the components:
+
+```
+docker-compose scale datanode=5
+```
+
+Usually the key webui ports are published on the docker host.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9dd5d5ba/hadoop-dist/src/main/compose/ozone/docker-compose.yaml
----------------------------------------------------------------------
diff --git a/hadoop-dist/src/main/compose/ozone/docker-compose.yaml b/hadoop-dist/src/main/compose/ozone/docker-compose.yaml
index bb5e8dd..0a6a9d8 100644
--- a/hadoop-dist/src/main/compose/ozone/docker-compose.yaml
+++ b/hadoop-dist/src/main/compose/ozone/docker-compose.yaml
@@ -19,7 +19,7 @@ services:
datanode:
image: apache/hadoop-runner
volumes:
- - ../../ozone:/opt/hadoop
+ - ../..:/opt/hadoop
ports:
- 9864
command: ["/opt/hadoop/bin/ozone","datanode"]
@@ -28,7 +28,7 @@ services:
ozoneManager:
image: apache/hadoop-runner
volumes:
- - ../../ozone:/opt/hadoop
+ - ../..:/opt/hadoop
ports:
- 9874:9874
environment:
@@ -39,7 +39,7 @@ services:
scm:
image: apache/hadoop-runner
volumes:
- - ../../ozone:/opt/hadoop
+ - ../..:/opt/hadoop
ports:
- 9876:9876
env_file:
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9dd5d5ba/hadoop-dist/src/main/compose/ozoneperf/docker-compose.yaml
----------------------------------------------------------------------
diff --git a/hadoop-dist/src/main/compose/ozoneperf/docker-compose.yaml b/hadoop-dist/src/main/compose/ozoneperf/docker-compose.yaml
index 6d1d9ca..3b5cc7b 100644
--- a/hadoop-dist/src/main/compose/ozoneperf/docker-compose.yaml
+++ b/hadoop-dist/src/main/compose/ozoneperf/docker-compose.yaml
@@ -19,7 +19,7 @@ services:
datanode:
image: apache/hadoop-runner
volumes:
- - ../../ozone:/opt/hadoop
+ - ../..:/opt/hadoop
- ./jmxpromo.jar:/opt/jmxpromo.jar
ports:
- 9864
@@ -29,7 +29,7 @@ services:
ozoneManager:
image: apache/hadoop-runner
volumes:
- - ../../ozone:/opt/hadoop
+ - ../..:/opt/hadoop
- ./jmxpromo.jar:/opt/jmxpromo.jar
ports:
- 9874:9874
@@ -41,7 +41,7 @@ services:
scm:
image: apache/hadoop-runner
volumes:
- - ../../ozone:/opt/hadoop
+ - ../..:/opt/hadoop
- ./jmxpromo.jar:/opt/jmxpromo.jar
ports:
- 9876:9876
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9dd5d5ba/hadoop-ozone/docs/content/GettingStarted.md
----------------------------------------------------------------------
diff --git a/hadoop-ozone/docs/content/GettingStarted.md b/hadoop-ozone/docs/content/GettingStarted.md
index 117a307..61d210a 100644
--- a/hadoop-ozone/docs/content/GettingStarted.md
+++ b/hadoop-ozone/docs/content/GettingStarted.md
@@ -81,7 +81,7 @@ Go to the directory where the docker compose files exist and tell
`docker-compose` to start Ozone. This will start SCM, OM and a single datanode
in the background.
```
-cd hadoop-dist/target/compose/ozone
+cd hadoop-dist/target/ozone/compose/ozone
docker-compose up -d
```
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org