ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dmitriu...@apache.org
Subject [3/3] ambari git commit: AMBARI-16121. HBase RegionServers go down after Ambari upgrade due to ClassCastException (dlysnichenko)
Date Tue, 26 Apr 2016 15:24:23 GMT
AMBARI-16121. HBase RegionServers go down after Ambari upgrade due to ClassCastException (dlysnichenko)


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

Branch: refs/heads/trunk
Commit: 694a2d839d4f5edb25587fec98f745b2c6e6266c
Parents: b24f72f
Author: Lisnichenko Dmitro <dlysnichenko@hortonworks.com>
Authored: Tue Apr 26 18:21:37 2016 +0300
Committer: Lisnichenko Dmitro <dlysnichenko@hortonworks.com>
Committed: Tue Apr 26 18:24:51 2016 +0300

----------------------------------------------------------------------
 .../server/upgrade/UpgradeCatalog222.java       | 20 ++++++++++----------
 .../server/upgrade/UpgradeCatalog222Test.java   |  8 ++++----
 2 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/694a2d83/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java
index 1401688..7b675f1 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java
@@ -252,26 +252,26 @@ public class UpgradeCatalog222 extends AbstractUpgradeCatalog {
             updates.put(HBASE_SITE_HBASE_COPROCESSOR_MASTER_CLASSES,
               "com.xasecure.authorization.hbase.XaSecureAuthorizationCoprocessor");
           }
-          if (hbaseSite.getProperties().containsKey(HBASE_SITE_HBASE_COPROCESSOR_REGION_CLASSES))
{
-            updates.put(HBASE_SITE_HBASE_COPROCESSOR_REGION_CLASSES,
-              "com.xasecure.authorization.hbase.XaSecureAuthorizationCoprocessor");
-          }
           if (hbaseSite.getProperties().containsKey(HBASE_SITE_HBASE_COPROCESSOR_REGIONSERVER_CLASSES))
{
             updates.put(HBASE_SITE_HBASE_COPROCESSOR_REGIONSERVER_CLASSES,
-              "org.apache.hadoop.hbase.security.token.TokenProvider,org.apache.hadoop.hbase.security.access.SecureBulkLoadEndpoint,"
+
-                "com.xasecure.authorization.hbase.XaSecureAuthorizationCoprocessor");
+              "com.xasecure.authorization.hbase.XaSecureAuthorizationCoprocessor");
+          }
+          if (hbaseSite.getProperties().containsKey(HBASE_SITE_HBASE_COPROCESSOR_REGION_CLASSES))
{
+            updates.put(HBASE_SITE_HBASE_COPROCESSOR_REGION_CLASSES,
+                "org.apache.hadoop.hbase.security.token.TokenProvider,org.apache.hadoop.hbase.security.access.SecureBulkLoadEndpoint,"
+
+                    "com.xasecure.authorization.hbase.XaSecureAuthorizationCoprocessor");
           }
         } else if (VersionUtils.compareVersions(stackVersion, "2.3") == 0) {
           if (hbaseSite.getProperties().containsKey(HBASE_SITE_HBASE_COPROCESSOR_MASTER_CLASSES))
{
             updates.put(HBASE_SITE_HBASE_COPROCESSOR_MASTER_CLASSES,
               "org.apache.ranger.authorization.hbase.RangerAuthorizationCoprocessor ");
           }
-          if (hbaseSite.getProperties().containsKey(HBASE_SITE_HBASE_COPROCESSOR_REGION_CLASSES))
{
-            updates.put(HBASE_SITE_HBASE_COPROCESSOR_REGION_CLASSES,
-              "org.apache.ranger.authorization.hbase.RangerAuthorizationCoprocessor");
-          }
           if (hbaseSite.getProperties().containsKey(HBASE_SITE_HBASE_COPROCESSOR_REGIONSERVER_CLASSES))
{
             updates.put(HBASE_SITE_HBASE_COPROCESSOR_REGIONSERVER_CLASSES,
+              "org.apache.ranger.authorization.hbase.RangerAuthorizationCoprocessor");
+          }
+          if (hbaseSite.getProperties().containsKey(HBASE_SITE_HBASE_COPROCESSOR_REGION_CLASSES))
{
+            updates.put(HBASE_SITE_HBASE_COPROCESSOR_REGION_CLASSES,
               "org.apache.hadoop.hbase.security.token.TokenProvider,org.apache.hadoop.hbase.security.access.SecureBulkLoadEndpoint,"
+
                 "org.apache.ranger.authorization.hbase.RangerAuthorizationCoprocessor");
           }

http://git-wip-us.apache.org/repos/asf/ambari/blob/694a2d83/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog222Test.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog222Test.java
b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog222Test.java
index c0c85fd..cdbf39b 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog222Test.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog222Test.java
@@ -395,8 +395,8 @@ public class UpgradeCatalog222Test {
 
     Map<String, String> expectedUpdates = new HashMap<>();
     expectedUpdates.put(UpgradeCatalog222.HBASE_SITE_HBASE_COPROCESSOR_MASTER_CLASSES, "com.xasecure.authorization.hbase.XaSecureAuthorizationCoprocessor");
-    expectedUpdates.put(UpgradeCatalog222.HBASE_SITE_HBASE_COPROCESSOR_REGION_CLASSES, "com.xasecure.authorization.hbase.XaSecureAuthorizationCoprocessor");
-    expectedUpdates.put(UpgradeCatalog222.HBASE_SITE_HBASE_COPROCESSOR_REGIONSERVER_CLASSES,
+    expectedUpdates.put(UpgradeCatalog222.HBASE_SITE_HBASE_COPROCESSOR_REGIONSERVER_CLASSES,
"com.xasecure.authorization.hbase.XaSecureAuthorizationCoprocessor");
+    expectedUpdates.put(UpgradeCatalog222.HBASE_SITE_HBASE_COPROCESSOR_REGION_CLASSES,
       "org.apache.hadoop.hbase.security.token.TokenProvider,org.apache.hadoop.hbase.security.access.SecureBulkLoadEndpoint,"
+
         "com.xasecure.authorization.hbase.XaSecureAuthorizationCoprocessor");
 
@@ -417,8 +417,8 @@ public class UpgradeCatalog222Test {
 
     expectedUpdates = new HashMap<>();
     expectedUpdates.put(UpgradeCatalog222.HBASE_SITE_HBASE_COPROCESSOR_MASTER_CLASSES, "org.apache.ranger.authorization.hbase.RangerAuthorizationCoprocessor
");
-    expectedUpdates.put(UpgradeCatalog222.HBASE_SITE_HBASE_COPROCESSOR_REGION_CLASSES, "org.apache.ranger.authorization.hbase.RangerAuthorizationCoprocessor");
-    expectedUpdates.put(UpgradeCatalog222.HBASE_SITE_HBASE_COPROCESSOR_REGIONSERVER_CLASSES,
+    expectedUpdates.put(UpgradeCatalog222.HBASE_SITE_HBASE_COPROCESSOR_REGIONSERVER_CLASSES,
"org.apache.ranger.authorization.hbase.RangerAuthorizationCoprocessor");
+    expectedUpdates.put(UpgradeCatalog222.HBASE_SITE_HBASE_COPROCESSOR_REGION_CLASSES,
       "org.apache.hadoop.hbase.security.token.TokenProvider,org.apache.hadoop.hbase.security.access.SecureBulkLoadEndpoint,"
+
         "org.apache.ranger.authorization.hbase.RangerAuthorizationCoprocessor");
 


Mime
View raw message