ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jai...@apache.org
Subject ambari git commit: AMBARI-13107. After successful install of Oozie via blueprint, oozie has an invalid configuration. (jaimin)
Date Wed, 16 Sep 2015 23:43:34 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 4f2079fa4 -> 27d615b8c


AMBARI-13107. After successful install of Oozie via blueprint, oozie has an invalid configuration.
(jaimin)


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

Branch: refs/heads/branch-2.1
Commit: 27d615b8c8f5da1d41e5042a5f979217fa1d95f5
Parents: 4f2079f
Author: Jaimin Jetly <jaimin@hortonworks.com>
Authored: Wed Sep 16 16:42:58 2015 -0700
Committer: Jaimin Jetly <jaimin@hortonworks.com>
Committed: Wed Sep 16 16:42:58 2015 -0700

----------------------------------------------------------------------
 .../controller/internal/AbstractResourceProvider.java     |  5 +++--
 .../OOZIE/4.0.0.2.0/configuration/oozie-site.xml          |  2 --
 .../common-services/OOZIE/4.0.0.2.0/kerberos.json         |  3 +--
 .../OOZIE/4.2.0.2.3/configuration/oozie-site.xml          |  2 --
 .../common-services/OOZIE/4.2.0.2.3/kerberos.json         |  1 -
 .../HDP/2.1/services/OOZIE/configuration/oozie-site.xml   |  7 -------
 ambari-web/app/models/configs/stack_config_property.js    | 10 +++++++++-
 ambari-web/app/utils/config.js                            |  2 +-
 8 files changed, 14 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/27d615b8/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractResourceProvider.java
index 273aba3..0c6a07c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractResourceProvider.java
@@ -381,8 +381,9 @@ public abstract class AbstractResourceProvider extends BaseProvider implements
R
 
       if (absCategory != null && absCategory.startsWith(desiredConfigKey)) {
         config = (null == config) ? new ConfigurationRequest() : config;
-
-        parseProperties(config, absCategory, propName, entry.getValue().toString());
+        if(entry.getValue() != null) {
+          parseProperties(config, absCategory, propName, entry.getValue().toString());
+        }
       }
     }
     if (config != null) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/27d615b8/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-site.xml
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-site.xml
index 329ac64..df5cb5a 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-site.xml
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/configuration/oozie-site.xml
@@ -141,8 +141,6 @@
   </property>
   <property>
     <name>oozie.authentication.kerberos.name.rules</name>
-    <value>
-    </value>
     <description>The mapping from kerberos principal names to local OS user names.</description>
   </property>
   <property>

http://git-wip-us.apache.org/repos/asf/ambari/blob/27d615b8/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/kerberos.json
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/kerberos.json
index 9560990..f9ce38b 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/kerberos.json
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/kerberos.json
@@ -22,8 +22,7 @@
             "oozie.authentication.type": "kerberos",
             "oozie.service.AuthorizationService.authorization.enabled": "true",
             "oozie.service.HadoopAccessorService.kerberos.enabled": "true",
-            "local.realm": "${realm}",
-            "oozie.authentication.kerberos.name.rules": ""
+            "local.realm": "${realm}"
           }
         }
       ],

http://git-wip-us.apache.org/repos/asf/ambari/blob/27d615b8/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-site.xml
b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-site.xml
index f449421..85a62c1 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-site.xml
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/configuration/oozie-site.xml
@@ -20,8 +20,6 @@
 
   <property>
     <name>oozie.authentication.kerberos.name.rules</name>
-    <value>
-    </value>
     <description>The mapping from kerberos principal names to local OS user names.</description>
   </property>
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/27d615b8/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/kerberos.json
b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/kerberos.json
index d61d5ab..433aca9 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/kerberos.json
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/kerberos.json
@@ -23,7 +23,6 @@
             "oozie.service.AuthorizationService.authorization.enabled": "true",
             "oozie.service.HadoopAccessorService.kerberos.enabled": "true",
             "local.realm": "${realm}",
-            "oozie.authentication.kerberos.name.rules": "",
             "oozie.credentials.credentialclasses": "hcat=org.apache.oozie.action.hadoop.HCatCredentials,hive2=org.apache.oozie.action.hadoop.Hive2Credentials"
           }
         }

http://git-wip-us.apache.org/repos/asf/ambari/blob/27d615b8/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/configuration/oozie-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/configuration/oozie-site.xml
b/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/configuration/oozie-site.xml
index a429a13..6697898 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/configuration/oozie-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/configuration/oozie-site.xml
@@ -141,13 +141,6 @@
   </property>
   <property>
     <name>oozie.authentication.kerberos.name.rules</name>
-    <value>
-
-
-
-
-
-    </value>
     <description>The mapping from kerberos principal names to local OS user names.</description>
   </property>
   <property>

http://git-wip-us.apache.org/repos/asf/ambari/blob/27d615b8/ambari-web/app/models/configs/stack_config_property.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/configs/stack_config_property.js b/ambari-web/app/models/configs/stack_config_property.js
index a1925a4..3a0ea9a 100644
--- a/ambari-web/app/models/configs/stack_config_property.js
+++ b/ambari-web/app/models/configs/stack_config_property.js
@@ -187,7 +187,15 @@ App.StackConfigProperty = DS.Model.extend({
   /**
    * @type {boolean}
    */
-  index: DS.attr('number', {defaultValue: null})
+  index: DS.attr('number', {defaultValue: null}),
+
+  /**
+   * Does config property has a valid value defined in the stack
+   * @type {boolean}
+   */
+  isValueDefined: function() {
+    return !Em.none(this.get('value'));
+  }.property('id')
 });
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/27d615b8/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index 1d8994f..82b255f 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -575,7 +575,7 @@ App.config = Em.Object.create({
       .uniq().compact().filter(function(configType) { return !!configType; });
 
     var predefinedIds = Object.keys(this.get('preDefinedSitePropertiesMap'));
-    var stackIds = App.StackConfigProperty.find().mapProperty('id');
+    var stackIds = App.StackConfigProperty.find().filterProperty('isValueDefined').mapProperty('id');
 
     var configIds = stackIds.concat(predefinedIds).uniq();
 


Mime
View raw message