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 2018/08/21 09:02:48 UTC
[ambari] branch branch-2.7 updated: AMBARI-24514.
conf-select/stack-select operations can yield incorrect result with
parallel_execution=1 (aonishuk)
This is an automated email from the ASF dual-hosted git repository.
aonishuk pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push:
new 8b5cc45 AMBARI-24514. conf-select/stack-select operations can yield incorrect result with parallel_execution=1 (aonishuk)
8b5cc45 is described below
commit 8b5cc45c0f626b04be66c83c3a045002d603b52c
Author: Andrew Onishuk <ao...@hortonworks.com>
AuthorDate: Tue Aug 21 11:06:47 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 e630f6e..fce6e0a 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 3c0efa7..dc64b0b 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