You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by st...@apache.org on 2016/09/07 14:45:30 UTC
ambari git commit: AMBARI-17891. Provide stack-advisor support for
Microsoft-R service. (Attila Doroszlai via stoader)
Repository: ambari
Updated Branches:
refs/heads/trunk 56a6ff823 -> 60d96b155
AMBARI-17891. Provide stack-advisor support for Microsoft-R service. (Attila Doroszlai via stoader)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/60d96b15
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/60d96b15
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/60d96b15
Branch: refs/heads/trunk
Commit: 60d96b15587642b561efc95c6c73277c5e90d534
Parents: 56a6ff8
Author: Attila Doroszlai <ad...@hortonworks.com>
Authored: Wed Sep 7 16:44:21 2016 +0200
Committer: Toader, Sebastian <st...@hortonworks.com>
Committed: Wed Sep 7 16:45:06 2016 +0200
----------------------------------------------------------------------
.../MICROSOFT_R/8.0.0/service_advisor.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/60d96b15/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.0/service_advisor.py
----------------------------------------------------------------------
diff --git a/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.0/service_advisor.py b/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.0/service_advisor.py
index 554be2d..891d2c9 100644
--- a/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.0/service_advisor.py
+++ b/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.0/service_advisor.py
@@ -34,14 +34,14 @@ except Exception as e:
traceback.print_exc()
print "Failed to load parent"
-class HDP23MICROSOFT_RServiceAdvisor(service_advisor.ServiceAdvisor):
+class MICROSOFT_R800ServiceAdvisor(service_advisor.ServiceAdvisor):
- def colocateService(self, stackAdvisor, hostsComponentsMap, serviceComponents):
+ def colocateService(self, hostsComponentsMap, serviceComponents):
# colocate R_CLIENT with NODEMANAGERs and YARN_CLIENTs
rClientComponent = [component for component in serviceComponents if component["StackServiceComponents"]["component_name"] == "MICROSOFT_R_CLIENT"]
traceback.print_tb(None)
rClientComponent = rClientComponent[0]
- if not stackAdvisor.isComponentHostsPopulated(rClientComponent):
+ if not self.isComponentHostsPopulated(rClientComponent):
for hostName in hostsComponentsMap.keys():
hostComponents = hostsComponentsMap[hostName]
if ({"name": "NODEMANAGER"} in hostComponents or {"name": "YARN_CLIENT"} in hostComponents) \
@@ -51,18 +51,18 @@ class HDP23MICROSOFT_RServiceAdvisor(service_advisor.ServiceAdvisor):
and {"name": "MICROSOFT_R_CLIENT"} in hostComponents:
hostsComponentsMap[hostName].remove({"name": "MICROSOFT_R_CLIENT"})
- def getComponentLayoutValidations(self, stackAdvisor, services, hosts):
+ def getServiceComponentLayoutValidations(self, services, hosts):
componentsListList = [service["components"] for service in services["services"]]
componentsList = [item["StackServiceComponents"] for sublist in componentsListList for item in sublist]
hostsList = [host["Hosts"]["host_name"] for host in hosts["items"]]
hostsCount = len(hostsList)
rClientHosts = self.getHosts(componentsList, "MICROSOFT_R_CLIENT")
- expectedrClientHosts = set(self.getHosts(componentsList, "NODEMANAGER") + self.getHosts(componentsList, "YARN_CLIENT"))
+ expectedrClientHosts = set(self.getHosts(componentsList, "NODEMANAGER")) | set(self.getHosts(componentsList, "YARN_CLIENT"))
items = []
- # Generate WARNING if any PXF is not colocated with NAMENODE or DATANODE
+ # Generate WARNING if any R_CLIENT is not colocated with NODEMANAGER or YARN_CLIENT
mismatchHosts = sorted(expectedrClientHosts.symmetric_difference(set(rClientHosts)))
if len(mismatchHosts) > 0:
hostsString = ', '.join(mismatchHosts)