You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@samza.apache.org by zj...@apache.org on 2014/04/20 22:57:16 UTC

git commit: SAMZA-238: Make hello-samza stop YARN in a graceful manner.

Repository: incubator-samza-hello-samza
Updated Branches:
  refs/heads/master 24acf2226 -> b6cd3cf37


SAMZA-238: Make hello-samza stop YARN in a graceful manner.


Project: http://git-wip-us.apache.org/repos/asf/incubator-samza-hello-samza/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-samza-hello-samza/commit/b6cd3cf3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-samza-hello-samza/tree/b6cd3cf3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-samza-hello-samza/diff/b6cd3cf3

Branch: refs/heads/master
Commit: b6cd3cf37f43479f987d3434183110ab075a042e
Parents: 24acf22
Author: Yan Fang <ya...@gmail.com>
Authored: Sun Apr 20 13:54:19 2014 -0700
Committer: Yan Fang <ya...@gmail.com>
Committed: Sun Apr 20 13:54:19 2014 -0700

----------------------------------------------------------------------
 bin/grid | 30 +++++-------------------------
 1 file changed, 5 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-samza-hello-samza/blob/b6cd3cf3/bin/grid
----------------------------------------------------------------------
diff --git a/bin/grid b/bin/grid
index 9f520b6..a144d11 100755
--- a/bin/grid
+++ b/bin/grid
@@ -129,16 +129,9 @@ start_zookeeper() {
 }
 
 start_yarn() {
-  if [ -f $DEPLOY_ROOT_DIR/$SYSTEM/bin/yarn ]; then
-    cd $DEPLOY_ROOT_DIR/$SYSTEM
-    mkdir -p pids logs
-    nohup bin/yarn resourcemanager > logs/rm.log 2>&1 &
-    RM_PID=$!
-    echo $RM_PID > pids/rm.pid
-    nohup bin/yarn nodemanager > logs/nm.log 2>&1 &
-    NM_PID=$!
-    echo $NM_PID > pids/nm.pid
-    cd - > /dev/null
+  if [ -f $DEPLOY_ROOT_DIR/$SYSTEM/sbin/yarn-daemon.sh ]; then
+    $DEPLOY_ROOT_DIR/$SYSTEM/sbin/yarn-daemon.sh start resourcemanager
+    $DEPLOY_ROOT_DIR/$SYSTEM/sbin/yarn-daemon.sh start nodemanager
   else
     echo 'YARN is not installed. Run: bin/grid install yarn'
   fi
@@ -172,21 +165,8 @@ stop_zookeeper() {
 }
 
 stop_yarn() {
-  RM_PIDFILE="$DEPLOY_ROOT_DIR/$SYSTEM/pids/rm.pid"
-  if [ -f "$RM_PIDFILE" ]; then
-    kill $(cat "$RM_PIDFILE")
-    rm -f "$RM_PIDFILE"
-  else
-    echo 'YARN ResourceManager not running, nothing to stop.'
-  fi
-
-  NM_PIDFILE="$DEPLOY_ROOT_DIR/$SYSTEM/pids/nm.pid"
-  if [ -f "$NM_PIDFILE" ]; then
-    kill $(cat "$NM_PIDFILE")
-    rm -f "$NM_PIDFILE"
-  else
-    echo 'YARN NodeManager not running, nothing to stop.'
-  fi
+  $DEPLOY_ROOT_DIR/$SYSTEM/sbin/yarn-daemon.sh stop resourcemanager
+  $DEPLOY_ROOT_DIR/$SYSTEM/sbin/yarn-daemon.sh stop nodemanager
 }
 
 stop_kafka() {