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/03/25 12:54:11 UTC
[1/2] ambari git commit: AMBARI-14926. ambari cached hdfs.py
conflicts with python hdfs lib resulting into monitoring errors (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 7e6b33a19 -> 68d42abe1
refs/heads/trunk c0a4d5eef -> 93624db6d
AMBARI-14926. ambari cached hdfs.py conflicts with python hdfs lib resulting into monitoring errors (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/93624db6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/93624db6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/93624db6
Branch: refs/heads/trunk
Commit: 93624db6d7740b8d877af77978328bc7243be42b
Parents: c0a4d5e
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Fri Mar 25 13:54:08 2016 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Fri Mar 25 13:54:08 2016 +0200
----------------------------------------------------------------------
.../src/main/python/ambari_agent/PythonReflectiveExecutor.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/93624db6/ambari-agent/src/main/python/ambari_agent/PythonReflectiveExecutor.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/ambari_agent/PythonReflectiveExecutor.py b/ambari-agent/src/main/python/ambari_agent/PythonReflectiveExecutor.py
index 3808b3f..655b2fc 100644
--- a/ambari-agent/src/main/python/ambari_agent/PythonReflectiveExecutor.py
+++ b/ambari-agent/src/main/python/ambari_agent/PythonReflectiveExecutor.py
@@ -84,7 +84,7 @@ class PythonContext:
self.old_logging_disable = logging.root.manager.disable
logging.disable(logging.ERROR)
- sys.path.append(self.script_dir)
+ sys.path.insert(0, self.script_dir)
sys.argv = self.pythonCommand[1:]
def __exit__(self, exc_type, exc_val, exc_tb):
[2/2] ambari git commit: AMBARI-14926. ambari cached hdfs.py
conflicts with python hdfs lib resulting into monitoring errors (aonishuk)
Posted by ao...@apache.org.
AMBARI-14926. ambari cached hdfs.py conflicts with python hdfs lib resulting into monitoring errors (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/68d42abe
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/68d42abe
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/68d42abe
Branch: refs/heads/branch-2.2
Commit: 68d42abe1e91711c2a1d1b517887b56a452eeb19
Parents: 7e6b33a
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Fri Mar 25 13:54:11 2016 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Fri Mar 25 13:54:11 2016 +0200
----------------------------------------------------------------------
.../src/main/python/ambari_agent/PythonReflectiveExecutor.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/68d42abe/ambari-agent/src/main/python/ambari_agent/PythonReflectiveExecutor.py
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/python/ambari_agent/PythonReflectiveExecutor.py b/ambari-agent/src/main/python/ambari_agent/PythonReflectiveExecutor.py
index 613c770..12aa356 100644
--- a/ambari-agent/src/main/python/ambari_agent/PythonReflectiveExecutor.py
+++ b/ambari-agent/src/main/python/ambari_agent/PythonReflectiveExecutor.py
@@ -83,7 +83,7 @@ class PythonContext:
self.old_logging_disable = logging.root.manager.disable
logging.disable(logging.ERROR)
- sys.path.append(self.script_dir)
+ sys.path.insert(0, self.script_dir)
sys.argv = self.pythonCommand[1:]
def __exit__(self, exc_type, exc_val, exc_tb):