Repository: ambari Updated Branches: refs/heads/trunk 2a298a3f7 -> da21afc7d
AMBARI-21053 Reverting Beacon stack advisor recommendation (mugdha) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/da21afc7 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/da21afc7 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/da21afc7 Branch: refs/heads/trunk Commit: da21afc7d9019454f872cff09fe91e8889fca54d Parents: 2a298a3 Author: Mugdha Varadkar <mug...@apache.org> Authored: Fri Jul 21 12:38:57 2017 +0530 Committer: Mugdha Varadkar <mug...@apache.org> Committed: Fri Jul 21 12:48:50 2017 +0530 ---------------------------------------------------------------------- .../stacks/HDP/2.6/services/stack_advisor.py | 33 +------------------- 1 file changed, 1 insertion(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/da21afc7/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py index fa86f6c..1555581 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py @@ -40,42 +40,11 @@ class HDP26StackAdvisor(HDP25StackAdvisor): "HIVE": self.recommendHIVEConfigurations, "HBASE": self.recommendHBASEConfigurations, "YARN": self.recommendYARNConfigurations, - "KAFKA": self.recommendKAFKAConfigurations, - "BEACON": self.recommendBEACONConfigurations + "KAFKA": self.recommendKAFKAConfigurations } parentRecommendConfDict.update(childRecommendConfDict) return parentRecommendConfDict - def recommendBEACONConfigurations(self, configurations, clusterData, services, hosts): - beaconEnvProperties = self.getSiteProperties(services['configurations'], 'beacon-env') - putbeaconEnvProperty = self.putProperty(configurations, "beacon-env", services) - - # database URL and driver class recommendations - if beaconEnvProperties and self.checkSiteProperties(beaconEnvProperties, 'beacon_store_driver') and self.checkSiteProperties(beaconEnvProperties, 'beacon_database'): - putbeaconEnvProperty('beacon_store_driver', self.getDBDriver(beaconEnvProperties['beacon_database'])) - if beaconEnvProperties and self.checkSiteProperties(beaconEnvProperties, 'beacon_store_db_name', 'beacon_store_url') and self.checkSiteProperties(beaconEnvProperties, 'beacon_database'): - beaconServerHost = self.getHostWithComponent('BEACON', 'BEACON_SERVER', services, hosts) - beaconDBConnectionURL = beaconEnvProperties['beacon_store_url'] - protocol = self.getProtocol(beaconEnvProperties['beacon_database']) - oldSchemaName = self.getOldValue(services, "beacon-env", "beacon_store_db_name") - oldDBType = self.getOldValue(services, "beacon-env", "beacon_database") - # under these if constructions we are checking if beacon server hostname available, - # if it's default db connection url with "localhost" or if schema name was changed or if db type was changed (only for db type change from default mysql to existing mysql) - # or if protocol according to current db type differs with protocol in db connection url(other db types changes) - if beaconServerHost is not None: - if (beaconDBConnectionURL and "//localhost" in beaconDBConnectionURL) or oldSchemaName or oldDBType or (protocol and beaconDBConnectionURL and not beaconDBConnectionURL.startswith(protocol)): - dbConnection = self.getDBConnectionStringBeacon(beaconEnvProperties['beacon_database']).format(beaconServerHost['Hosts']['host_name'], beaconEnvProperties['beacon_store_db_name']) - putbeaconEnvProperty('beacon_store_url', dbConnection) - - def getDBConnectionStringBeacon(self, databaseType): - driverDict = { - 'NEW DERBY DATABASE': 'jdbc:derby:${{beacon.data.dir}}/${{beacon.store.db.name}}-db;create=true', - 'EXISTING MYSQL DATABASE': 'jdbc:mysql://{0}/{1}', - 'EXISTING MYSQL / MARIADB DATABASE': 'jdbc:mysql://{0}/{1}', - 'EXISTING ORACLE DATABASE': 'jdbc:oracle:thin:@//{0}:1521/{1}' - } - return driverDict.get(databaseType.upper()) - def recommendAtlasConfigurations(self, configurations, clusterData, services, hosts): super(HDP26StackAdvisor, self).recommendAtlasConfigurations(configurations, clusterData, services, hosts) servicesList = [service["StackServices"]["service_name"] for service in services["services"]]
