Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2604B19A74 for ; Tue, 26 Apr 2016 15:24:22 +0000 (UTC) Received: (qmail 95352 invoked by uid 500); 26 Apr 2016 15:24:22 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 95326 invoked by uid 500); 26 Apr 2016 15:24:22 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 95317 invoked by uid 99); 26 Apr 2016 15:24:22 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Apr 2016 15:24:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CD848E00C7; Tue, 26 Apr 2016 15:24:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dmitriusan@apache.org To: commits@ambari.apache.org Date: Tue, 26 Apr 2016 15:24:23 -0000 Message-Id: <36499f6a73f742cdb7e1d2881570048b@git.apache.org> In-Reply-To: <59ccd747257244f5bd394fabe0d6f115@git.apache.org> References: <59ccd747257244f5bd394fabe0d6f115@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] ambari git commit: AMBARI-16121. HBase RegionServers go down after Ambari upgrade due to ClassCastException (dlysnichenko) 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 Authored: Tue Apr 26 18:21:37 2016 +0300 Committer: Lisnichenko Dmitro 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 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");