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 aw...@apache.org on 2014/12/02 18:14:28 UTC
hadoop git commit: YARN-2472. yarn-daemons.sh should jsut call yarn
directly (Masatake Iwasaki via aw)
Repository: hadoop
Updated Branches:
refs/heads/trunk 75d53456e -> 26319ba0d
YARN-2472. yarn-daemons.sh should jsut call yarn directly (Masatake Iwasaki via aw)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/26319ba0
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/26319ba0
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/26319ba0
Branch: refs/heads/trunk
Commit: 26319ba0db9907c6254f65cd5b07f72c114d7e85
Parents: 75d5345
Author: Allen Wittenauer <aw...@apache.org>
Authored: Tue Dec 2 09:14:20 2014 -0800
Committer: Allen Wittenauer <aw...@apache.org>
Committed: Tue Dec 2 09:14:20 2014 -0800
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 +++
hadoop-yarn-project/hadoop-yarn/bin/start-yarn.sh | 4 ++--
hadoop-yarn-project/hadoop-yarn/bin/stop-yarn.sh | 4 ++--
hadoop-yarn-project/hadoop-yarn/bin/yarn-daemons.sh | 6 ++++--
4 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/26319ba0/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 9e0bbe3..d95679e 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -10,6 +10,9 @@ Trunk - Unreleased
YARN-2438. yarn-env.sh cleanup (aw)
+ YARN-2472. yarn-daemons.sh should jsut call yarn directly (Masatake Iwasaki
+ via aw)
+
OPTIMIZATIONS
BUG FIXES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/26319ba0/hadoop-yarn-project/hadoop-yarn/bin/start-yarn.sh
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/bin/start-yarn.sh b/hadoop-yarn-project/hadoop-yarn/bin/start-yarn.sh
index 6803601..f44b199 100644
--- a/hadoop-yarn-project/hadoop-yarn/bin/start-yarn.sh
+++ b/hadoop-yarn-project/hadoop-yarn/bin/start-yarn.sh
@@ -42,8 +42,8 @@ else
fi
# start resourceManager
-"${bin}/yarn-daemon.sh" --config "${YARN_CONF_DIR}" start resourcemanager
+"${HADOOP_YARN_HOME}/bin/yarn" --config "${YARN_CONF_DIR}" --daemon start resourcemanager
# start nodeManager
"${bin}/yarn-daemons.sh" --config "${YARN_CONF_DIR}" start nodemanager
# start proxyserver
-#"${bin}/yarn-daemon.sh" --config "${YARN_CONF_DIR}" start proxyserver
+#"${HADOOP_YARN_HOME}/bin/yarn" --config "${YARN_CONF_DIR}" --daemon start proxyserver
http://git-wip-us.apache.org/repos/asf/hadoop/blob/26319ba0/hadoop-yarn-project/hadoop-yarn/bin/stop-yarn.sh
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/bin/stop-yarn.sh b/hadoop-yarn-project/hadoop-yarn/bin/stop-yarn.sh
index 605971b..c807f52 100644
--- a/hadoop-yarn-project/hadoop-yarn/bin/stop-yarn.sh
+++ b/hadoop-yarn-project/hadoop-yarn/bin/stop-yarn.sh
@@ -44,8 +44,8 @@ else
fi
# start resourceManager
-"${bin}/yarn-daemon.sh" --config "${YARN_CONF_DIR}" stop resourcemanager
+"${HADOOP_YARN_HOME}/bin/yarn" --config "${YARN_CONF_DIR}" --daemon stop resourcemanager
# start nodeManager
"${bin}/yarn-daemons.sh" --config "${YARN_CONF_DIR}" stop nodemanager
# start proxyserver
-#"${bin}/yarn-daemon.sh" --config "${YARN_CONF_DIR}" stop proxyserver
+#"${HADOOP_YARN_HOME}/bin/yarn" --config "${YARN_CONF_DIR}" --daemon stop proxyserver
http://git-wip-us.apache.org/repos/asf/hadoop/blob/26319ba0/hadoop-yarn-project/hadoop-yarn/bin/yarn-daemons.sh
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/bin/yarn-daemons.sh b/hadoop-yarn-project/hadoop-yarn/bin/yarn-daemons.sh
index 1413a3d..17d3db6 100644
--- a/hadoop-yarn-project/hadoop-yarn/bin/yarn-daemons.sh
+++ b/hadoop-yarn-project/hadoop-yarn/bin/yarn-daemons.sh
@@ -41,6 +41,8 @@ else
exit 1
fi
-hadoop_connect_to_hosts "${bin}/yarn-daemon.sh" \
---config "${HADOOP_CONF_DIR}" "$@"
+daemonmode=$1
+shift
+hadoop_connect_to_hosts "${HADOOP_YARN_HOME}/bin/yarn" \
+ --config "${HADOOP_CONF_DIR}" --daemon "${daemonmode}" "$@"