You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2015/03/03 14:40:24 UTC
[1/3] ambari git commit: AMBARI-9892 Exclude downgrading request from
bgo popup. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.0.0 9e7040be3 -> 9aacacbd1
AMBARI-9892 Exclude downgrading request from bgo popup. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9aacacbd
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9aacacbd
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9aacacbd
Branch: refs/heads/branch-2.0.0
Commit: 9aacacbd1b99f3c6ace555d572260457af097e56
Parents: 1307a18
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Tue Mar 3 13:03:22 2015 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Tue Mar 3 15:40:16 2015 +0200
----------------------------------------------------------------------
.../app/controllers/global/background_operations_controller.js | 2 +-
ambari-web/test/controllers/global/background_operations_test.js | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/9aacacbd/ambari-web/app/controllers/global/background_operations_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/global/background_operations_controller.js b/ambari-web/app/controllers/global/background_operations_controller.js
index 328575f..0bd1d83 100644
--- a/ambari-web/app/controllers/global/background_operations_controller.js
+++ b/ambari-web/app/controllers/global/background_operations_controller.js
@@ -196,7 +196,7 @@ App.BackgroundOperationsController = Em.Controller.extend({
*/
isUpgradeRequest: function(request) {
var context = Em.get(request, 'Requests.request_context');
- return context ? context.toLowerCase().contains('upgrading') : false;
+ return context ? /(upgrading|downgrading)/.test(context.toLowerCase()) : false;
},
/**
* Prepare, received from server, requests for host component popup
http://git-wip-us.apache.org/repos/asf/ambari/blob/9aacacbd/ambari-web/test/controllers/global/background_operations_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/global/background_operations_test.js b/ambari-web/test/controllers/global/background_operations_test.js
index 51925b7..adc02c9 100644
--- a/ambari-web/test/controllers/global/background_operations_test.js
+++ b/ambari-web/test/controllers/global/background_operations_test.js
@@ -163,6 +163,10 @@ describe('App.BackgroundOperationsController', function () {
expect(controller.isUpgradeRequest({Requests: {request_context: "UPGRADING"}})).to.be.true;
});
+ it('defines if request is downgrade task (true - with uppercase)', function() {
+ expect(controller.isUpgradeRequest({Requests: {request_context: "downgrading"}})).to.be.true;
+ });
+
it('defines if request is upgrade task (false)', function() {
expect(controller.isUpgradeRequest({Requests: {request_context: "install"}})).to.be.false;
});
[3/3] ambari git commit: AMBARI-9885 Modify the API call to exclude
Flume metrics on Dashboard and Service pages. (ababiichuk)
Posted by ab...@apache.org.
AMBARI-9885 Modify the API call to exclude Flume metrics on Dashboard and Service pages. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1e5d278d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1e5d278d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1e5d278d
Branch: refs/heads/branch-2.0.0
Commit: 1e5d278d4bd5fca266592c8d88aa764e188c39c3
Parents: 9e7040b
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Tue Mar 3 11:36:05 2015 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Tue Mar 3 15:40:16 2015 +0200
----------------------------------------------------------------------
ambari-web/app/controllers/global/update_controller.js | 3 +--
ambari-web/test/controllers/global/update_controller_test.js | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1e5d278d/ambari-web/app/controllers/global/update_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/global/update_controller.js b/ambari-web/app/controllers/global/update_controller.js
index 4958210..41cbd10 100644
--- a/ambari-web/app/controllers/global/update_controller.js
+++ b/ambari-web/app/controllers/global/update_controller.js
@@ -409,8 +409,7 @@ App.UpdateController = Em.Controller.extend({
getConditionalFields: function () {
var conditionalFields = [];
var serviceSpecificParams = {
- 'FLUME': "host_components/metrics/flume/flume," +
- "host_components/processes/HostComponentProcess",
+ 'FLUME': "host_components/processes/HostComponentProcess",
'YARN': "host_components/metrics/yarn/Queue," +
"ServiceComponentInfo/rm_metrics/cluster/activeNMcount," +
"ServiceComponentInfo/rm_metrics/cluster/lostNMcount," +
http://git-wip-us.apache.org/repos/asf/ambari/blob/1e5d278d/ambari-web/test/controllers/global/update_controller_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/global/update_controller_test.js b/ambari-web/test/controllers/global/update_controller_test.js
index 04c8b7a..f55136b 100644
--- a/ambari-web/test/controllers/global/update_controller_test.js
+++ b/ambari-web/test/controllers/global/update_controller_test.js
@@ -135,8 +135,7 @@ describe('App.UpdateController', function () {
}
}
],
- result: ["host_components/metrics/flume/flume,"+
- "host_components/processes/HostComponentProcess"]
+ result: ["host_components/processes/HostComponentProcess"]
},
{
title: 'YARN service',
[2/3] ambari git commit: AMBARI-9886 Adding service: retry button
does not refresh UI dialog after failure. (ababiichuk)
Posted by ab...@apache.org.
AMBARI-9886 Adding service: retry button does not refresh UI dialog after failure. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1307a18b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1307a18b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1307a18b
Branch: refs/heads/branch-2.0.0
Commit: 1307a18b2c3d2544ab483565c6b51e45dc0e7328
Parents: 1e5d278
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Tue Mar 3 12:59:57 2015 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Tue Mar 3 15:40:16 2015 +0200
----------------------------------------------------------------------
.../controllers/main/service/add_controller.js | 27 ++++++++------------
ambari-web/app/routes/add_service_routes.js | 8 +++++-
2 files changed, 18 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1307a18b/ambari-web/app/controllers/main/service/add_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/add_controller.js b/ambari-web/app/controllers/main/service/add_controller.js
index 7cccb44..b340e68 100644
--- a/ambari-web/app/controllers/main/service/add_controller.js
+++ b/ambari-web/app/controllers/main/service/add_controller.js
@@ -524,33 +524,28 @@ App.AddServiceController = App.WizardController.extend(App.AddSecurityConfigs, {
},
/**
- * run this method after success/error callbacks
- * for <code>installServicesRequest<code>
- */
- installServicesComplete: function () {
- App.get('router.wizardStep8Controller').set('servicesInstalled', true);
- this.setInfoForStep9();
- this.saveClusterState('ADD_SERVICES_INSTALLING_3');
- App.router.transitionTo('step7');
- },
-
- /**
- * main method for installinf clients
+ * main method for installing additional clients and services
+ * @param {function} callback
* @method installServices
*/
- installServices: function () {
+ installServices: function (callback) {
var self = this;
this.set('content.cluster.oldRequestsId', []);
this.installAdditionalClients().done(function () {
- self.installSelectedServices();
+ self.installSelectedServices(callback);
});
},
- installSelectedServices: function () {
+ /**
+ * method to install added services
+ * @param {function} callback
+ * @method installSelectedServices
+ */
+ installSelectedServices: function (callback) {
var name = 'common.services.update';
var selectedServices = this.get('content.services').filterProperty('isInstalled', false).filterProperty('isSelected', true).mapProperty('serviceName');
var data = this.generateDataForInstallServices(selectedServices);
- this.installServicesRequest(name, data, this.installServicesComplete.bind(this));
+ this.installServicesRequest(name, data, callback.bind(this));
},
installServicesRequest: function (name, data, callback) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/1307a18b/ambari-web/app/routes/add_service_routes.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/add_service_routes.js b/ambari-web/app/routes/add_service_routes.js
index 44051ba..568b6cb 100644
--- a/ambari-web/app/routes/add_service_routes.js
+++ b/ambari-web/app/routes/add_service_routes.js
@@ -310,7 +310,13 @@ module.exports = App.WizardRoute.extend({
}
},
next: function (router) {
- router.get('addServiceController').installServices();
+ var addServiceController = router.get('addServiceController');
+ addServiceController.installServices(function () {
+ router.get('wizardStep8Controller').set('servicesInstalled', true);
+ addServiceController.setInfoForStep9();
+ addServiceController.saveClusterState('ADD_SERVICES_INSTALLING_3');
+ App.router.transitionTo('step7');
+ });
}
}),