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/08/04 15:02:46 UTC
[1/2] git commit: AMBARI-6729. RM HA wizard is experimental but
shouldn't be. (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 80b2a1f2e -> de4aab95a
AMBARI-6729. RM HA wizard is experimental but shouldn't be. (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f4f17ffe
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f4f17ffe
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f4f17ffe
Branch: refs/heads/trunk
Commit: f4f17ffe2970ac18b728e3b2444913b7600a3623
Parents: 80b2a1f
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Mon Aug 4 15:57:01 2014 +0300
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Mon Aug 4 15:57:01 2014 +0300
----------------------------------------------------------------------
ambari-web/app/config.js | 2 +-
ambari-web/app/templates/main/admin/highAvailability.hbs | 2 +-
ambari-web/app/views/main/admin/highAvailability_view.js | 4 ++++
ambari-web/app/views/main/service/item.js | 2 +-
4 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/f4f17ffe/ambari-web/app/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/config.js b/ambari-web/app/config.js
index 31d085d..b8b989c 100644
--- a/ambari-web/app/config.js
+++ b/ambari-web/app/config.js
@@ -71,7 +71,7 @@ App.supports = {
ldapGroupMapping: false,
localRepositories: true,
highAvailability: true,
- resourceManagerHighAvailability: false,
+ resourceManagerHighAvailability: true,
deleteHost: true,
autoRollbackHA: false,
appTimelineServer: true,
http://git-wip-us.apache.org/repos/asf/ambari/blob/f4f17ffe/ambari-web/app/templates/main/admin/highAvailability.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/highAvailability.hbs b/ambari-web/app/templates/main/admin/highAvailability.hbs
index 444f37e..6ffaac2 100644
--- a/ambari-web/app/templates/main/admin/highAvailability.hbs
+++ b/ambari-web/app/templates/main/admin/highAvailability.hbs
@@ -39,7 +39,7 @@
<div class="spinner"></div>
{{/if}}
{{/if}}
- {{#if App.supports.resourceManagerHighAvailability}}
+ {{#if view.supportRMHA}}
{{#if App.isRMHaEnabled}}
<div class="rm-ha">
<p class="text-success">
http://git-wip-us.apache.org/repos/asf/ambari/blob/f4f17ffe/ambari-web/app/views/main/admin/highAvailability_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/admin/highAvailability_view.js b/ambari-web/app/views/main/admin/highAvailability_view.js
index 83cfa05..cf9fb1c 100644
--- a/ambari-web/app/views/main/admin/highAvailability_view.js
+++ b/ambari-web/app/views/main/admin/highAvailability_view.js
@@ -23,5 +23,9 @@ App.MainAdminHighAvailabilityView = Em.View.extend({
didInsertElement: function () {
this.get('controller').setSecurityStatus();
+ },
+
+ supportRMHA: function () {
+ return App.get('isHadoop21Stack') && App.get('supports.resourceManagerHighAvailability');
}
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/f4f17ffe/ambari-web/app/views/main/service/item.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/service/item.js b/ambari-web/app/views/main/service/item.js
index e02cadf..67ca75f 100644
--- a/ambari-web/app/views/main/service/item.js
+++ b/ambari-web/app/views/main/service/item.js
@@ -84,7 +84,7 @@ App.MainServiceItemView = Em.View.extend({
action: 'enableRMHighAvailability',
label: Em.I18n.t('admin.rm_highAvailability.button.enable'),
cssClass: 'icon-arrow-up',
- isHidden: !App.get('supports.resourceManagerHighAvailability') || App.get('isRMHaEnabled')
+ isHidden: !App.get('supports.resourceManagerHighAvailability') || App.get('isRMHaEnabled') || !App.get('isHadoop21Stack')
},
MOVE_COMPONENT: {
action: 'reassignMaster',
[2/2] git commit: AMBARI-6728. RM HA wizard should not list all
masters, just current + add'l RM. (akovalenko)
Posted by ak...@apache.org.
AMBARI-6728. RM HA wizard should not list all masters, just current + add'l RM. (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/de4aab95
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/de4aab95
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/de4aab95
Branch: refs/heads/trunk
Commit: de4aab95adf06513bdfda0a63637d9b9c4d636cc
Parents: f4f17ff
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Mon Aug 4 15:58:39 2014 +0300
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Mon Aug 4 15:58:39 2014 +0300
----------------------------------------------------------------------
.../resourceManager/step2_controller.js | 6 +++---
ambari-web/app/controllers/wizard/step5_controller.js | 12 ++++++------
2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/de4aab95/ambari-web/app/controllers/main/admin/highAvailability/resourceManager/step2_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/highAvailability/resourceManager/step2_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/resourceManager/step2_controller.js
index 7231eb3..13e3f11 100644
--- a/ambari-web/app/controllers/main/admin/highAvailability/resourceManager/step2_controller.js
+++ b/ambari-web/app/controllers/main/admin/highAvailability/resourceManager/step2_controller.js
@@ -21,9 +21,9 @@ var App = require('app');
App.RMHighAvailabilityWizardStep2Controller = App.WizardStep5Controller.extend({
name: "rMHighAvailabilityWizardStep2Controller",
- loadStep: function () {
- this._super();
- this.hideUnusedComponents();
+ loadStepCallback: function (components, self) {
+ this._super(components, self);
+ self.hideUnusedComponents();
},
renderComponents: function (masterComponents) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/de4aab95/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 0bb077e..30a1c48 100644
--- a/ambari-web/app/controllers/wizard/step5_controller.js
+++ b/ambari-web/app/controllers/wizard/step5_controller.js
@@ -306,7 +306,7 @@ App.WizardStep5Controller = Em.Controller.extend({
if (App.router.get('installerController.recommendations') !== undefined) {
// Don't do AJAX call if recommendations has been already received
// But if user returns to previous step (selecting services), stored recommendations will be cleared in routers' next handler and AJAX call will be made again
- callback(self.createComponentInstalltationObjects(), self);
+ callback(self.createComponentInstallationObjects(), self);
} else {
var selectedServices = App.StackService.find().filterProperty('isSelected').mapProperty('serviceName');
var installedServices = App.StackService.find().filterProperty('isInstalled').mapProperty('serviceName');
@@ -329,7 +329,7 @@ App.WizardStep5Controller = Em.Controller.extend({
timeout: App.timeout
}).
then(function () {
- callback(self.createComponentInstalltationObjects(), self);
+ callback(self.createComponentInstallationObjects(), self);
},
function () {
App.showReloadPopup();
@@ -344,7 +344,7 @@ App.WizardStep5Controller = Em.Controller.extend({
* expects installerController.recommendations will be filled with recommendations API call result
* @return {Object[]}
*/
- createComponentInstalltationObjects: function() {
+ createComponentInstallationObjects: function() {
var self = this;
var masterComponents = [];
@@ -386,12 +386,12 @@ App.WizardStep5Controller = Em.Controller.extend({
multipleComponentHasBeenAdded[component.name] = true;
savedComponents.forEach(function(saved) {
- resultComponents.push(self.createComponentInstalltationObject(fullComponent, host.fqdn, saved));
+ resultComponents.push(self.createComponentInstallationObject(fullComponent, host.fqdn, saved));
});
}
} else {
var savedComponent = masterHosts.findProperty('component', component.name);
- resultComponents.push(self.createComponentInstalltationObject(fullComponent, host.fqdn, savedComponent));
+ resultComponents.push(self.createComponentInstallationObject(fullComponent, host.fqdn, savedComponent));
}
}
}
@@ -408,7 +408,7 @@ App.WizardStep5Controller = Em.Controller.extend({
* @param savedComponent - the same object which function returns but created before
* @return {Object}
*/
- createComponentInstalltationObject: function(fullComponent, hostName, savedComponent) {
+ createComponentInstallationObject: function(fullComponent, hostName, savedComponent) {
var componentName = fullComponent.get('componentName');
var componentObj = {};