You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by si...@apache.org on 2021/01/21 20:12:19 UTC
[ozone] branch master updated (3d70fab -> bc3e3e5)
This is an automated email from the ASF dual-hosted git repository.
siyao pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git.
from 3d70fab HDDS-4710. PipelinePlacementPolicy altered to randomly pick (#1821)
add bc3e3e5 HDDS-4525. Replace Hadoop variables and functions in Ozone shell scripts with Ozone-specific ones (#1667)
No new revisions were added by this update.
Summary of changes:
hadoop-hdds/common/src/main/conf/hadoop-env.cmd | 90 --
hadoop-hdds/common/src/main/conf/hadoop-env.sh | 451 -------
hadoop-hdds/common/src/main/conf/ozone-env.sh | 279 ++++
.../hadoop/hdds/utils/db/DBConfigFromFile.java | 12 +-
.../dist/dev-support/bin/dist-layout-stitching | 14 +-
.../compose/{ozonescripts => compatibility}/.env | 0
.../{ozone => compatibility}/docker-compose.yaml | 5 -
.../compose/{ozone => compatibility}/docker-config | 10 +-
.../{ozonescripts => compatibility}/test.sh | 20 +-
hadoop-ozone/dist/src/main/compose/ozone-csi/.env | 2 +-
.../src/main/compose/ozone-csi/docker-compose.yaml | 8 +-
.../dist/src/main/compose/ozone-csi/docker-config | 3 +
hadoop-ozone/dist/src/main/compose/ozone-ha/.env | 2 +-
.../dist/src/main/compose/ozone-ha/docker-config | 3 +
.../dist/src/main/compose/ozone-mr/common-config | 3 +
.../compose/ozone-mr/hadoop27/docker-compose.yaml | 5 +-
.../main/compose/ozone-mr/hadoop27/docker-config | 3 +
.../dist/src/main/compose/ozone-mr/hadoop31/.env | 2 +-
.../compose/ozone-mr/hadoop31/docker-compose.yaml | 13 +-
.../main/compose/ozone-mr/hadoop31/docker-config | 3 +
.../dist/src/main/compose/ozone-mr/hadoop32/.env | 2 +-
.../compose/ozone-mr/hadoop32/docker-compose.yaml | 11 +-
.../main/compose/ozone-mr/hadoop32/docker-config | 3 +
.../dist/src/main/compose/ozone-om-ha-s3/.env | 2 +-
.../compose/ozone-om-ha-s3/docker-compose.yaml | 12 +-
.../src/main/compose/ozone-om-ha-s3/docker-config | 3 +
.../src/main/compose/ozone-om-ha/docker-config | 3 +
.../dist/src/main/compose/ozone-topology/.env | 2 +-
.../compose/ozone-topology/docker-compose.yaml | 16 +-
.../src/main/compose/ozone-topology/docker-config | 3 +
hadoop-ozone/dist/src/main/compose/ozone/.env | 2 +-
.../src/main/compose/ozone/docker-compose.yaml | 10 +-
.../dist/src/main/compose/ozone/docker-config | 3 +
hadoop-ozone/dist/src/main/compose/ozone/test.sh | 2 +
.../src/main/compose/ozoneblockade/docker-config | 3 +
.../src/main/compose/ozones3-haproxy/docker-config | 3 +
.../src/main/compose/ozonescripts/docker-config | 3 +
.../dist/src/main/compose/ozonesecure-mr/.env | 2 +-
.../compose/ozonesecure-mr/docker-compose.yaml | 16 +-
.../src/main/compose/ozonesecure-mr/docker-config | 5 +
.../dist/src/main/compose/ozonesecure-om-ha/.env | 2 +-
.../compose/ozonesecure-om-ha/docker-compose.yaml | 20 +-
.../main/compose/ozonesecure-om-ha/docker-config | 3 +
.../dist/src/main/compose/ozonesecure/.env | 2 +-
.../main/compose/ozonesecure/docker-compose.yaml | 28 +-
.../src/main/compose/ozonesecure/docker-config | 3 +
hadoop-ozone/dist/src/main/compose/test-all.sh | 2 +-
.../src/main/compose/upgrade/docker-compose.yaml | 7 +
.../dist/src/main/compose/upgrade/docker-config | 3 +
.../dist/src/main/smoketest/cli/classpath.robot | 46 +
.../dist/src/main/smoketest/cli/envvars.robot | 77 ++
.../validate.robot => compatibility/dn.robot} | 14 +-
.../validate.robot => compatibility/om.robot} | 14 +-
.../validate.robot => compatibility/recon.robot} | 13 +-
.../validate.robot => compatibility/scm.robot} | 14 +-
hadoop-ozone/dist/src/main/smoketest/lib/os.robot | 4 +
.../dist/src/main/smoketest/ozone-lib/shell.robot | 4 +
hadoop-ozone/dist/src/shell/hdds/hadoop-config.cmd | 317 -----
hadoop-ozone/dist/src/shell/hdds/hadoop-config.sh | 165 ---
hadoop-ozone/dist/src/shell/hdds/workers.sh | 47 +-
hadoop-ozone/dist/src/shell/ozone/ozone | 245 ++--
hadoop-ozone/dist/src/shell/ozone/ozone-config.sh | 100 +-
.../ozone-functions.sh} | 1397 ++++++++++----------
hadoop-ozone/dist/src/shell/ozone/start-ozone.sh | 84 +-
hadoop-ozone/dist/src/shell/ozone/stop-ozone.sh | 60 +-
.../shell/shellprofile.d/hadoop-ozone-manager.sh | 8 +-
.../dist/src/shell/shellprofile.d/hadoop-ozone.sh | 6 +-
hadoop-ozone/dist/src/test/shell/gc_opts.bats | 40 +-
.../test/shell/ozone-functions_test_helper.bash} | 27 +-
.../shell/ozone_set_var_for_compatibility.bats | 86 ++
70 files changed, 1687 insertions(+), 2185 deletions(-)
delete mode 100644 hadoop-hdds/common/src/main/conf/hadoop-env.cmd
delete mode 100644 hadoop-hdds/common/src/main/conf/hadoop-env.sh
create mode 100644 hadoop-hdds/common/src/main/conf/ozone-env.sh
copy hadoop-ozone/dist/src/main/compose/{ozonescripts => compatibility}/.env (100%)
copy hadoop-ozone/dist/src/main/compose/{ozone => compatibility}/docker-compose.yaml (92%)
copy hadoop-ozone/dist/src/main/compose/{ozone => compatibility}/docker-config (88%)
copy hadoop-ozone/dist/src/main/compose/{ozonescripts => compatibility}/test.sh (80%)
create mode 100644 hadoop-ozone/dist/src/main/smoketest/cli/classpath.robot
create mode 100644 hadoop-ozone/dist/src/main/smoketest/cli/envvars.robot
copy hadoop-ozone/dist/src/main/smoketest/{freon/validate.robot => compatibility/dn.robot} (71%)
copy hadoop-ozone/dist/src/main/smoketest/{freon/validate.robot => compatibility/om.robot} (71%)
copy hadoop-ozone/dist/src/main/smoketest/{freon/validate.robot => compatibility/recon.robot} (74%)
copy hadoop-ozone/dist/src/main/smoketest/{freon/validate.robot => compatibility/scm.robot} (69%)
delete mode 100644 hadoop-ozone/dist/src/shell/hdds/hadoop-config.cmd
delete mode 100755 hadoop-ozone/dist/src/shell/hdds/hadoop-config.sh
rename hadoop-ozone/dist/src/shell/{hdds/hadoop-functions.sh => ozone/ozone-functions.sh} (58%)
copy hadoop-ozone/{dev-support/checks/blockade.sh => dist/src/test/shell/ozone-functions_test_helper.bash} (65%)
create mode 100644 hadoop-ozone/dist/src/test/shell/ozone_set_var_for_compatibility.bats
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org