You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2017/02/09 15:10:39 UTC
[2/2] ambari git commit: AMBARI-19943. Ambari-agent fails to restart
in non-root if was running as root before (aonishuk)
AMBARI-19943. Ambari-agent fails to restart in non-root if was running as root before (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/21798024
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/21798024
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/21798024
Branch: refs/heads/branch-2.5
Commit: 21798024f6eb313c73d23895e2cdede0b9ca1c53
Parents: 681f89c
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Thu Feb 9 17:10:24 2017 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Thu Feb 9 17:10:24 2017 +0200
----------------------------------------------------------------------
ambari-agent/conf/unix/ambari-agent | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/21798024/ambari-agent/conf/unix/ambari-agent
----------------------------------------------------------------------
diff --git a/ambari-agent/conf/unix/ambari-agent b/ambari-agent/conf/unix/ambari-agent
index 10913f8..70f58ed 100755
--- a/ambari-agent/conf/unix/ambari-agent
+++ b/ambari-agent/conf/unix/ambari-agent
@@ -175,7 +175,7 @@ case "${1:-}" in
fi
echo "Checking for previously running Ambari Agent..."
if [ -f $PIDFILE ]; then
- PID=`cat $PIDFILE`
+ PID=`ambari-sudo.sh cat $PIDFILE`
if ! (ps -p $PID >/dev/null 2>/dev/null); then
echo "$PIDFILE found with no process. Removing $PID..."
ambari-sudo.sh rm -f $PIDFILE
@@ -223,7 +223,7 @@ case "${1:-}" in
;;
status)
if [ -f $PIDFILE ]; then
- PID=`cat $PIDFILE`
+ PID=`ambari-sudo.sh cat $PIDFILE`
echo "Found $AMBARI_AGENT PID: $PID"
if ! (ps -p $PID >/dev/null 2>/dev/null); then
echo "$AMBARI_AGENT not running. Stale PID File at: $PIDFILE"
@@ -249,7 +249,7 @@ case "${1:-}" in
exit -1
fi
if [ -f $PIDFILE ]; then
- PID=`cat $PIDFILE`
+ PID=`ambari-sudo.sh cat $PIDFILE`
echo "Found $AMBARI_AGENT PID: $PID"
if ! (ps -p $PID >/dev/null 2>/dev/null); then
tput bold