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 2015/10/05 14:21:07 UTC
ambari git commit: AMBARI-13277. Provide an option to not start
services in Install / Add Hosts / Add Service Wizard. Additional
patch(akovalenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 13f808e3c -> da12a565e
AMBARI-13277. Provide an option to not start services in Install / Add Hosts / Add Service Wizard. Additional patch(akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/da12a565
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/da12a565
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/da12a565
Branch: refs/heads/branch-2.1
Commit: da12a565e93321a091aa0f2786bae2253aafe31f
Parents: 13f808e
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Mon Oct 5 15:09:12 2015 +0300
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Mon Oct 5 15:09:12 2015 +0300
----------------------------------------------------------------------
ambari-web/app/controllers/wizard/step10_controller.js | 11 ++++++++++-
ambari-web/app/messages.js | 1 +
ambari-web/app/views/wizard/step9_view.js | 2 +-
ambari-web/test/controllers/wizard/step10_test.js | 7 +++++++
4 files changed, 19 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/da12a565/ambari-web/app/controllers/wizard/step10_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step10_controller.js b/ambari-web/app/controllers/wizard/step10_controller.js
index ca1badb..874a864 100644
--- a/ambari-web/app/controllers/wizard/step10_controller.js
+++ b/ambari-web/app/controllers/wizard/step10_controller.js
@@ -211,7 +211,8 @@ App.WizardStep10Controller = Em.Controller.extend({
* @method loadStartedServices
*/
loadStartedServices: function () {
- if (this.get('content.cluster.status') === 'STARTED') {
+ var status = this.get('content.cluster.status');
+ if (status === 'STARTED') {
this.get('clusterInfo').pushObject(Em.Object.create({
id: 3,
color: 'text-success',
@@ -225,6 +226,14 @@ App.WizardStep10Controller = Em.Controller.extend({
status: []
}));
return true;
+ } else if (status === 'START_SKIPPED') {
+ this.get('clusterInfo').pushObject(Em.Object.create({
+ id: 3,
+ color: 'text-warning',
+ displayStatement: Em.I18n.t('installer.step10.startStatus.skipped'),
+ status: []
+ }));
+ return false
} else {
this.get('clusterInfo').pushObject(Em.Object.create({
id: 3,
http://git-wip-us.apache.org/repos/asf/ambari/blob/da12a565/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 3fe0880..0570c5b 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -891,6 +891,7 @@ Em.I18n.translations = {
'installer.step10.installStatus.installed':'Master services installed',
'installer.step10.master.installedOn':'{0} installed on {1}',
'installer.step10.startStatus.failed':'Starting services failed',
+ 'installer.step10.startStatus.skipped':'Starting services skipped',
'installer.step10.startStatus.passed':'All tests passed',
'installer.step10.startStatus.started':'All services started',
'installer.step10.installTime.seconds':'Install and start completed in {0} seconds',
http://git-wip-us.apache.org/repos/asf/ambari/blob/da12a565/ambari-web/app/views/wizard/step9_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/wizard/step9_view.js b/ambari-web/app/views/wizard/step9_view.js
index 7bcec87..3393cc0 100644
--- a/ambari-web/app/views/wizard/step9_view.js
+++ b/ambari-web/app/views/wizard/step9_view.js
@@ -272,7 +272,7 @@ App.WizardStep9View = App.TableView.extend({
this.set('resultMsg', this.get('controller.content.cluster.status') === 'START_SKIPPED' ? Em.I18n.t('installer.step9.status.skipStartSuccess') : Em.I18n.t('installer.step9.status.success'));
this.set('resultMsgColor', 'alert-success');
}
- }.observes('controller.status', 'controller.startCallFailed','isHostHeartbeatLost'),
+ }.observes('controller.status', 'controller.content.cluster.status', 'controller.startCallFailed','isHostHeartbeatLost'),
/**
* Show popup with info about failed hosts
http://git-wip-us.apache.org/repos/asf/ambari/blob/da12a565/ambari-web/test/controllers/wizard/step10_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/wizard/step10_test.js b/ambari-web/test/controllers/wizard/step10_test.js
index 9699919..e6efb05 100644
--- a/ambari-web/test/controllers/wizard/step10_test.js
+++ b/ambari-web/test/controllers/wizard/step10_test.js
@@ -345,6 +345,13 @@ describe('App.WizardStep10Controller', function () {
ids: [3],
r: false
}
+ },
+ {
+ status: 'START_SKIPPED',
+ e: {
+ ids: [3],
+ r: false
+ }
}
]);
tests.forEach(function(test) {