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-12735. FE: Enable Kerberos Wizard hangs on step5 (alexantonenko)
Date Wed, 12 Aug 2015 14:33:32 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 3fef050a0 -> 4afc0321f


AMBARI-12735. FE: Enable Kerberos Wizard hangs on step5 (alexantonenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4afc0321
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4afc0321
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4afc0321

Branch: refs/heads/branch-2.1
Commit: 4afc0321f78aac48468889586c3277b1a54bdad5
Parents: 3fef050
Author: Alex Antonenko <hiveww@gmail.com>
Authored: Wed Aug 12 17:24:35 2015 +0300
Committer: Alex Antonenko <hiveww@gmail.com>
Committed: Wed Aug 12 17:33:27 2015 +0300

----------------------------------------------------------------------
 ambari-web/app/utils/config.js       | 6 +++++-
 ambari-web/test/utils/config_test.js | 6 ++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/4afc0321/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index bfff0e0..ff20568 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -1391,10 +1391,14 @@ App.config = Em.Object.create({
    * @returns {boolean}
    */
   shouldSupportFinal: function (serviceName, filename) {
-    if (!serviceName || serviceName == 'MISC' || !filename) {
+    var unsupportedServiceNames = ['MISC', 'Cluster'];
+    if (!serviceName || unsupportedServiceNames.contains(serviceName) || !filename) {
       return false;
     } else {
       var stackService = App.StackService.find().findProperty('serviceName', serviceName);
+      if (!stackService) {
+        return false;
+      }
       var supportsFinal = this.getConfigTypesInfoFromService(stackService).supportsFinal;
       var matchingConfigType = supportsFinal.find(function (configType) {
         return filename.startsWith(configType);

http://git-wip-us.apache.org/repos/asf/ambari/blob/4afc0321/ambari-web/test/utils/config_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/utils/config_test.js b/ambari-web/test/utils/config_test.js
index 0f69b7c..77af815 100644
--- a/ambari-web/test/utils/config_test.js
+++ b/ambari-web/test/utils/config_test.js
@@ -830,6 +830,12 @@ describe('App.config', function () {
         filename: 's0-env',
         shouldSupportFinal: false,
         title: 'final attribute not supported'
+      },
+      {
+        serviceName: 'Cluster',
+        filename: 'krb5-conf.xml',
+        shouldSupportFinal: false,
+        title: 'kerberos descriptor identities don\'t support final'
       }
     ];
 


Mime
View raw message