You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2015/11/21 02:49:14 UTC
[1/2] ambari git commit: AMBARI-14000. Add Service Wizard gets stuck
on Customize Services step after changing services to install
Repository: ambari
Updated Branches:
refs/heads/trunk 1ded3fde6 -> e8e6c74f4
AMBARI-14000. Add Service Wizard gets stuck on Customize Services step after changing services to install
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e8e6c74f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e8e6c74f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e8e6c74f
Branch: refs/heads/trunk
Commit: e8e6c74f47c8fad301dd921eeb3dc163c40008d8
Parents: f94d41d
Author: Alex Antonenko <hi...@gmail.com>
Authored: Fri Nov 20 21:18:42 2015 +0200
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Sat Nov 21 03:49:10 2015 +0200
----------------------------------------------------------------------
ambari-web/app/mappers/configs/themes_mapper.js | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e8e6c74f/ambari-web/app/mappers/configs/themes_mapper.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mappers/configs/themes_mapper.js b/ambari-web/app/mappers/configs/themes_mapper.js
index 0fecf81..3e68e67 100644
--- a/ambari-web/app/mappers/configs/themes_mapper.js
+++ b/ambari-web/app/mappers/configs/themes_mapper.js
@@ -79,6 +79,7 @@ App.themesMapper = App.QuickDataMapper.create({
this.mapThemeWidgets(item);
}, this);
+ App.store.commit();
App.store.loadMany(this.get("tabModel"), tabs);
App.store.commit();
console.timeEnd('App.themesMapper execution time');
[2/2] ambari git commit: AMBARI-13999. Kerberos service appears on UI
even security enabling wan't completed
Posted by al...@apache.org.
AMBARI-13999. Kerberos service appears on UI even security enabling wan't completed
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f94d41d3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f94d41d3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f94d41d3
Branch: refs/heads/trunk
Commit: f94d41d3a532a6bcab6730283fff3c398644464e
Parents: 1ded3fd
Author: Alex Antonenko <hi...@gmail.com>
Authored: Fri Nov 20 21:11:02 2015 +0200
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Sat Nov 21 03:49:10 2015 +0200
----------------------------------------------------------------------
.../main/admin/kerberos/step2_controller.js | 22 +-------
.../main/admin/kerberos/wizard_controller.js | 58 +++++++++++++++++++-
ambari-web/app/routes/add_kerberos_routes.js | 34 ++++++------
3 files changed, 75 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/f94d41d3/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js b/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
index adddd2f..43da1de 100644
--- a/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
+++ b/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
@@ -136,7 +136,7 @@ App.KerberosWizardStep2Controller = App.WizardStep7Controller.extend(App.KDCCred
if (this.get('isSubmitDisabled')) return false;
this.set('isSubmitDisabled', true);
var self = this;
- this.deleteKerberosService().always(function () {
+ this.get('wizardController').deleteKerberosService().always(function () {
self.configureKerberos();
if (App.get('supports.storeKDCCredentials') && !self.get('wizardController.skipClientInstall')) {
self.createKDCCredentials(self.get('stepConfigs.0.configs'));
@@ -161,26 +161,6 @@ App.KerberosWizardStep2Controller = App.WizardStep7Controller.extend(App.KDCCred
}
},
- /**
- * Delete Kerberos service if it exists
- */
- deleteKerberosService: function () {
- var serviceName = this.selectedServiceNames[0];
- if (App.cache.services.someProperty('ServiceInfo.service_name', 'KERBEROS')) {
- App.cache.services.removeAt(App.cache.services.indexOf(App.cache.services.findProperty('ServiceInfo.service_name', 'KERBEROS')));
- }
- if (App.Service.find().someProperty('serviceName', 'KERBEROS')) {
- App.serviceMapper.deleteRecord(App.Service.find('KERBEROS'));
- }
- return App.ajax.send({
- name: 'common.delete.service',
- sender: this,
- data: {
- serviceName: serviceName
- }
- });
- },
-
createConfigurations: function () {
var service = App.StackService.find().findProperty('serviceName', 'KERBEROS');
var serviceConfigTags = [];
http://git-wip-us.apache.org/repos/asf/ambari/blob/f94d41d3/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js b/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
index 69329a0..baceb80 100644
--- a/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
+++ b/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
@@ -18,7 +18,6 @@
var App = require('app');
-var credentialsUtils = require('utils/credentials');
App.KerberosWizardController = App.WizardController.extend(App.InstallComponent, {
@@ -158,6 +157,7 @@ App.KerberosWizardController = App.WizardController.extend(App.InstallComponent,
*
* @param {Array} itemsArray
* @param newValue
+ * @param exceptions
*/
overrideVisibility: function (itemsArray, newValue, exceptions) {
newValue = newValue || false;
@@ -201,6 +201,40 @@ App.KerberosWizardController = App.WizardController.extend(App.InstallComponent,
});
},
+ /**
+ * Delete Kerberos service if it exists
+ *
+ * @returns {$.Deferred}
+ */
+ deleteKerberosService: function () {
+ var serviceName = 'KERBEROS';
+ if (App.cache.services.someProperty('ServiceInfo.service_name', serviceName)) {
+ App.cache.services.removeAt(App.cache.services.indexOf(App.cache.services.findProperty('ServiceInfo.service_name', serviceName)));
+ }
+ if (App.Service.find().someProperty('serviceName', serviceName)) {
+ App.serviceMapper.deleteRecord(App.Service.find(serviceName));
+ }
+ return App.ajax.send({
+ name: 'common.delete.service',
+ sender: this,
+ data: {
+ serviceName: serviceName
+ }
+ });
+ },
+
+ /**
+ * Unkerberize cluster. Set cluster `security_type` to "NONE".
+ *
+ * @returns {$.Deferred}
+ */
+ unkerberize: function() {
+ return App.ajax.send({
+ name: 'admin.unkerberize.cluster',
+ sender: this
+ });
+ },
+
createKerberosHostComponents: function () {
var hostNames = App.get('allHostNames');
var queryStr = '';
@@ -312,6 +346,7 @@ App.KerberosWizardController = App.WizardController.extend(App.InstallComponent,
: Em.I18n.t('admin.kerberos.wizard.exit.warning.msg');
return App.showConfirmationPopup(primary, msg, null, null, primaryText, isCritical);
},
+
/**
* Clear all temporary data
*/
@@ -320,6 +355,25 @@ App.KerberosWizardController = App.WizardController.extend(App.InstallComponent,
this.setCurrentStep('1', false, true);
// kerberos wizard namespace in the localStorage should be emptied
this.resetDbNamespace();
- App.get('router.updateController').updateAll();
+ },
+
+ /**
+ * Discard changes affected by wizard:
+ * - Unkerberize cluster
+ * - Remove Kerberos service
+ *
+ * @returns {$.Deferred}
+ */
+ discardChanges: function() {
+ var dfd = $.Deferred();
+ var self = this;
+
+ this.unkerberize().always(function() {
+ self.deleteKerberosService().always(function() {
+ dfd.resolve();
+ });
+ });
+
+ return dfd.promise();
}
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/f94d41d3/ambari-web/app/routes/add_kerberos_routes.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/add_kerberos_routes.js b/ambari-web/app/routes/add_kerberos_routes.js
index 6b89555..150fc42 100644
--- a/ambari-web/app/routes/add_kerberos_routes.js
+++ b/ambari-web/app/routes/add_kerberos_routes.js
@@ -74,25 +74,27 @@ module.exports = App.WizardRoute.extend({
controller.clearTasksData();
controller.finish();
App.get('router.updateController').set('isWorking', true);
- if (App.get('testMode')) {
- App.get('router').transitionTo('adminKerberos.index');
- Em.run.next(function() {
- location.reload();
- });
- }
- App.router.get('wizardWatcherController').resetUser();
- App.clusterStatus.setClusterStatus({
- clusterName: App.router.getClusterName(),
- clusterState: 'DEFAULT',
- localdb: App.db.data
- }, {
- alwaysCallback: function () {
- self.hide();
- App.get('router').transitionTo(exitPath);
+ controller.discardChanges().then(function() {
+ if (App.get('testMode')) {
+ App.get('router').transitionTo('adminKerberos.index');
Em.run.next(function() {
location.reload();
});
}
+ App.router.get('wizardWatcherController').resetUser();
+ App.clusterStatus.setClusterStatus({
+ clusterName: App.router.getClusterName(),
+ clusterState: 'DEFAULT',
+ localdb: App.db.data
+ }, {
+ alwaysCallback: function () {
+ self.hide();
+ App.get('router').transitionTo(exitPath);
+ Em.run.next(function() {
+ location.reload();
+ });
+ }
+ });
});
}
});
@@ -246,7 +248,7 @@ module.exports = App.WizardRoute.extend({
var step5Controller = router.get('kerberosWizardStep5Controller');
var kerberosDescriptor = kerberosWizardController.get('kerberosDescriptorConfigs');
kerberosWizardController.cacheStepConfigValues(router.get('kerberosWizardStep4Controller'));
- step5Controller.postKerberosDescriptor(kerberosDescriptor).always(function (data, result, request) {
+ step5Controller.postKerberosDescriptor(kerberosDescriptor).always(function (data, result) {
if (result === 'error' && data.status === 409) {
step5Controller.putKerberosDescriptor(kerberosDescriptor);
} else {