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 2015/11/21 17:06:37 UTC
[2/2] ambari git commit: AMBARI-13984. Ambari-server/agent prefer
python2.7 over default python version (aonishuk)
AMBARI-13984. Ambari-server/agent prefer python2.7 over default python version (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/95a23640
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/95a23640
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/95a23640
Branch: refs/heads/branch-2.1
Commit: 95a23640227dfdacbc1da39c3bc53fa07a0e3e40
Parents: ff0067a
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Sat Nov 21 18:06:13 2015 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Sat Nov 21 18:06:13 2015 +0200
----------------------------------------------------------------------
ambari-agent/conf/unix/ambari-agent | 14 +++-----------
ambari-agent/conf/unix/ambari-env.sh | 3 +++
ambari-common/src/main/unix/ambari-python-wrap | 3 ---
ambari-server/conf/unix/ambari-env.sh | 4 ++++
ambari-server/sbin/ambari-server | 17 +++--------------
5 files changed, 13 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/95a23640/ambari-agent/conf/unix/ambari-agent
----------------------------------------------------------------------
diff --git a/ambari-agent/conf/unix/ambari-agent b/ambari-agent/conf/unix/ambari-agent
index 5a78e5f..c0760ec 100755
--- a/ambari-agent/conf/unix/ambari-agent
+++ b/ambari-agent/conf/unix/ambari-agent
@@ -40,6 +40,7 @@ export AMBARI_CONF_DIR=/etc/ambari-server/conf:$PATH
export PYTHONPATH=/usr/lib/python2.6/site-packages:$PYTHONPATH
AMBARI_AGENT=ambari-agent
+PYTHON_WRAP=/var/lib/ambari-agent/ambari-python-wrap
PIDFILE=/var/run/ambari-agent/$AMBARI_AGENT.pid
OUTFILE=/var/log/ambari-agent/ambari-agent.out
LOGFILE=/var/log/ambari-agent/ambari-agent.log
@@ -74,17 +75,8 @@ change_files_permissions() {
ambari-sudo.sh chown $current_user "/usr/lib/ambari-agent/"
}
-if [ -a /usr/bin/python2.7 ] && [ -z "$PYTHON" ]; then
- PYTHON=/usr/bin/python2.7
-fi
-
-if [ -a /usr/bin/python2.6 ] && [ -z "$PYTHON" ]; then
- PYTHON=/usr/bin/python2.6
-fi
-
-if [ "x$PYTHON" == "x" ]; then
- PYTHON=/usr/bin/python
-fi
+# fills $PYTHON
+. $PYTHON_WRAP -V 2>/dev/null
export PYTHON=$PYTHON
http://git-wip-us.apache.org/repos/asf/ambari/blob/95a23640/ambari-agent/conf/unix/ambari-env.sh
----------------------------------------------------------------------
diff --git a/ambari-agent/conf/unix/ambari-env.sh b/ambari-agent/conf/unix/ambari-env.sh
index a5f350f..1f93431 100644
--- a/ambari-agent/conf/unix/ambari-env.sh
+++ b/ambari-agent/conf/unix/ambari-env.sh
@@ -18,3 +18,6 @@
AMBARI_PASSPHRASE="DEV"
export PATH=$PATH:/var/lib/ambari-agent
export PYTHONPATH=$PYTHONPATH:/usr/lib/python2.6/site-packages
+
+# customize python binary for ambari
+# export PYTHON=/usr/bin/python2
http://git-wip-us.apache.org/repos/asf/ambari/blob/95a23640/ambari-common/src/main/unix/ambari-python-wrap
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/unix/ambari-python-wrap b/ambari-common/src/main/unix/ambari-python-wrap
index efc073b..8dab946 100755
--- a/ambari-common/src/main/unix/ambari-python-wrap
+++ b/ambari-common/src/main/unix/ambari-python-wrap
@@ -19,9 +19,6 @@
export PYTHONPATH=/usr/lib/python2.6/site-packages:/usr/lib/python2.6/site-packages/ambari_commons:$PYTHONPATH
-# reset settings
-unset PYTHON
-
# checking for default Python 2
if [ -a /usr/bin/python2 ] && [ -z "$PYTHON" ]; then
PYTHON=/usr/bin/python2
http://git-wip-us.apache.org/repos/asf/ambari/blob/95a23640/ambari-server/conf/unix/ambari-env.sh
----------------------------------------------------------------------
diff --git a/ambari-server/conf/unix/ambari-env.sh b/ambari-server/conf/unix/ambari-env.sh
index 972b7bc..e463ca6 100644
--- a/ambari-server/conf/unix/ambari-env.sh
+++ b/ambari-server/conf/unix/ambari-env.sh
@@ -17,5 +17,9 @@
AMBARI_PASSHPHRASE="DEV"
export AMBARI_JVM_ARGS=$AMBARI_JVM_ARGS' -Xms512m -Xmx2048m -Djava.security.auth.login.config=/etc/ambari-server/conf/krb5JAASLogin.conf -Djava.security.krb5.conf=/etc/krb5.conf -Djavax.security.auth.useSubjectCredsOnly=false'
export PATH=$PATH:/var/lib/ambari-server
+
+# customize python binary for ambari
+# export PYTHON=/usr/bin/python2
+
# to add additional directory or jar to server classpath use SERVER_CLASSPATH variable
# export SERVER_CLASSPATH=/etc/hadoop/conf/secure
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/95a23640/ambari-server/sbin/ambari-server
----------------------------------------------------------------------
diff --git a/ambari-server/sbin/ambari-server b/ambari-server/sbin/ambari-server
index 490d54d..47e2926 100755
--- a/ambari-server/sbin/ambari-server
+++ b/ambari-server/sbin/ambari-server
@@ -37,26 +37,15 @@ esac
export PATH=/usr/lib/ambari-server/*:$PATH:/sbin/:/usr/sbin
export AMBARI_CONF_DIR=/etc/ambari-server/conf
+PYTHON_WRAP=/var/lib/ambari-server/ambari-python-wrap
-# Because Ambari rpm unpacks modules here on all systems
-export PYTHONPATH=/usr/lib/python2.6/site-packages:$PYTHONPATH
-
-if [ -a /usr/bin/python2.7 ] && [ -z "$PYTHON" ]; then
- PYTHON=/usr/bin/python2.7
-fi
-
-if [ -a /usr/bin/python2.6 ] && [ -z "$PYTHON" ]; then
- PYTHON=/usr/bin/python2.6
-fi
+# fills $PYTHON
+. $PYTHON_WRAP -V 2>/dev/null
if [ -a /var/lib/ambari-server/ambari-env.sh ]; then
. /var/lib/ambari-server/ambari-env.sh
fi
-if [ -z "$PYTHON" ]; then
- PYTHON=/usr/bin/python
-fi
-
if [ -z "$AMBARI_PASSPHRASE" ]; then
AMBARI_PASSPHRASE="DEV"
fi