Browse Source

AMBARI-14199. Ambari Agent should not rely on CWD of user who started it (aonishuk)

Andrew Onishuk 9 years ago
parent
commit
8eb449b46b
1 changed files with 4 additions and 0 deletions
  1. 4 0
      ambari-agent/conf/unix/ambari-agent

+ 4 - 0
ambari-agent/conf/unix/ambari-agent

@@ -45,6 +45,7 @@ PIDFILE=/var/run/ambari-agent/$AMBARI_AGENT.pid
 OUTFILE=/var/log/ambari-agent/ambari-agent.out
 OUTFILE=/var/log/ambari-agent/ambari-agent.out
 LOGFILE=/var/log/ambari-agent/ambari-agent.log
 LOGFILE=/var/log/ambari-agent/ambari-agent.log
 AGENT_SCRIPT=/usr/lib/python2.6/site-packages/ambari_agent/main.py
 AGENT_SCRIPT=/usr/lib/python2.6/site-packages/ambari_agent/main.py
+AGENT_TMP_DIR=/var/lib/ambari-agent/tmp
 AMBARI_AGENT_PY_SCRIPT=/usr/lib/python2.6/site-packages/ambari_agent/AmbariAgent.py
 AMBARI_AGENT_PY_SCRIPT=/usr/lib/python2.6/site-packages/ambari_agent/AmbariAgent.py
 OK=1
 OK=1
 NOTOK=0
 NOTOK=0
@@ -59,6 +60,9 @@ if [ "$EUID" -ne 0 ] ; then
   fi
   fi
 fi
 fi
 
 
+# set reliable cwd for this and child processes.
+cd $AGENT_TMP_DIR
+
 keysdir=$(awk -F "=" '/keysdir/ {print $2}' /etc/ambari-agent/conf/ambari-agent.ini)
 keysdir=$(awk -F "=" '/keysdir/ {print $2}' /etc/ambari-agent/conf/ambari-agent.ini)
 # trim spaces
 # trim spaces
 keysdir=${keysdir// }
 keysdir=${keysdir// }