Repository: spark Updated Branches: refs/heads/master 90095bf3c -> 94cdb05ff
[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 <[email protected]> Closes #4611 from chenghao-intel/stopping_service and squashes the following commits: a0051f6 [Cheng Hao] loosen the process checking while stopping a service Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/94cdb05f Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/94cdb05f Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/94cdb05f Branch: refs/heads/master Commit: 94cdb05ff7e6b8fc5b3a574202ba8bc8e5bbe689 Parents: 90095bf Author: Cheng Hao <[email protected]> Authored: Thu Feb 19 12:07:51 2015 -0800 Committer: Andrew Or <[email protected]> Committed: Thu Feb 19 12:07:51 2015 -0800 ---------------------------------------------------------------------- sbin/spark-daemon.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/94cdb05f/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: [email protected] For additional commands, e-mail: [email protected]
