diff --git a/hadoop-ozone/dist/src/main/compose/ozoneperf/README.md b/hadoop-ozone/dist/src/main/compose/ozoneperf/README.md index 62328e02cb9d..d8aa8c3dcaeb 100644 --- a/hadoop-ozone/dist/src/main/compose/ozoneperf/README.md +++ b/hadoop-ozone/dist/src/main/compose/ozoneperf/README.md @@ -31,7 +31,25 @@ Start the cluster with `docker-compose` docker-compose up -d ``` -Note: The freon test will be started after 30 seconds. +Scale datanodes up: + +``` +docker-compose up -d --scale datanode=3 +``` + +You can enter to the SCM container and start a freon test: + +``` +docker-compose exec scm bash +ozone freon ockg -n1000 +``` + +Or you can start freon instances in containers (to make it possible to scale them up): +If all the datanodes are started, start the freon instance: + +``` +docker-compose -f docker-compose.yaml -f freon-ockg.yaml up --scale datanode=3 -d +``` ## How to use diff --git a/hadoop-ozone/dist/src/main/compose/ozoneperf/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozoneperf/docker-compose.yaml index fa205407e872..7b7db8844906 100644 --- a/hadoop-ozone/dist/src/main/compose/ozoneperf/docker-compose.yaml +++ b/hadoop-ozone/dist/src/main/compose/ozoneperf/docker-compose.yaml @@ -60,15 +60,6 @@ services: command: ["--config.file","/etc/prometheus.yml"] ports: - 9090:9090 - freon: - image: apache/ozone-runner:${OZONE_RUNNER_VERSION} - volumes: - - ../..:/opt/hadoop - environment: - SLEEP_SECONDS: 30 - env_file: - - ./docker-config - command: ["ozone","freon","rk"] grafana: image: grafana/grafana volumes: diff --git a/hadoop-ozone/dist/src/main/compose/ozoneperf/freon-ockg.yaml b/hadoop-ozone/dist/src/main/compose/ozoneperf/freon-ockg.yaml new file mode 100644 index 000000000000..72685bdc6727 --- /dev/null +++ b/hadoop-ozone/dist/src/main/compose/ozoneperf/freon-ockg.yaml @@ -0,0 +1,25 @@ +# 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: + freon: + image: apache/ozone-runner:${OZONE_RUNNER_VERSION} + volumes: + - ../..:/opt/hadoop + env_file: + - ./docker-config + command: ["ozone","freon","ockg","-n100000"] diff --git a/hadoop-ozone/dist/src/main/compose/ozoneperf/freon-rk.yaml b/hadoop-ozone/dist/src/main/compose/ozoneperf/freon-rk.yaml new file mode 100644 index 000000000000..671bd229a328 --- /dev/null +++ b/hadoop-ozone/dist/src/main/compose/ozoneperf/freon-rk.yaml @@ -0,0 +1,25 @@ +# 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: + freon: + image: apache/ozone-runner:${OZONE_RUNNER_VERSION} + volumes: + - ../..:/opt/hadoop + env_file: + - ./docker-config + command: ["ozone","freon","rk"]