You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ak...@apache.org on 2014/01/16 15:54:05 UTC
git commit: AMBARI-4317. Falcon installation dependency check.
(Mikhail Bayuk via akovalenko)
Updated Branches:
refs/heads/trunk 5b03e2bb8 -> b01a7b7fa
AMBARI-4317. Falcon installation dependency check. (Mikhail Bayuk via akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b01a7b7f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b01a7b7f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b01a7b7f
Branch: refs/heads/trunk
Commit: b01a7b7fa1c498290e96af9285cbe945d59001af
Parents: 5b03e2b
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Thu Jan 16 16:49:05 2014 +0200
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Thu Jan 16 16:53:30 2014 +0200
----------------------------------------------------------------------
.../app/controllers/wizard/step4_controller.js | 25 +++++++++++++++++---
.../app/controllers/wizard/step5_controller.js | 11 ++++-----
ambari-web/app/messages.js | 2 ++
3 files changed, 29 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b01a7b7f/ambari-web/app/controllers/wizard/step4_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step4_controller.js b/ambari-web/app/controllers/wizard/step4_controller.js
index 6e948d3..b2011d7 100644
--- a/ambari-web/app/controllers/wizard/step4_controller.js
+++ b/ambari-web/app/controllers/wizard/step4_controller.js
@@ -53,6 +53,8 @@ App.WizardStep4Controller = Em.ArrayController.extend({
var webhcat = this.findProperty('serviceName', 'WEBHCAT');
var yarn = this.findProperty('serviceName', 'YARN');
var mapreduce2 = this.findProperty('serviceName', 'MAPREDUCE2');
+ var oozie = this.findProperty('serviceName', 'OOZIE');
+ var falcon = this.findProperty('serviceName', 'FALCON');
// prevent against getting error when not all elements have been loaded yet
if (hbase && zookeeper && hive && hcatalog && webhcat) {
@@ -98,6 +100,14 @@ App.WizardStep4Controller = Em.ArrayController.extend({
},
/**
+ * Check whether we should turn on <code>Oozie</code> service
+ * @return {Boolean}
+ */
+ needToAddOozie: function () {
+ return this.needAddService('OOZIE', ['FALCON']);
+ },
+
+ /**
* Check whether we should turn on <code>MapReduce</code> service
* @return {Boolean}
*/
@@ -186,8 +196,13 @@ App.WizardStep4Controller = Em.ArrayController.extend({
if (this.multipleDFSs()) {
this.multipleDFSPopup();
}
- else {
- this.validateMonitoring();
+ else {
+ if(this.needToAddOozie()) {
+ this.oozieCheckPopup();
+ }
+ else {
+ this.validateMonitoring();
+ }
}
}
}
@@ -251,6 +266,10 @@ App.WizardStep4Controller = Em.ArrayController.extend({
this.needToAddServicePopup({serviceName:'ZOOKEEPER', selected: true}, 'zooKeeperCheck');
},
+ oozieCheckPopup: function () {
+ this.needToAddServicePopup({serviceName:'OOZIE', selected: true}, 'oozieCheck');
+ },
+
monitoringCheckPopup: function () {
App.ModalPopup.show({
header: Em.I18n.t('installer.step4.monitoringCheck.popup.header'),
@@ -261,4 +280,4 @@ App.WizardStep4Controller = Em.ArrayController.extend({
}
});
}
-});
\ No newline at end of file
+});
http://git-wip-us.apache.org/repos/asf/ambari/blob/b01a7b7f/ambari-web/app/controllers/wizard/step5_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step5_controller.js b/ambari-web/app/controllers/wizard/step5_controller.js
index a93d325..247ec6c 100644
--- a/ambari-web/app/controllers/wizard/step5_controller.js
+++ b/ambari-web/app/controllers/wizard/step5_controller.js
@@ -353,6 +353,10 @@ App.WizardStep5Controller = Em.Controller.extend({
return this.getGangliaServer(noOfHosts);
},
+ getOozieServer:function(){
+ return this.selectHost('OOZIE_SERVER');
+ },
+
getNimbusServer: function(noOfHosts) {
return this.getGangliaServer(noOfHosts);
},
@@ -444,12 +448,7 @@ App.WizardStep5Controller = Em.Controller.extend({
case 'HUE_SERVER':
return this.getHueServer(noOfHosts);
case 'FALCON_SERVER':
- return this.getHostForComponent(noOfHosts, {
- "3" : 0,
- "6" : 0,
- "31" : 1,
- "else" : 2
- }).host_name;
+ return this.getOozieServer(noOfHosts);
case 'STORM_UI_SERVER':
case 'LOGVIEWER_SERVER':
case 'DRPC_SERVER':
http://git-wip-us.apache.org/repos/asf/ambari/blob/b01a7b7f/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 5c0fc0d..e0af114 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -471,6 +471,8 @@ Em.I18n.translations = {
'installer.step4.yarnCheck.popup.body':'You did not select YARN+MapReduce2, but it is needed by other services you selected. We will automatically add YARN+MapReduce2. Is this OK?',
'installer.step4.zooKeeperCheck.popup.header':'ZooKeeper Needed',
'installer.step4.zooKeeperCheck.popup.body':'You did not select ZooKeeper, but it is needed by other services you selected. We will automatically add ZooKeeper. Is this OK?',
+ 'installer.step4.oozieCheck.popup.header':'Oozie Needed',
+ 'installer.step4.oozieCheck.popup.body':'You did not select Oozie, but it is needed by other services you selected. We will automatically add Oozie. Is this OK?',
'installer.step4.monitoringCheck.popup.header':'Limited Functionality Warning',
'installer.step4.monitoringCheck.popup.body':'You did not select Nagios and/or Ganglia. If both are not selected, monitoring and alerts will not function properly. Is this OK?',