Repository: ambari Updated Branches: refs/heads/trunk 3d7fa6a44 -> 34741fe38
AMBARI-7696 configure hive token store to use zookeeper based token store. (ababiichuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/34741fe3 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/34741fe3 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/34741fe3 Branch: refs/heads/trunk Commit: 34741fe383e67ea3615deeda29597bbbbc973c13 Parents: 3d7fa6a Author: aBabiichuk <[email protected]> Authored: Fri Oct 10 12:43:17 2014 +0300 Committer: aBabiichuk <[email protected]> Committed: Fri Oct 10 12:43:35 2014 +0300 ---------------------------------------------------------------------- ambari-web/app/controllers/main/host/details.js | 1 + ambari-web/app/messages.js | 6 +++--- ambari-web/app/models/service_config.js | 1 + ambari-web/test/controllers/main/host/details_test.js | 8 ++++++++ 4 files changed, 13 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/34741fe3/ambari-web/app/controllers/main/host/details.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/host/details.js b/ambari-web/app/controllers/main/host/details.js index 75a555b..b90e9f1 100644 --- a/ambari-web/app/controllers/main/host/details.js +++ b/ambari-web/app/controllers/main/host/details.js @@ -713,6 +713,7 @@ App.MainHostDetailsController = Em.Controller.extend({ } if (configs['hive-site']) { configs['hive-site']['hive.zookeeper.quorum'] = zksWithPort; + configs['hive-site']['hive.cluster.delegation.token.store.zookeeper.connectString'] = zksWithPort; } if (configs['storm-site']) { configs['storm-site']['storm.zookeeper.servers'] = JSON.stringify(zks).replace(/"/g, "'"); http://git-wip-us.apache.org/repos/asf/ambari/blob/34741fe3/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index 4008fbc..6974f4f 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -1705,14 +1705,14 @@ Em.I18n.translations = { 'host.host.componentFilter.client':'Client Components', 'hosts.host.deleteComponent.popup.msg1':'Are you sure you want to delete {0}?', 'hosts.host.deleteComponent.popup.msg2':'<b>Important:</b> After this <i>{0}</i> is deleted, go to <i>Services -> Nagios</i> to restart the Nagios service. This is required for the alerts and notifications to work properly.', - 'hosts.host.deleteComponent.popup.deleteZooKeeperServer':'Deleting <i>ZooKeeper Server</i> may reconfigure such properties:<ul><li>ha.zookeeper.quorum</li><li>hbase.zookeeper.quorum</li><li>templeton.zookeeper.hosts</li><li>yarn.resourcemanager.zk-address</li><li>hive.zookeeper.quorum</li><li>slider.zookeeper.quorum</li></ul>', + 'hosts.host.deleteComponent.popup.deleteZooKeeperServer':'Deleting <i>ZooKeeper Server</i> may reconfigure such properties:<ul><li>ha.zookeeper.quorum</li><li>hbase.zookeeper.quorum</li><li>templeton.zookeeper.hosts</li><li>yarn.resourcemanager.zk-address</li><li>hive.zookeeper.quorum</li><li>slider.zookeeper.quorum</li><li>hive.cluster.delegation.token.store.zookeeper.connectString</li></ul>', 'hosts.host.deleteComponent.popup.warning':'<b>WARNING!</b> Delete the last <i>{0}</i> component in the cluster?</br>Deleting the last component in the cluster could result in permanent loss of service data.', 'hosts.host.deleteComponent.popup.confirm':'Confirm Delete', 'hosts.host.installComponent.popup.confirm':'Confirm Install', 'hosts.host.installComponent.msg':'Are you sure you want to install {0}?', 'hosts.host.addComponent.msg':'Are you sure you want to add {0}?', - 'hosts.host.addComponent.addZooKeeper':'Adding ZooKeeper Server may reconfigure such properties:<ul><li>ha.zookeeper.quorum</li><li>hbase.zookeeper.quorum</li><li>templeton.zookeeper.hosts</li><li>yarn.resourcemanager.zk-address</li><li>hive.zookeeper.quorum</li><li>slider.zookeeper.quorum</li></ul>', - 'hosts.host.addComponent.deleteHostWithZooKeeper':'Deleting host with ZooKeeper Server may reconfigure such properties:<ul><li>ha.zookeeper.quorum</li><li>hbase.zookeeper.quorum</li><li>templeton.zookeeper.hosts</li><li>yarn.resourcemanager.zk-address</li><li>hive.zookeeper.quorum</li><li>slider.zookeeper.quorum</li></ul>', + 'hosts.host.addComponent.addZooKeeper':'Adding ZooKeeper Server may reconfigure such properties:<ul><li>ha.zookeeper.quorum</li><li>hbase.zookeeper.quorum</li><li>templeton.zookeeper.hosts</li><li>yarn.resourcemanager.zk-address</li><li>hive.zookeeper.quorum</li><li>slider.zookeeper.quorum</li><li>hive.cluster.delegation.token.store.zookeeper.connectString</li></ul>', + 'hosts.host.addComponent.deleteHostWithZooKeeper':'Deleting host with ZooKeeper Server may reconfigure such properties:<ul><li>ha.zookeeper.quorum</li><li>hbase.zookeeper.quorum</li><li>templeton.zookeeper.hosts</li><li>yarn.resourcemanager.zk-address</li><li>hive.zookeeper.quorum</li><li>slider.zookeeper.quorum</li><li>hive.cluster.delegation.token.store.zookeeper.connectString</li></ul>', 'host.host.addComponent.popup.dependedComponents.body': '{0} requires {1} to be installed along with it on the same host. Please add them first and then try adding {0}', 'host.host.addComponent.popup.dependedComponents.header': 'Component dependencies', 'hosts.host.zooKeeper.configs.save.note': 'This configuration is created by ambari while installing/deleting zookeeper component on a host', http://git-wip-us.apache.org/repos/asf/ambari/blob/34741fe3/ambari-web/app/models/service_config.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/service_config.js b/ambari-web/app/models/service_config.js index f5dcf21..595f604 100644 --- a/ambari-web/app/models/service_config.js +++ b/ambari-web/app/models/service_config.js @@ -485,6 +485,7 @@ App.ServiceConfigProperty = Ember.Object.extend({ case 'hive.zookeeper.quorum': case 'templeton.zookeeper.hosts': case 'slider.zookeeper.quorum': + case 'hive.cluster.delegation.token.store.zookeeper.connectString': var zkHosts = masterComponentHostsInDB.filterProperty('component', 'ZOOKEEPER_SERVER').mapProperty('hostName'); var zkHostPort = zkHosts; var regex = "\\w*:(\\d+)"; //regex to fetch the port http://git-wip-us.apache.org/repos/asf/ambari/blob/34741fe3/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 7534d0c..1c31784 100644 --- a/ambari-web/test/controllers/main/host/details_test.js +++ b/ambari-web/test/controllers/main/host/details_test.js @@ -584,6 +584,14 @@ describe('App.MainHostDetailsController', function () { "templeton.zookeeper.hosts": "host1:2181" }}); }); + it('hive-site is present', function () { + var configs = {'hive-site': {}}; + expect(controller.setZKConfigs(configs, 'host1:2181', [])).to.be.true; + expect(configs).to.eql({"hive-site": { + 'hive.cluster.delegation.token.store.zookeeper.connectString': "host1:2181", + 'hive.zookeeper.quorum': "host1:2181" + }}); + }); it('storm-site is present', function () { var configs = {'storm-site': {}}; expect(controller.setZKConfigs(configs, '', ["host1", 'host2'])).to.be.true;
