Repository: ambari Updated Branches: refs/heads/trunk 733394aa6 -> 6da3dec5c
AMBARI-9735. Repetitive disabling kerberos doesn't work. (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6da3dec5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6da3dec5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6da3dec5 Branch: refs/heads/trunk Commit: 6da3dec5c43aae38db15ca8142ef1bec89b4f4ed Parents: 733394a Author: Alex Antonenko <[email protected]> Authored: Fri Feb 20 22:13:14 2015 +0200 Committer: Alex Antonenko <[email protected]> Committed: Fri Feb 20 22:59:29 2015 +0200 ---------------------------------------------------------------------- ambari-web/app/messages.js | 2 ++ ambari-web/app/routes/main.js | 27 +++++++++++++++++++-------- 2 files changed, 21 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/6da3dec5/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index 50afd8b..e3d58d5 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -985,6 +985,8 @@ Em.I18n.translations = { 'admin.kerberos.disable.step1.task0.title': 'Stop Services', 'admin.kerberos.disable.step1.task1.title': 'Remove Kerberos', 'admin.kerberos.disable.step1.task2.title': 'Start Services', + 'admin.kerberos.disable.unkerberize.header': 'Unkerberize cluster', + 'admin.kerberos.disable.unkerberize.message': 'You cannot quit wizard while cluster is being unkerberized', 'admin.kerberos.disable.inProgress': 'Please wait while cluster is being unkerberized', 'admin.kerberos.disable.notice.completed': 'Services have been successfully tested without kerberos environment.', 'admin.kerberos.wizard.step1.notice.inProgress': 'Please wait while cluster is being unkerberized', http://git-wip-us.apache.org/repos/asf/ambari/blob/6da3dec5/ambari-web/app/routes/main.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/routes/main.js b/ambari-web/app/routes/main.js index 6ad614d..e6b75da 100644 --- a/ambari-web/app/routes/main.js +++ b/ambari-web/app/routes/main.js @@ -414,11 +414,14 @@ module.exports = Em.Route.extend(App.RouterRedirections, { self.proceedOnClose(); return; } - var applyingConfigCommand = controller.get('commands').findProperty('name', 'APPLY_CONFIGURATIONS'); - if (applyingConfigCommand && !applyingConfigCommand.get('isCompleted')) { - if (applyingConfigCommand.get('isStarted')) { - App.showAlertPopup(Em.I18n.t('admin.security.applying.config.header'), Em.I18n.t('admin.security.applying.config.body')); + // warn user if disable kerberos command in progress + var unkerberizeCommand = controller.get('tasks').findProperty('command', 'unkerberize'); + if (unkerberizeCommand && !unkerberizeCommand.get('isCompleted')) { + // user cannot exit wizard during removing kerberos + if (unkerberizeCommand.get('status') == 'IN_PROGRESS') { + App.showAlertPopup(Em.I18n.t('admin.kerberos.disable.unkerberize.header'), Em.I18n.t('admin.kerberos.disable.unkerberize.message')); } else { + // otherwise show confirmation window App.showConfirmationPopup(function () { self.proceedOnClose(); }, Em.I18n.t('admin.addSecurity.disable.onClose')); @@ -428,17 +431,25 @@ module.exports = Em.Route.extend(App.RouterRedirections, { } }, proceedOnClose: function () { - router.get('kerberosDisableController').clearStep(); + var self = this; + var disableController = router.get('kerberosDisableController'); + disableController.clearStep(); + disableController.resetDbNamespace(); App.db.setSecurityDeployCommands(undefined); App.router.get('updateController').set('isWorking', true); router.get('mainAdminKerberosController').setDisableSecurityStatus(undefined); router.get('addServiceController').finish(); App.clusterStatus.setClusterStatus({ clusterName: router.get('content.cluster.name'), - clusterState: 'DEFAULT' + clusterState: 'DEFAULT', + localdb: App.db.data + }, { + alwaysCallback: function() { + self.hide(); + router.transitionTo('adminKerberos.index'); + location.reload(); + } }); - this.hide(); - router.transitionTo('adminKerberos.index'); }, didInsertElement: function () { this.fitHeight();
