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 2016/02/24 21:56:28 UTC
ambari git commit: AMBARI-15163. 'ambari-server start' is failed
[import FatalException,
NonFatalException] after upgrade from 2.1.2 ... 2.2.0.0 etc to 2.2.1.1
(aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 3f33edf50 -> 9bad06c0f
AMBARI-15163. 'ambari-server start' is failed [import FatalException, NonFatalException] after upgrade from 2.1.2 ... 2.2.0.0 etc to 2.2.1.1 (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9bad06c0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9bad06c0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9bad06c0
Branch: refs/heads/trunk
Commit: 9bad06c0f27135bba2e377bdb87927c45ae41502
Parents: 3f33edf
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Wed Feb 24 22:56:02 2016 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Wed Feb 24 22:56:02 2016 +0200
----------------------------------------------------------------------
ambari-server/conf/unix/install-helper.sh | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/9bad06c0/ambari-server/conf/unix/install-helper.sh
----------------------------------------------------------------------
diff --git a/ambari-server/conf/unix/install-helper.sh b/ambari-server/conf/unix/install-helper.sh
index 918ea1d..8d270da 100644
--- a/ambari-server/conf/unix/install-helper.sh
+++ b/ambari-server/conf/unix/install-helper.sh
@@ -31,6 +31,7 @@ RESOURCE_MANAGEMENT_DIR_SERVER="${ROOT}/usr/lib/ambari-server/lib/resource_manag
JINJA_SERVER_DIR="${ROOT}/usr/lib/ambari-server/lib/ambari_jinja2"
SIMPLEJSON_SERVER_DIR="${ROOT}/usr/lib/ambari-server/lib/ambari_simplejson"
AMBARI_PROPERTIES="${ROOT}/etc/ambari-server/conf/ambari.properties"
+AMBARI_ENV_RPMSAVE="${ROOT}/var/lib/ambari-server/ambari-env.sh.rpmsave" # this turns into ambari-env.sh during ambari-server start
PYTHON_WRAPER_DIR="${ROOT}/usr/bin/"
PYTHON_WRAPER_TARGET="${PYTHON_WRAPER_DIR}/ambari-python-wrap"
@@ -110,6 +111,12 @@ do_install(){
else
$AUTOSTART_SERVER_CMD
fi
+
+ PYTHON_PATH_LINE='export PYTHONPATH=$PYTHONPATH:/usr/lib/python2.6/site-packages'
+ grep "^$PYTHON_PATH_LINE\$" "$AMBARI_ENV_RPMSAVE" > /dev/null
+ if [ $? -ne 0 ]; then
+ echo -e "\n$PYTHON_PATH_LINE" >> $AMBARI_ENV_RPMSAVE
+ fi
}
do_remove(){