You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2015/11/02 19:16:48 UTC
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)
Repository: ambari
Updated Branches:
refs/heads/trunk 646de5754 -> 7e62c5c11
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/7e62c5c1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7e62c5c1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7e62c5c1
Branch: refs/heads/trunk
Commit: 7e62c5c11265d41c545830d8c438a32537d45608
Parents: 646de57
Author: Dmytro Sen <ds...@apache.org>
Authored: Mon Nov 2 20:16:38 2015 +0200
Committer: Dmytro Sen <ds...@apache.org>
Committed: Mon Nov 2 20:16:38 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/7e62c5c1/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/7e62c5c1/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();