You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2016/03/29 18:11:09 UTC
[1/2] ambari git commit: AMBARI-15617 Express Upgrade (after Ambari
upgrade) fails due to package import errors for cint (dlysnichenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 34a076bc4 -> c99087729
refs/heads/trunk 6d668d295 -> d60623465
AMBARI-15617 Express Upgrade (after Ambari upgrade) fails due to package import errors for cint (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c9908772
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c9908772
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c9908772
Branch: refs/heads/branch-2.2
Commit: c99087729b55f9e9b8745a37d4d65f4afbaa29a0
Parents: 34a076b
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Tue Mar 29 19:07:50 2016 +0300
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Tue Mar 29 19:10:34 2016 +0300
----------------------------------------------------------------------
ambari-agent/conf/unix/ambari-agent | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c9908772/ambari-agent/conf/unix/ambari-agent
----------------------------------------------------------------------
diff --git a/ambari-agent/conf/unix/ambari-agent b/ambari-agent/conf/unix/ambari-agent
index 31e4100..991ce28 100755
--- a/ambari-agent/conf/unix/ambari-agent
+++ b/ambari-agent/conf/unix/ambari-agent
@@ -47,6 +47,7 @@ OUTFILE=/var/log/ambari-agent/ambari-agent.out
LOGFILE=/var/log/ambari-agent/ambari-agent.log
AGENT_SCRIPT=/usr/lib/python2.6/site-packages/ambari_agent/main.py
AGENT_TMP_DIR=/var/lib/ambari-agent/tmp
+AGENT_WORKING_DIR=/var/lib/ambari-agent
AMBARI_AGENT_PY_SCRIPT=/usr/lib/python2.6/site-packages/ambari_agent/AmbariAgent.py
OK=1
NOTOK=0
@@ -62,7 +63,7 @@ if [ "$EUID" -ne 0 ] ; then
fi
# set reliable cwd for this and child processes.
-cd $AGENT_TMP_DIR
+cd $AGENT_WORKING_DIR
keysdir=$(awk -F "=" '/keysdir/ {print $2}' /etc/ambari-agent/conf/ambari-agent.ini)
# trim spaces
[2/2] ambari git commit: AMBARI-15617 Express Upgrade (after Ambari
upgrade) fails due to package import errors for cint (dlysnichenko)
Posted by dm...@apache.org.
AMBARI-15617 Express Upgrade (after Ambari upgrade) fails due to package import errors for cint (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d6062346
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d6062346
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d6062346
Branch: refs/heads/trunk
Commit: d606234655c9afc043852a664ef147a7d447d3a8
Parents: 6d668d2
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Tue Mar 29 19:11:04 2016 +0300
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Tue Mar 29 19:11:04 2016 +0300
----------------------------------------------------------------------
ambari-agent/conf/unix/ambari-agent | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d6062346/ambari-agent/conf/unix/ambari-agent
----------------------------------------------------------------------
diff --git a/ambari-agent/conf/unix/ambari-agent b/ambari-agent/conf/unix/ambari-agent
index 0d1bc23..fbe219d 100755
--- a/ambari-agent/conf/unix/ambari-agent
+++ b/ambari-agent/conf/unix/ambari-agent
@@ -56,6 +56,7 @@ OUTFILE=$AMBARI_AGENT_LOG_DIR/ambari-agent.out
LOGFILE=$AMBARI_AGENT_LOG_DIR/ambari-agent.log
AGENT_SCRIPT=/usr/lib/python2.6/site-packages/ambari_agent/main.py
AGENT_TMP_DIR=/var/lib/ambari-agent/tmp
+AGENT_WORKING_DIR=/var/lib/ambari-agent
AMBARI_AGENT_PY_SCRIPT=/usr/lib/python2.6/site-packages/ambari_agent/AmbariAgent.py
OK=1
NOTOK=0
@@ -71,7 +72,7 @@ if [ "$EUID" -ne 0 ] ; then
fi
# set reliable cwd for this and child processes.
-cd $AGENT_TMP_DIR
+cd $AGENT_WORKING_DIR
change_files_permissions() {
if [ ! -z "$keysdir" ]; then