You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by vi...@apache.org on 2020/07/31 19:00:27 UTC
[hadoop-ozone] branch master updated: HDDS-4052. Remove
master/slave terminology from Ozone (#1281)
This is an automated email from the ASF dual-hosted git repository.
vivekratnavel pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 0651be8 HDDS-4052. Remove master/slave terminology from Ozone (#1281)
0651be8 is described below
commit 0651be8ebddeaefa884a5194303696d1384f144d
Author: Doroszlai, Attila <64...@users.noreply.github.com>
AuthorDate: Fri Jul 31 21:00:12 2020 +0200
HDDS-4052. Remove master/slave terminology from Ozone (#1281)
---
hadoop-hdds/docs/content/start/OnPrem.md | 2 +-
hadoop-hdds/docs/content/start/OnPrem.zh.md | 2 +-
hadoop-ozone/dist/src/shell/hdds/hadoop-daemons.sh | 2 +-
hadoop-ozone/dist/src/shell/hdds/hadoop-functions.sh | 6 +++---
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/hadoop-hdds/docs/content/start/OnPrem.md b/hadoop-hdds/docs/content/start/OnPrem.md
index 243743a..988f736 100644
--- a/hadoop-hdds/docs/content/start/OnPrem.md
+++ b/hadoop-hdds/docs/content/start/OnPrem.md
@@ -165,7 +165,7 @@ ozone om --init
start-ozone.sh
{{< /highlight >}}
-This assumes that you have set up the slaves file correctly and ssh
+This assumes that you have set up the `workers` file correctly and ssh
configuration that allows ssh-ing to all data nodes. This is the same as the
HDFS configuration, so please refer to HDFS documentation on how to set this
up.
diff --git a/hadoop-hdds/docs/content/start/OnPrem.zh.md b/hadoop-hdds/docs/content/start/OnPrem.zh.md
index 2e367b8..948025e 100644
--- a/hadoop-hdds/docs/content/start/OnPrem.zh.md
+++ b/hadoop-hdds/docs/content/start/OnPrem.zh.md
@@ -151,4 +151,4 @@ ozone om --init
start-ozone.sh
{{< /highlight >}}
-这么做的前提是，slaves 文件已经正确编写，并且配置好了到各个 Datanode 的 ssh，这和 HDFS 的配置方式相同，具体方法请查看 HDFS 文档。
+这么做的前提是，`workers` 文件已经正确编写，并且配置好了到各个 Datanode 的 ssh，这和 HDFS 的配置方式相同，具体方法请查看 HDFS 文档。
diff --git a/hadoop-ozone/dist/src/shell/hdds/hadoop-daemons.sh b/hadoop-ozone/dist/src/shell/hdds/hadoop-daemons.sh
index 5530491..1d8096b 100755
--- a/hadoop-ozone/dist/src/shell/hdds/hadoop-daemons.sh
+++ b/hadoop-ozone/dist/src/shell/hdds/hadoop-daemons.sh
@@ -16,7 +16,7 @@
# limitations under the License.
-# Run a Hadoop command on all slave hosts.
+# Run a Hadoop command on all worker hosts.
function hadoop_usage
{
diff --git a/hadoop-ozone/dist/src/shell/hdds/hadoop-functions.sh b/hadoop-ozone/dist/src/shell/hdds/hadoop-functions.sh
index b46045b..769af33 100755
--- a/hadoop-ozone/dist/src/shell/hdds/hadoop-functions.sh
+++ b/hadoop-ozone/dist/src/shell/hdds/hadoop-functions.sh
@@ -999,7 +999,7 @@ function hadoop_connect_to_hosts
# shellcheck disable=SC2124
local params="$@"
local worker_file
- local tmpslvnames
+ local tmp_worker_names
#
# ssh (or whatever) to a host
@@ -1030,10 +1030,10 @@ function hadoop_connect_to_hosts
else
# no spaces allowed in the pdsh arg host list
# shellcheck disable=SC2086
- tmpslvnames=$(echo ${HADOOP_WORKER_NAMES} | tr -s ' ' ,)
+ tmp_worker_names=$(echo ${HADOOP_WORKER_NAMES} | tr -s ' ' ,)
PDSH_SSH_ARGS_APPEND="${HADOOP_SSH_OPTS}" pdsh \
-f "${HADOOP_SSH_PARALLEL}" \
- -w "${tmpslvnames}" $"${@// /\\ }" 2>&1
+ -w "${tmp_worker_names}" $"${@// /\\ }" 2>&1
fi
else
if [[ -z "${HADOOP_WORKER_NAMES}" ]]; then
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-commits-help@hadoop.apache.org