ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aonis...@apache.org
Subject [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)
Date Fri, 07 Aug 2015 16:06:55 GMT
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 <aonishuk@hortonworks.com>
Authored: Fri Aug 7 19:06:31 2015 +0300
Committer: Andrew Onishuk <aonishuk@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);
           }
         }
       }


Mime
View raw message