Repository: ambari Updated Branches: refs/heads/trunk cb96d5389 -> cf7ec1298
AMBARI-18122. "hive.metastore.uris" and "templeton.hive.properties" configs gets wrongly updated when WebHCat server is added. (onechiporenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cf7ec129 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cf7ec129 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cf7ec129 Branch: refs/heads/trunk Commit: cf7ec1298c766a2e0a8dc66c28ea0d8179dae465 Parents: cb96d53 Author: Oleg Nechiporenko <onechipore...@apache.org> Authored: Thu Aug 11 19:06:42 2016 +0300 Committer: Oleg Nechiporenko <onechipore...@apache.org> Committed: Thu Aug 11 19:13:32 2016 +0300 ---------------------------------------------------------------------- ambari-web/app/messages.js | 4 ++-- .../configs/add_component_config_initializer.js | 6 ++---- .../test/controllers/main/host/details_test.js | 16 ++++++++-------- 3 files changed, 12 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/cf7ec129/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index b9f7fed..4cf3564 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -2567,9 +2567,9 @@ Em.I18n.translations = { 'hosts.host.decommissioned':'Decommissioned', 'hosts.host.decommissioning':'Decommissioning', 'hosts.host.addComponent.HIVE_METASTORE':'Adding <i>Hive Metastore</i> will reconfigure such properties:<ul><li>hive.metastore.uris</li><li>templeton.hive.properties</li></ul>', - 'hosts.host.addComponent.WEBHCAT_SERVER':'Adding <i>WebHCat Server</i> will reconfigure such properties:<ul><li>hive.metastore.uris</li><li>templeton.hive.properties</li></ul>', + 'hosts.host.addComponent.WEBHCAT_SERVER':'You are about to add <i>WebHCat Server</i>. Are you sure?', 'hosts.host.deleteComponent.popup.deleteHiveMetastore':'Deleting <i>Hive Metastore</i> will reconfigure such properties:<ul><li>hive.metastore.uris</li><li>templeton.hive.properties</li></ul>', - 'hosts.host.deleteComponent.popup.deleteWebHCatServer':'Deleting <i>WebHCat Server</i> will reconfigure such properties:<ul><li>hive.metastore.uris</li><li>templeton.hive.properties</li></ul>', + 'hosts.host.deleteComponent.popup.deleteWebHCatServer':'You are about to delete <i>WebHCat Server</i>. Are you sure?', 'hosts.host.configs.save.note': 'This configuration is created by ambari while installing/deleting {0} component on a host', 'hosts.component.passive.implied.host.mode.tooltip':'Cannot Turn Off Maintenance Mode because Host is in Maintenance Mode', http://git-wip-us.apache.org/repos/asf/ambari/blob/cf7ec129/ambari-web/app/utils/configs/add_component_config_initializer.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/configs/add_component_config_initializer.js b/ambari-web/app/utils/configs/add_component_config_initializer.js index 9c27f20..6a8ab4c 100644 --- a/ambari-web/app/utils/configs/add_component_config_initializer.js +++ b/ambari-web/app/utils/configs/add_component_config_initializer.js @@ -59,7 +59,7 @@ App.AddComponentConfigInitializer = App.HaConfigInitializerClass.extend(App.Host 'nimbus.seeds': this.getHostsListComponentJSONStringifiedConfig('NIMBUS', true), 'hadoop.proxyuser.{{webhcatUser}}.hosts': this.getComponentsHostsConfig(['HIVE_SERVER', 'WEBHCAT_SERVER', 'HIVE_METASTORE'], false, true), 'hadoop.proxyuser.{{hiveUser}}.hosts': this.getComponentsHostsConfig(['HIVE_SERVER', 'WEBHCAT_SERVER', 'HIVE_METASTORE'], false, true), - 'hive.metastore.uris': this.getHostsWithPortConfig(['WEBHCAT_SERVER', 'HIVE_METASTORE'], 'thrift://', '', ',thrift://', 'hiveMetastorePort', true) + 'hive.metastore.uris': this.getHostsWithPortConfig(['HIVE_METASTORE'], 'thrift://', '', ',thrift://', 'hiveMetastorePort', true) }; }, @@ -225,7 +225,7 @@ App.AddComponentConfigInitializer = App.HaConfigInitializerClass.extend(App.Host _initTempletonHiveProperties: function(configProperty, localDB, dependecies, initializer) { var hostNames = localDB.masterComponentHosts.filter(function(masterComponent) { - return ['WEBHCAT_SERVER', 'HIVE_METASTORE'].contains(masterComponent.component) && masterComponent.isInstalled === true; + return ['HIVE_METASTORE'].contains(masterComponent.component) && masterComponent.isInstalled === true; }).mapProperty('hostName').uniq().sort(); var hiveMSHosts = hostNames.map(function(hostName) { return "thrift://" + hostName + ":" + dependecies.hiveMetastorePort; @@ -304,8 +304,6 @@ App.AddHiveComponentsInitializer = App.AddComponentConfigInitializer.create({ */ App.AddWebHCatComponentsInitializer = App.AddComponentConfigInitializer.create({ initializeForProperties: [ - 'hive.metastore.uris', - 'templeton.hive.properties', 'hadoop.proxyuser.{{webhcatUser}}.hosts' ] }); http://git-wip-us.apache.org/repos/asf/ambari/blob/cf7ec129/ambari-web/test/controllers/main/host/details_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/controllers/main/host/details_test.js b/ambari-web/test/controllers/main/host/details_test.js index 66bd454..71efbae 100644 --- a/ambari-web/test/controllers/main/host/details_test.js +++ b/ambari-web/test/controllers/main/host/details_test.js @@ -3756,10 +3756,10 @@ describe('App.MainHostDetailsController', function () { { "properties": { "hive-site": makeFileNameProps('hive-site', [ - ['hive.metastore.uris', 'thrift://host1:9083,thrift://host2:9083,thrift://host3:9083'] + ['hive.metastore.uris', 'thrift://host1:9083'] ]).properties, "webhcat-site": makeFileNameProps('webhcat-site', [ - ['templeton.hive.properties', 'hive.metastore.local=false,hive.metastore.uris=thrift://host1:9083\\,thrift://host2:9083\\,thrift://host3:9083,hive.metastore.sasl.enabled=false'] + ['templeton.hive.properties', 'hive.metastore.local=false,hive.metastore.uris=thrift://host1:9083,hive.metastore.sasl.enabled=false'] ]).properties, "hive-env": makeFileNameProps('hive-env', [ ['hive_user', 'hive_user_val'] @@ -3806,10 +3806,10 @@ describe('App.MainHostDetailsController', function () { { "properties": { "hive-site": makeFileNameProps('hive-site', [ - ['hive.metastore.uris', 'thrift://host1:1111,thrift://host2:1111,thrift://host3:1111'] + ['hive.metastore.uris', 'thrift://host1:1111,thrift://host2:1111'] ]).properties, "webhcat-site": makeFileNameProps('webhcat-site', [ - ['templeton.hive.properties', 'hive.metastore.local=false,hive.metastore.uris=thrift://host1:1111\\,thrift://host2:1111\\,thrift://host3:1111,hive.metastore.sasl.enabled=false'] + ['templeton.hive.properties', 'hive.metastore.local=false,hive.metastore.uris=thrift://host1:1111\\,thrift://host2:1111,hive.metastore.sasl.enabled=false'] ]).properties, "hive-env": makeFileNameProps('hive-env', [ ['hive_user', 'hive_user_val'] @@ -3859,10 +3859,10 @@ describe('App.MainHostDetailsController', function () { { "properties": { "hive-site": makeFileNameProps('hive-site', [ - ['hive.metastore.uris', 'thrift://host1:1111,thrift://host3:1111'] + ['hive.metastore.uris', 'thrift://host1:1111'] ]).properties, "webhcat-site": makeFileNameProps('webhcat-site', [ - ['templeton.hive.properties', 'hive.metastore.local=false,hive.metastore.uris=thrift://host1:1111\\,thrift://host3:1111,hive.metastore.sasl.enabled=false'] + ['templeton.hive.properties', 'hive.metastore.local=false,hive.metastore.uris=thrift://host1:9083,hive.metastore.sasl.enabled=false'] ]).properties, "hive-env": makeFileNameProps('hive-env', [ ['webhcat_user', 'webhcat_user_val'] @@ -3911,10 +3911,10 @@ describe('App.MainHostDetailsController', function () { { "properties": { "hive-site": makeFileNameProps('hive-site', [ - ['hive.metastore.uris', 'thrift://host1:1111,thrift://host3:1111'] + ['hive.metastore.uris', 'thrift://host1:1111'] ]).properties, "webhcat-site": makeFileNameProps('webhcat-site', [ - ['templeton.hive.properties', 'hive.metastore.local=false,hive.metastore.uris=thrift://host1:1111\\,thrift://host3:1111,hive.metastore.sasl.enabled=false'] + ['templeton.hive.properties', 'hive.metastore.local=false,hive.metastore.uris=thrift://host1:1111,hive.metastore.sasl.enabled=false'] ]).properties, "hive-env": makeFileNameProps('hive-env', [ ['hive_user', 'hive_user_val']
