[ambari] branch trunk updated: AMBARI-24514. conf-select/stack-select operations can yield incorrect result with parallel_execution=1 (aonishuk)

[aonishuk]

This is an automated email from the ASF dual-hosted git repository.

aonishuk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 9491f1f  AMBARI-24514. conf-select/stack-select operations can yield 
incorrect result with parallel_execution=1 (aonishuk)
9491f1f is described below

commit 9491f1fd0232597c2e400b6b73ba1afb2dea50cc
Author: Andrew Onishuk <aonis...@hortonworks.com>
AuthorDate: Tue Aug 21 11:06:42 2018 +0300

    AMBARI-24514. conf-select/stack-select operations can yield incorrect 
result with parallel_execution=1 (aonishuk)
---
 .../src/main/python/resource_management/libraries/script/script.py      | 2 +-
 .../src/main/resources/stack-hooks/after-INSTALL/scripts/params.py      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/ambari-common/src/main/python/resource_management/libraries/script/script.py 
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
index d3de7c6..3725aec 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/script/script.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
@@ -1133,7 +1133,7 @@ class Script(object):
     if Script.instance is None:
 
       from resource_management.libraries.functions.default import default
-      use_proxy = 
default("/agentConfigParams/agent/use_system_proxy_settings", True)
+      use_proxy = 
default("/agentLevelParams/agentConfigParams/agent/use_system_proxy_settings", 
True)
       if not use_proxy:
         reconfigure_urllib2_opener(ignore_system_proxy=True)
 
diff --git 
a/ambari-server/src/main/resources/stack-hooks/after-INSTALL/scripts/params.py 
b/ambari-server/src/main/resources/stack-hooks/after-INSTALL/scripts/params.py
index a30949d..699d33a 100644
--- 
a/ambari-server/src/main/resources/stack-hooks/after-INSTALL/scripts/params.py
+++ 
b/ambari-server/src/main/resources/stack-hooks/after-INSTALL/scripts/params.py
@@ -35,7 +35,7 @@ tmp_dir = Script.get_tmp_dir()
 
 dfs_type = default("/clusterLevelParams/dfs_type", "")
 
-is_parallel_execution_enabled = 
int(default("/agentConfigParams/agent/parallel_execution", 0)) == 1
+is_parallel_execution_enabled = 
int(default("/agentLevelParams/agentConfigParams/agent/parallel_execution", 0)) 
== 1
 host_sys_prepped = default("/ambariLevelParams/host_sys_prepped", False)
 
 sudo = AMBARI_SUDO_BINARY