Repository: zeppelin
Updated Branches:
  refs/heads/master bba8d3013 -> 483eb5724


[ZEPPELIN-3215] Fix to remove pid of interpreter when interpreter shu…

### What is this PR for?
When user click 'restart interpreter', pid file about interpreter can be 
remained.
This PR is for fix this.

### What type of PR is it?
[Bug Fix]

### Todos
* [x] - Fix

### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-3215

### How should this be tested?
After interpreter shuted down, pid file of interpreter could be removed.

### Questions:
* Does the licenses files need update?
    * No
* Is there breaking changes for older versions?
    * No
* Does this needs documentation?
    * No

Author: Jaehoon Jeong <[email protected]>

Closes #2780 from woowahan-jaehoon/ZEPPELIN-3215 and squashes the following 
commits:

a84c696df [Jaehoon Jeong] [ZEPPELIN-3215] Fix to remove pids of interpreters 
when interpreter shutdowned normally


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

Branch: refs/heads/master
Commit: 483eb57242dfa4027fffabddcfdcddf5bd52586e
Parents: bba8d30
Author: Jaehoon Jeong <[email protected]>
Authored: Thu Feb 8 17:45:46 2018 +0900
Committer: Jongyoul Lee <[email protected]>
Committed: Fri Jul 6 15:48:01 2018 +0900

----------------------------------------------------------------------
 bin/interpreter.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/483eb572/bin/interpreter.sh
----------------------------------------------------------------------
diff --git a/bin/interpreter.sh b/bin/interpreter.sh
index 9ad9ee0..dbf0a59 100755
--- a/bin/interpreter.sh
+++ b/bin/interpreter.sh
@@ -251,14 +251,14 @@ function shutdown_hook() {
       sleep 3
       let "count+=1"
     else
-      rm -f "${ZEPPELIN_PID}"
       break
     fi
   if [[ "${count}" == "5" ]]; then
     $(kill -9 ${pid} > /dev/null 2> /dev/null)
-    rm -f "${ZEPPELIN_PID}"
   fi
   done
 }
 
 wait
+
+rm -f "${ZEPPELIN_PID}" > /dev/null 2> /dev/null

Reply via email to