AMBARI-7519 Modify HiveServer2 dynamic service discovery config defaults & add ZooKeeper as a dependency for Hive in Ambari. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/90cca9bb Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/90cca9bb Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/90cca9bb Branch: refs/heads/branch-alerts-dev Commit: 90cca9bba11b6ee9d3ce10902afce685f922c6ce Parents: 8959037 Author: aBabiichuk <[email protected]> Authored: Fri Sep 26 17:08:30 2014 +0300 Committer: aBabiichuk <[email protected]> Committed: Fri Sep 26 17:08:49 2014 +0300 ---------------------------------------------------------------------- .../HDP/2.0.6/services/HIVE/configuration/hive-site.xml | 8 +++++++- ambari-web/app/controllers/main/host/details.js | 4 ++++ ambari-web/app/data/HDP2/site_properties.js | 12 +++++++++++- ambari-web/app/messages.js | 4 ++-- ambari-web/app/models/service_config.js | 1 + 5 files changed, 25 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/90cca9bb/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/configuration/hive-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/configuration/hive-site.xml index e64e6a0..452c750 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/configuration/hive-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HIVE/configuration/hive-site.xml @@ -311,7 +311,7 @@ limitations under the License. <property> <name>hive.server2.support.dynamic.service.discovery</name> - <value>false</value> + <value>true</value> <description>Whether HiveServer2 supports dynamic service discovery for its clients. To support this, each instance of HiveServer2 currently uses ZooKeeper to register itself, when it is brought up. JDBC/ODBC clients @@ -321,6 +321,12 @@ limitations under the License. </property> <property> + <name>hive.zookeeper.quorum</name> + <value>localhost:2181</value> + <description>ZooKeeper servers, as comma separated host:port pairs</description> + </property> + + <property> <name>hive.server2.zookeeper.namespace</name> <value>hiveserver2</value> <description>The parent node in ZooKeeper used by HiveServer2 when http://git-wip-us.apache.org/repos/asf/ambari/blob/90cca9bb/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 39d9086..11e5d04 100644 --- a/ambari-web/app/controllers/main/host/details.js +++ b/ambari-web/app/controllers/main/host/details.js @@ -621,6 +621,7 @@ App.MainHostDetailsController = Em.Controller.extend({ } if (services.someProperty('serviceName', 'HIVE')) { urlParams.push('(type=webhcat-site&tag=' + data.Clusters.desired_configs['webhcat-site'].tag + ')'); + urlParams.push('(type=hive-site&tag=' + data.Clusters.desired_configs['hive-site'].tag + ')'); } if (services.someProperty('serviceName', 'STORM')) { urlParams.push('(type=storm-site&tag=' + data.Clusters.desired_configs['storm-site'].tag + ')'); @@ -678,6 +679,9 @@ App.MainHostDetailsController = Em.Controller.extend({ if (configs['webhcat-site']) { configs['webhcat-site']['templeton.zookeeper.hosts'] = zksWithPort; } + if (configs['hive-site']) { + configs['hive-site']['hive.zookeeper.quorum'] = 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/90cca9bb/ambari-web/app/data/HDP2/site_properties.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js index ced1fd3..d176a92 100644 --- a/ambari-web/app/data/HDP2/site_properties.js +++ b/ambari-web/app/data/HDP2/site_properties.js @@ -529,11 +529,21 @@ module.exports = "id": "site property", "name": "hive.server2.support.dynamic.service.discovery", "displayName": "hive.server2.support.dynamic.service.discovery", - "defaultValue": false, + "defaultValue": true, "displayType": "checkbox", "category": "Advanced hive-site", "serviceName": "HIVE" }, + { + "id": "site property", + "name": "hive.zookeeper.quorum", + "displayName": "hive.zookeeper.quorum", + "defaultValue": "localhost:2181", + "displayType": "multiLine", + "isVisible": true, + "serviceName": "HIVE", + "category": "Advanced hive-site" + }, /**********************************************tez-site*****************************************/ { "id": "site property", http://git-wip-us.apache.org/repos/asf/ambari/blob/90cca9bb/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index a1e5a39..2dd6225 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -1707,8 +1707,8 @@ Em.I18n.translations = { '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></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></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></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></ul>', 'hosts.host.zooKeeper.configs.save.note': 'This configuration is created by ambari while installing/deleting zookeeper component on a host', 'hosts.host.addComponent.note':'<b>Important:</b> After this <i>{0}</i> is installed, go to <i>Services -> Nagios</i> to restart the Nagios service. This is required for the alerts and notifications to work properly.', 'hosts.host.addComponent.securityNote':'You are running your cluster in secure mode. You must set up the keytab for {0} on {1} before you proceed. Otherwise, the component will not be able to start properly.', http://git-wip-us.apache.org/repos/asf/ambari/blob/90cca9bb/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 6f3d32f..6a5c1ae 100644 --- a/ambari-web/app/models/service_config.js +++ b/ambari-web/app/models/service_config.js @@ -482,6 +482,7 @@ App.ServiceConfigProperty = Ember.Object.extend({ var zkHosts = masterComponentHostsInDB.filterProperty('component', 'ZOOKEEPER_SERVER').mapProperty('hostName'); this.setDefaultValue("(\\w*)", zkHosts); break; + case 'hive.zookeeper.quorum': case 'templeton.zookeeper.hosts': var zkHosts = masterComponentHostsInDB.filterProperty('component', 'ZOOKEEPER_SERVER').mapProperty('hostName'); var zkHostPort = zkHosts;
