You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2016/09/28 17:28:02 UTC
[09/17] ambari git commit: AMBARI-18474. Kerberos wizard loses
request id on server restart (alexantonenko)
AMBARI-18474. Kerberos wizard loses request id on server restart (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c265ae62
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c265ae62
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c265ae62
Branch: refs/heads/branch-feature-AMBARI-18456
Commit: c265ae6228342146dc99e9b5681d8a2645a220fa
Parents: 7b92434
Author: Alex Antonenko <hi...@gmail.com>
Authored: Tue Sep 27 18:32:12 2016 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Tue Sep 27 21:52:49 2016 +0300
----------------------------------------------------------------------
ambari-web/app/models/cluster_states.js | 4 +++-
ambari-web/app/routes/add_kerberos_routes.js | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c265ae62/ambari-web/app/models/cluster_states.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/cluster_states.js b/ambari-web/app/models/cluster_states.js
index 7e80c32..cbc134d 100644
--- a/ambari-web/app/models/cluster_states.js
+++ b/ambari-web/app/models/cluster_states.js
@@ -146,7 +146,9 @@ App.clusterStatus = Em.Object.create(App.UserPref, {
this.set('localdb', response.localdb);
// restore HAWizard data if process was started
var isHAWizardStarted = App.isAuthorized('SERVICE.ENABLE_HA') && !App.isEmptyObject(response.localdb.HighAvailabilityWizard);
- if (params.data.overrideLocaldb || isHAWizardStarted) {
+ // restore Kerberos Wizard is started
+ var isKerberosWizardStarted = App.isAuthorized('CLUSTER.TOGGLE_KERBEROS') && !App.isEmptyObject(response.localdb.KerberosWizard);
+ if (params.data.overrideLocaldb || isHAWizardStarted || isKerberosWizardStarted) {
var localdbTables = (App.db.data.app && App.db.data.app.tables) ? App.db.data.app.tables : {};
var authenticated = Em.get(App, 'db.data.app.authenticated') || false;
App.db.data = response.localdb;
http://git-wip-us.apache.org/repos/asf/ambari/blob/c265ae62/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 4291394..1568577 100644
--- a/ambari-web/app/routes/add_kerberos_routes.js
+++ b/ambari-web/app/routes/add_kerberos_routes.js
@@ -20,7 +20,9 @@ var App = require('app');
module.exports = App.WizardRoute.extend({
route: '/enable',
enter: function (router) {
- router.get('mainController').dataLoading().done(function () {
+ router.get('mainController').dataLoading().done(function() {
+ return App.clusterStatus.updateFromServer();
+ }).done(function () {
var kerberosWizardController = router.get('kerberosWizardController');
App.router.get('updateController').set('isWorking', false);
var popup = App.ModalPopup.show({