This is an automated email from the ASF dual-hosted git repository.
mpapirkovskyy 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 b7ce02f AMBARI-23660. Hosts topology can be incomplete for components
install during blueprint deploy (#1098)
b7ce02f is described below
commit b7ce02fde87206d1562ab3d1243f7bf3e7dbb3fe
Author: Myroslav Papirkovskyi <[email protected]>
AuthorDate: Wed Apr 25 21:55:07 2018 +0300
AMBARI-23660. Hosts topology can be incomplete for components install
during blueprint deploy (#1098)
* AMBARI-23660. Hosts topology can be incomplete for components install
during blueprint deploy. (mpapirkovskyy)
* AMBARI-23660. Hosts topology can be incomplete for components install
during blueprint deploy. (mpapirkovskyy)
---
.../src/main/python/ambari_agent/CustomServiceOrchestrator.py | 4 ++++
.../src/main/java/org/apache/ambari/server/utils/StageUtils.java | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git
a/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
b/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
index 7cf89ad..62cc3c8 100644
--- a/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
+++ b/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
@@ -485,6 +485,10 @@ class CustomServiceOrchestrator():
required_config_timestamp = command_header['requiredConfigTimestamp'] if
'requiredConfigTimestamp' in command_header else None
command_dict = self.configuration_builder.get_configuration(cluster_id,
service_name, component_name, required_config_timestamp)
+
+ # remove data populated from topology to avoid merge and just override
+ if 'clusterHostInfo' in command_header:
+ del command_dict['clusterHostInfo']
command = Utils.update_nested(Utils.get_mutable_copy(command_dict),
command_header)
return command
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java
b/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java
index 26be695..ce0d495 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java
@@ -373,7 +373,7 @@ public class StageUtils {
// a higher priority lookup
for (Service service : cluster.getServices().values()) {
for (ServiceComponent sc :
service.getServiceComponents().values()) {
- if (!sc.isClientComponent() &&
sc.getName().equals(hostComponent)) {
+ if (sc.getName().equals(hostComponent)) {
roleName = hostComponent.toLowerCase() + "_hosts";
additionalComponentToClusterInfoKeyMap.put(hostComponent,
roleName);
}
--
To stop receiving notification emails like this one, please contact
[email protected].
