ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject ambari git commit: AMBARI-13629 Oozie service have required, empty configs:oozie.authentication.kerberos.name.rules (after upgrade from 2.1.1 to 2.1.2.1) (dsen)
Date Mon, 02 Nov 2015 18:18:22 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 f98f37767 -> 61ff1a756


AMBARI-13629 Oozie service have required, empty configs:oozie.authentication.kerberos.name.rules
(after upgrade from 2.1.1 to 2.1.2.1) (dsen)


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

Branch: refs/heads/branch-2.1
Commit: 61ff1a756a436f53a1617b96dfc2f8b1d97afe38
Parents: f98f377
Author: Dmytro Sen <dsen@apache.org>
Authored: Mon Nov 2 20:16:38 2015 +0200
Committer: Dmytro Sen <dsen@apache.org>
Committed: Mon Nov 2 20:18:13 2015 +0200

----------------------------------------------------------------------
 .../org/apache/ambari/server/upgrade/UpgradeCatalog2121.java     | 2 +-
 .../org/apache/ambari/server/upgrade/UpgradeCatalog2121Test.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/61ff1a75/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog2121.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog2121.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog2121.java
index be88597..c5f2327 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog2121.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog2121.java
@@ -184,7 +184,7 @@ public class UpgradeCatalog2121 extends AbstractUpgradeCatalog {
         if (StringUtils.isBlank(oozieAuthKerbRules)) {
           Set<String> removeProperties = new HashSet<String>();
           removeProperties.add(OOZIE_AUTHENTICATION_KERBEROS_NAME_RULES);
-          updateConfigurationPropertiesForCluster(cluster, OOZIE_SITE_CONFIG, null, removeProperties,
true, false);
+          updateConfigurationPropertiesForCluster(cluster, OOZIE_SITE_CONFIG, new HashMap<String,
String>(), removeProperties, true, false);
         }
       }
     }

http://git-wip-us.apache.org/repos/asf/ambari/blob/61ff1a75/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog2121Test.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog2121Test.java
b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog2121Test.java
index 3bef3a3..249647b 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog2121Test.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog2121Test.java
@@ -119,7 +119,7 @@ public class UpgradeCatalog2121Test {
     final Clusters mockClusters = easyMockSupport.createStrictMock(Clusters.class);
     final Cluster mockClusterExpected = easyMockSupport.createNiceMock(Cluster.class);
     final Map<String, String> propertiesOozieSite = new HashMap<String, String>()
{{
-      put("oozie.authentication.kerberos.name.rules", " ");
+      put("oozie.authentication.kerberos.name.rules", "\n ");
     }};
     final Config oozieSiteConf = easyMockSupport.createNiceMock(Config.class);
     final Injector mockInjector = Guice.createInjector(new AbstractModule() {
@@ -148,7 +148,7 @@ public class UpgradeCatalog2121Test {
                     Map.class, Set.class, boolean.class, boolean.class)
             .createMock();
     upgradeCatalog2121.updateConfigurationPropertiesForCluster(mockClusterExpected,
-            "oozie-site", null, Collections.singleton("oozie.authentication.kerberos.name.rules"),
+            "oozie-site", new HashMap<String, String>(), Collections.singleton("oozie.authentication.kerberos.name.rules"),
             true, false);
     expectLastCall().once();
 


Mime
View raw message