You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2015/08/07 18:06:54 UTC
[1/2] ambari git commit: AMBARI-12674. ranger-hbase-plugin-enabled
missing from Hbase config after upgrade from 2.0.1 to 2.1.0 (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 12568c1fe -> bbc8f4b6c
refs/heads/trunk dcd23a7a7 -> c89d427c7
AMBARI-12674. ranger-hbase-plugin-enabled missing from Hbase config after upgrade from 2.0.1 to 2.1.0 (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c89d427c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c89d427c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c89d427c
Branch: refs/heads/trunk
Commit: c89d427c75d15ca7ce1ad66fa6347987a36068f3
Parents: dcd23a7
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Fri Aug 7 19:06:29 2015 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Fri Aug 7 19:06:29 2015 +0300
----------------------------------------------------------------------
.../java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c89d427c/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
index e49a2f3..c4a08d9 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
@@ -1416,8 +1416,6 @@ public class UpgradeCatalog210 extends AbstractUpgradeCatalog {
&& RangerHBaseConfig.getProperties().containsKey("ranger-hbase-plugin-enabled")
&& cluster.getDesiredConfigByType("hbase-site") != null) {
Map<String, String> newHBaseSiteProperties = new HashMap<String, String>();
- Set<String> removeRangerHiveProperties = new HashSet<String>();
- removeRangerHiveProperties.add("ranger-hbase-plugin-enabled");
if (RangerHBaseConfig.getProperties().get("ranger-hbase-plugin-enabled") != null
&& RangerHBaseConfig.getProperties().get("ranger-hbase-plugin-enabled").equalsIgnoreCase("yes")) {
@@ -1426,8 +1424,6 @@ public class UpgradeCatalog210 extends AbstractUpgradeCatalog {
}
boolean updateProperty = cluster.getDesiredConfigByType("hbase-site").getProperties().containsKey("hbase.security.authorization");
updateConfigurationPropertiesForCluster(cluster, "hbase-site", newHBaseSiteProperties, updateProperty, true);
- updateConfigurationPropertiesForCluster(cluster, "ranger-hbase-plugin-properties", new HashMap<String, String>(),
- removeRangerHiveProperties, false, true);
}
}
}
[2/2] ambari git commit: AMBARI-12674. ranger-hbase-plugin-enabled
missing from Hbase config after upgrade from 2.0.1 to 2.1.0 (aonishuk)
Posted by ao...@apache.org.
AMBARI-12674. ranger-hbase-plugin-enabled missing from Hbase config after upgrade from 2.0.1 to 2.1.0 (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bbc8f4b6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bbc8f4b6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bbc8f4b6
Branch: refs/heads/branch-2.1
Commit: bbc8f4b6ccc67e83560160183993fca30091480f
Parents: 12568c1
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Fri Aug 7 19:06:31 2015 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Fri Aug 7 19:06:31 2015 +0300
----------------------------------------------------------------------
.../java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/bbc8f4b6/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
index e49a2f3..c4a08d9 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
@@ -1416,8 +1416,6 @@ public class UpgradeCatalog210 extends AbstractUpgradeCatalog {
&& RangerHBaseConfig.getProperties().containsKey("ranger-hbase-plugin-enabled")
&& cluster.getDesiredConfigByType("hbase-site") != null) {
Map<String, String> newHBaseSiteProperties = new HashMap<String, String>();
- Set<String> removeRangerHiveProperties = new HashSet<String>();
- removeRangerHiveProperties.add("ranger-hbase-plugin-enabled");
if (RangerHBaseConfig.getProperties().get("ranger-hbase-plugin-enabled") != null
&& RangerHBaseConfig.getProperties().get("ranger-hbase-plugin-enabled").equalsIgnoreCase("yes")) {
@@ -1426,8 +1424,6 @@ public class UpgradeCatalog210 extends AbstractUpgradeCatalog {
}
boolean updateProperty = cluster.getDesiredConfigByType("hbase-site").getProperties().containsKey("hbase.security.authorization");
updateConfigurationPropertiesForCluster(cluster, "hbase-site", newHBaseSiteProperties, updateProperty, true);
- updateConfigurationPropertiesForCluster(cluster, "ranger-hbase-plugin-properties", new HashMap<String, String>(),
- removeRangerHiveProperties, false, true);
}
}
}