You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2013/01/10 22:15:58 UTC
svn commit: r1431648 - in /incubator/ambari/trunk: ./ ambari-web/app/
ambari-web/app/controllers/wizard/ ambari-web/app/data/
ambari-web/app/templates/wizard/ ambari-web/app/utils/
Author: yusaku
Date: Thu Jan 10 21:15:58 2013
New Revision: 1431648
URL: http://svn.apache.org/viewvc?rev=1431648&view=rev
Log:
AMBARI-1149. HIVE_METASTORE needs to be started as a Hive component. (yusaku)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step5_controller.js
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step6_controller.js
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js
incubator/ambari/trunk/ambari-web/app/data/service_components.js
incubator/ambari/trunk/ambari-web/app/data/services.js
incubator/ambari/trunk/ambari-web/app/initialize.js
incubator/ambari/trunk/ambari-web/app/messages.js
incubator/ambari/trunk/ambari-web/app/templates/wizard/step5.hbs
incubator/ambari/trunk/ambari-web/app/utils/helper.js
Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1431648&r1=1431647&r2=1431648&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Thu Jan 10 21:15:58 2013
@@ -654,6 +654,9 @@ AMBARI-666 branch (unreleased changes)
BUG FIXES
+ AMBARI-1149. HIVE_METASTORE needs to be started as a Hive component.
+ (yusaku)
+
AMBARI-1088. HDFS capacity chart numbers are incorrect. (Srimanth Gunturi
via yusaku)
Modified: incubator/ambari/trunk/ambari-web/app/controllers/wizard/step5_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard/step5_controller.js?rev=1431648&r1=1431647&r2=1431648&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/wizard/step5_controller.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/wizard/step5_controller.js Thu Jan 10 21:15:58 2013
@@ -28,14 +28,16 @@ App.WizardStep5Controller = Em.Controlle
selectedServicesMasters:[],
zId:0,
- hasWebHCatServer: function () {
- return this.get('selectedServicesMasters').findProperty('component_name', 'WEBHCAT_SERVER');
+ hasHiveServer: function () {
+ return this.get('selectedServicesMasters').findProperty('component_name', 'HIVE_SERVER');
}.property('selectedServicesMasters'),
- updateWebHCatHost: function () {
+ updateHiveCoHosts: function () {
var hiveServer = this.get('selectedServicesMasters').findProperty('component_name', 'HIVE_SERVER');
+ var hiveMetastore = this.get('selectedServicesMasters').findProperty('component_name', 'HIVE_METASTORE');
var webHCatServer = this.get('selectedServicesMasters').findProperty('component_name', 'WEBHCAT_SERVER');
- if (hiveServer && webHCatServer) {
+ if (hiveServer && hiveMetastore && webHCatServer) {
+ this.get('selectedServicesMasters').findProperty('component_name', 'HIVE_METASTORE').set('selectedHost', hiveServer.get('selectedHost'));
this.get('selectedServicesMasters').findProperty('component_name', 'WEBHCAT_SERVER').set('selectedHost', hiveServer.get('selectedHost'));
}
}.observes('selectedServicesMasters.@each.selectedHost'),
@@ -148,7 +150,7 @@ App.WizardStep5Controller = Em.Controlle
zooKeeperHost.availableHosts = [];
zooKeeperHost.serviceId = services[index];
zooKeeperHost.isInstalled = false;
- zooKeeperHost.isWebHCatServer = false;
+ zooKeeperHost.isHiveCoHost = false;
resultComponents.add(zooKeeperHost);
});
@@ -162,7 +164,7 @@ App.WizardStep5Controller = Em.Controlle
componentObj.isInstalled = savedComponent ? savedComponent.isInstalled : App.Component.find().someProperty('componentName', _componentInfo.component_name);
componentObj.serviceId = services[index];
componentObj.availableHosts = [];
- componentObj.isWebHCatServer = _componentInfo.component_name == 'WEBHCAT_SERVER';
+ componentObj.isHiveCoHost = ['HIVE_METASTORE', 'WEBHCAT_SERVER'].contains(_componentInfo.component_name);
resultComponents.add(componentObj);
}
}, this);
@@ -313,19 +315,12 @@ App.WizardStep5Controller = Em.Controlle
}
},
+ getHiveMetastore:function (noOfHosts) {
+ return this.getHiveServer(noOfHosts);
+ },
+
getWebHCatServer:function (noOfHosts) {
- var hosts = this.get('hosts');
- if (noOfHosts === 1) {
- return hosts[0];
- } else if (noOfHosts < 3) {
- return hosts[1];
- } else if (noOfHosts <= 5) {
- return hosts[1];
- } else if (noOfHosts <= 30) {
- return hosts[2];
- } else {
- return hosts[4];
- }
+ return this.getHiveServer(noOfHosts);
},
getZooKeeperServer:function (noOfHosts) {
@@ -377,28 +372,31 @@ App.WizardStep5Controller = Em.Controlle
*/
selectHost:function (componentName) {
var noOfHosts = this.get('hosts').length;
- if (componentName === 'KERBEROS_SERVER') {
- return this.getKerberosServer(noOfHosts).host_name;
- } else if (componentName === 'NAMENODE') {
- return this.getNameNode(noOfHosts).host_name;
- } else if (componentName === 'SECONDARY_NAMENODE') {
- return this.getSNameNode(noOfHosts).host_name;
- } else if (componentName === 'JOBTRACKER') {
- return this.getJobTracker(noOfHosts).host_name;
- } else if (componentName === 'HBASE_MASTER') {
- return this.getHBaseMaster(noOfHosts).host_name;
- } else if (componentName === 'OOZIE_SERVER') {
- return this.getOozieServer(noOfHosts).host_name;
- } else if (componentName === 'HIVE_SERVER') {
- return this.getHiveServer(noOfHosts).host_name;
- } else if (componentName === 'WEBHCAT_SERVER') {
- return this.getWebHCatServer(noOfHosts).host_name;
- } else if (componentName === 'ZOOKEEPER_SERVER') {
- return this.getZooKeeperServer(noOfHosts);
- } else if (componentName === 'GANGLIA_SERVER') {
- return this.getGangliaServer(noOfHosts);
- } else if (componentName === 'NAGIOS_SERVER') {
- return this.getNagiosServer(noOfHosts);
+ switch (componentName) {
+ case 'KERBEROS_SERVER':
+ return this.getKerberosServer(noOfHosts).host_name;
+ case 'NAMENODE':
+ return this.getNameNode(noOfHosts).host_name;
+ case 'SECONDARY_NAMENODE':
+ return this.getSNameNode(noOfHosts).host_name;
+ case 'JOBTRACKER':
+ return this.getJobTracker(noOfHosts).host_name;
+ case 'HBASE_MASTER':
+ return this.getHBaseMaster(noOfHosts).host_name;
+ case 'OOZIE_SERVER':
+ return this.getOozieServer(noOfHosts).host_name;
+ case 'HIVE_SERVER':
+ return this.getHiveServer(noOfHosts).host_name;
+ case 'HIVE_METASTORE':
+ return this.getHiveMetastore(noOfHosts).host_name;
+ case 'WEBHCAT_SERVER':
+ return this.getWebHCatServer(noOfHosts).host_name;
+ case 'ZOOKEEPER_SERVER':
+ return this.getZooKeeperServer(noOfHosts);
+ case 'GANGLIA_SERVER':
+ return this.getGangliaServer(noOfHosts);
+ case 'NAGIOS_SERVER':
+ return this.getNagiosServer(noOfHosts);
}
},
Modified: incubator/ambari/trunk/ambari-web/app/controllers/wizard/step6_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard/step6_controller.js?rev=1431648&r1=1431647&r2=1431648&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/wizard/step6_controller.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/wizard/step6_controller.js Thu Jan 10 21:15:58 2013
@@ -198,7 +198,7 @@ App.WizardStep6Controller = Em.Controlle
renderSlaveHosts: function () {
var hostsObj = Em.Set.create();
var allHosts = this.getHostNames();
- var maxNoofHostComponents = 9;
+ var maxNoofHostComponents = 11;
var slaveComponents = this.get('content.slaveComponentHosts');
allHosts.forEach(function (_hostName) {
Modified: incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js?rev=1431648&r1=1431647&r2=1431648&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js Thu Jan 10 21:15:58 2013
@@ -833,6 +833,8 @@ App.WizardStep8Controller = Em.Controlle
return { "ServiceComponentInfo": { "component_name": _component.component_name } };
});
+ debugger;
+
// Service must be specified in terms of a query for creating multiple components at the same time.
// See AMBARI-1018.
var url = App.apiPrefix + '/clusters/' + this.get('clusterName') + '/services?ServiceInfo/service_name=' + _service;
@@ -1246,6 +1248,7 @@ App.WizardStep8Controller = Em.Controlle
configs.forEach(function (_configProperty) {
hiveProperties[_configProperty.name] = _configProperty.value;
}, this);
+ hiveProperties['hive.metastore.uris'] = 'thrift://' + this.get('globals').findProperty('hivemetastore_host').value + ':9083';
hiveProperties['javax.jdo.option.ConnectionURL'] =
'jdbc:mysql://' + this.get('globals').findProperty('name', 'hive_mysql_host').value +
'/' + this.get('globals').findProperty('name', 'hive_database_name').value + '?createDatabaseIfNotExist=true';
Modified: incubator/ambari/trunk/ambari-web/app/data/service_components.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/data/service_components.js?rev=1431648&r1=1431647&r2=1431648&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/data/service_components.js (original)
+++ incubator/ambari/trunk/ambari-web/app/data/service_components.js Thu Jan 10 21:15:58 2013
@@ -156,6 +156,14 @@ module.exports = new Ember.Set([
},
{
service_name: 'HIVE',
+ component_name: 'HIVE_METASTORE',
+ display_name: 'Hive Metastore',
+ isMaster: true,
+ isClient: false,
+ description: ''
+ },
+ {
+ service_name: 'HIVE',
component_name: 'HIVE_CLIENT',
display_name: 'Hive Client',
isMaster: false,
Modified: incubator/ambari/trunk/ambari-web/app/data/services.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/data/services.js?rev=1431648&r1=1431647&r2=1431648&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/data/services.js (original)
+++ incubator/ambari/trunk/ambari-web/app/data/services.js Thu Jan 10 21:15:58 2013
@@ -53,6 +53,20 @@ module.exports = [
description: Em.I18n.t('services.hive.description')
},
{
+ serviceName: 'HCATALOG',
+ displayName: 'HCatalog',
+ isDisabled: false,
+ isSelected: true,
+ isHidden: true
+ },
+ {
+ serviceName: 'WEBHCAT',
+ displayName: 'WebHCat',
+ isDisabled: false,
+ isSelected: true,
+ isHidden: true
+ },
+ {
serviceName: 'HBASE',
displayName: 'HBase + ZooKeeper',
isDisabled: false,
@@ -81,20 +95,6 @@ module.exports = [
description: Em.I18n.t('services.oozie.description')
},
{
- serviceName: 'HCATALOG',
- displayName: 'HCatalog',
- isDisabled: false,
- isSelected: true,
- isHidden: true
- },
- {
- serviceName: 'WEBHCAT',
- displayName: 'WebHCat',
- isDisabled: false,
- isSelected: true,
- isHidden: true
- },
- {
serviceName: 'ZOOKEEPER',
displayName: 'ZooKeeper',
isDisabled: false,
Modified: incubator/ambari/trunk/ambari-web/app/initialize.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/initialize.js?rev=1431648&r1=1431647&r2=1431648&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/initialize.js (original)
+++ incubator/ambari/trunk/ambari-web/app/initialize.js Thu Jan 10 21:15:58 2013
@@ -19,9 +19,9 @@
window.App = require('app');
-App.testMode = false;
+App.testMode = true;
App.skipBootstrap = false;
-App.alwaysGoToInstaller = false;
+App.alwaysGoToInstaller = true;
App.apiPrefix = '/api/v1';
App.defaultStackVersion = 'HDP-1.2.0';
App.defaultLocalStackVersion = 'HDPLocal-1.2.0';
Modified: incubator/ambari/trunk/ambari-web/app/messages.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/messages.js?rev=1431648&r1=1431647&r2=1431648&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/messages.js (original)
+++ incubator/ambari/trunk/ambari-web/app/messages.js Thu Jan 10 21:15:58 2013
@@ -118,7 +118,7 @@ Em.I18n.translations = {
'installer.step5.header':'Assign Masters',
'installer.step5.attention':' hosts not running master services',
'installer.step5.body':'Assign master components to hosts you want to run them on.',
- 'installer.step5.body.webhcat':'<i class="icon-asterisks">✵</i> Hive Server and WebHCat Server will be co-hosted on the same server.',
+ 'installer.step5.body.hive':'<i class="icon-asterisks">✵</i> Hive Server, Hive Metastore, and WebHCat Server will be co-hosted on the same server.',
'installer.step6.header':'Assign Slaves and Clients',
'installer.step6.body':'Assign slave and client components to hosts you want to run them on.<br/>Hosts that are assigned master components are shown with <i class=icon-asterisks>✵</i>. <br/>"Client" will install ',
Modified: incubator/ambari/trunk/ambari-web/app/templates/wizard/step5.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/wizard/step5.hbs?rev=1431648&r1=1431647&r2=1431648&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/wizard/step5.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/wizard/step5.hbs Thu Jan 10 21:15:58 2013
@@ -19,9 +19,9 @@
<h2>{{t installer.step5.header}}</h2>
<div class="alert alert-info">
{{t installer.step5.body}}
- {{#if hasWebHCatServer}}
+ {{#if hasHiveServer}}
<br>
- {{t installer.step5.body.webhcat}}
+ {{t installer.step5.body.hive}}
{{/if}}
</div>
<div class="assign-masters">
@@ -31,7 +31,7 @@
{{#each selectedServicesMasters}}
<div class="control-group">
<label class="control-label">{{display_name}}:</label>
- {{#if isWebHCatServer}}
+ {{#if isHiveCoHost}}
<label class="host-name">{{selectedHost}}<i class="icon-asterisks">✵</i></label>
{{else}}
<div class="controls">
Modified: incubator/ambari/trunk/ambari-web/app/utils/helper.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/utils/helper.js?rev=1431648&r1=1431647&r2=1431648&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/utils/helper.js (original)
+++ incubator/ambari/trunk/ambari-web/app/utils/helper.js Thu Jan 10 21:15:58 2013
@@ -288,6 +288,8 @@ App.format = {
return 'MySQL Server';
case 'HIVE_SERVER':
return 'Hive Server';
+ case 'HIVE_METASTORE':
+ return 'Hive Metastore';
case 'HIVE_CLIENT':
return 'Hive Client';
case 'HIVE_SERVICE_CHECK':