ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexantone...@apache.org
Subject ambari git commit: AMBARI-18474. Kerberos wizard loses request id on server restart (alexantonenko)
Date Tue, 27 Sep 2016 18:54:15 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 645f87e2f -> 16af8bc0d


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/16af8bc0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/16af8bc0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/16af8bc0

Branch: refs/heads/branch-2.5
Commit: 16af8bc0d12e27fa63c92dc8b8af41345586cca7
Parents: 645f87e
Author: Alex Antonenko <hiveww@gmail.com>
Authored: Tue Sep 27 18:32:12 2016 +0300
Committer: Alex Antonenko <hiveww@gmail.com>
Committed: Tue Sep 27 21:54:10 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/16af8bc0/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/16af8bc0/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({


Mime
View raw message