Repository: spark
Updated Branches:
  refs/heads/branch-1.3 25fae8e7e -> fe00eb66e


[SPARK-5825] [Spark Submit] Remove the double checking instance name when 
stopping the service

`spark-daemon.sh` will confirm the process id by fuzzy matching the class name 
while stopping the service, however, it will fail if the java process arguments 
is very long (greater than 4096 characters).
This PR looses the check for the service process.

Author: Cheng Hao <hao.ch...@intel.com>

Closes #4611 from chenghao-intel/stopping_service and squashes the following 
commits:

a0051f6 [Cheng Hao] loosen the process checking while stopping a service

(cherry picked from commit 94cdb05ff7e6b8fc5b3a574202ba8bc8e5bbe689)
Signed-off-by: Andrew Or <and...@databricks.com>


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/fe00eb66
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/fe00eb66
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/fe00eb66

Branch: refs/heads/branch-1.3
Commit: fe00eb66e8a65e23e81d401da32c5d5de8180394
Parents: 25fae8e
Author: Cheng Hao <hao.ch...@intel.com>
Authored: Thu Feb 19 12:07:51 2015 -0800
Committer: Andrew Or <and...@databricks.com>
Committed: Thu Feb 19 12:07:56 2015 -0800

----------------------------------------------------------------------
 sbin/spark-daemon.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/fe00eb66/sbin/spark-daemon.sh
----------------------------------------------------------------------
diff --git a/sbin/spark-daemon.sh b/sbin/spark-daemon.sh
index ec6d0b5..e1bcc7d 100755
--- a/sbin/spark-daemon.sh
+++ b/sbin/spark-daemon.sh
@@ -166,7 +166,7 @@ case $option in
 
     if [ -f $pid ]; then
       TARGET_ID="$(cat "$pid")"
-      if [[ $(ps -p "$TARGET_ID" -o args=) =~ $command ]]; then
+      if [[ $(ps -p "$TARGET_ID" -o comm=) =~ "java" ]]; then
         echo "stopping $command"
         kill "$TARGET_ID"
       else


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

Reply via email to