You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@livy.apache.org by js...@apache.org on 2017/06/27 06:39:13 UTC
[32/50] [abbrv] incubator-livy git commit: LIVY-249. Update
livy-server script to include status command and return 1 on error. (#311)
LIVY-249. Update livy-server script to include status command and return 1 on error. (#311)
Currently if livy-server fails to start it will still return 0 (success), this has been fixed. I also added a livy-server status command that will return a status output similar to that of livy-server start when it's already running or livy-server stop when it's already stopped. Lastly I updated all output text to use livy-server instead of livy_server since that's the actual name of the script.
Tested manually.
Project: http://git-wip-us.apache.org/repos/asf/incubator-livy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-livy/commit/5e6f9ed3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-livy/tree/5e6f9ed3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-livy/diff/5e6f9ed3
Branch: refs/heads/master
Commit: 5e6f9ed3fd2667599e52e3759d869ac535114145
Parents: b7cc00a
Author: Alex Bozarth <aj...@us.ibm.com>
Authored: Fri Mar 17 00:48:34 2017 -0700
Committer: Alex Man <al...@users.noreply.github.com>
Committed: Fri Mar 17 00:48:34 2017 -0700
----------------------------------------------------------------------
bin/livy-server | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-livy/blob/5e6f9ed3/bin/livy-server
----------------------------------------------------------------------
diff --git a/bin/livy-server b/bin/livy-server
index a2636ba..71b9134 100755
--- a/bin/livy-server
+++ b/bin/livy-server
@@ -108,7 +108,7 @@ start_livy_server() {
if [ -f "$pid" ]; then
TARGET_ID="$(cat "$pid")"
if [[ $(ps -p "$TARGET_ID" -o comm=) =~ "java" ]]; then
- echo "livy_server running as process $TARGET_ID. Stop it first."
+ echo "livy-server running as process $TARGET_ID. Stop it first."
exit 1
fi
fi
@@ -125,6 +125,7 @@ start_livy_server() {
tail -2 "$log" | sed 's/^/ /'
echo "full log in $log"
rm -rf "$pid"
+ exit 1
fi
fi
}
@@ -146,13 +147,26 @@ case $option in
if [ -f $pid ]; then
TARGET_ID="$(cat "$pid")"
if [[ $(ps -p "$TARGET_ID" -o comm=) =~ "java" ]]; then
- echo "stopping livy_server"
+ echo "stopping livy-server"
kill "$TARGET_ID" && rm -f "$pid"
else
- echo "no livy_server to stop"
+ echo "no livy-server to stop"
fi
else
- echo "no livy_server to stop"
+ echo "no livy-server to stop"
+ fi
+ ;;
+
+ (status)
+ if [ -f "$pid" ]; then
+ TARGET_ID="$(cat "$pid")"
+ if [[ $(ps -p "$TARGET_ID" -o comm=) =~ "java" ]]; then
+ echo "livy-server is running (pid: $TARGET_ID)"
+ else
+ echo "livy-server is not running"
+ fi
+ else
+ echo "livy-server is not running"
fi
;;