(ranger) 01/02: RANGER-4857: Upgrade HBASE version to 2.6.0

[madhan]

This is an automated email from the ASF dual-hosted git repository.

madhan pushed a commit to branch ranger-2.5
in repository https://gitbox.apache.org/repos/asf/ranger.git

commit 210aac7e5e9f7ff44744c427bc0a3c46022ae861
Author: Villő Szűcs <szucsvi...@cloudera.com>
AuthorDate: Tue Jul 16 09:28:36 2024 +0200

    RANGER-4857: Upgrade HBASE version to 2.6.0
    
    Signed-off-by: Madhan Neethiraj <mad...@apache.org>
    (cherry picked from commit 6c4c5afb210b705d8b18988c97b8e8fed989fea1)
---
 .../authorization/hbase/RangerAuthorizationCoprocessor.java      | 2 +-
 pom.xml                                                          | 8 ++++----
 .../authorization/hbase/RangerAuthorizationCoprocessor.java      | 9 +++++----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git 
a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java
 
b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java
index c5f108b9e..15e57fa36 100644
--- 
a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java
+++ 
b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java
@@ -840,7 +840,7 @@ public class RangerAuthorizationCoprocessor implements 
AccessControlService.Inte
                requirePermission(c, "assign", regionInfo.getTable().getName(), 
null, null, Action.ADMIN);
        }
        @Override
-       public void preBalance(ObserverContext<MasterCoprocessorEnvironment> c) 
throws IOException {
+       public void preBalance(ObserverContext<MasterCoprocessorEnvironment> c, 
BalanceRequest request) throws IOException {
                requirePermission(c,"balance", Permission.Action.ADMIN);
        }
        @Override
diff --git a/pom.xml b/pom.xml
index e2ebdd427..a1fdd55bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,14 +124,14 @@
         <hadoop.version>3.3.3</hadoop.version>
         <ozone.version>1.3.0</ozone.version>
         <hamcrest.version>2.2</hamcrest.version>
-        <hbase.version>2.4.6</hbase.version>
+        <hbase.version>2.6.0</hbase.version>
         <hive.version>3.1.2</hive.version>
         <hive.storage-api.version>2.7.2</hive.storage-api.version>
         <orc.version>1.5.8</orc.version>
         <aircompressor.version>0.10</aircompressor.version>
-        <hbase-shaded-protobuf>3.5.1</hbase-shaded-protobuf>
-        <hbase-shaded-netty>3.5.1</hbase-shaded-netty>
-        <hbase-shaded-miscellaneous>3.5.1</hbase-shaded-miscellaneous>
+        <hbase-shaded-protobuf>4.1.7</hbase-shaded-protobuf>
+        <hbase-shaded-netty>4.1.7</hbase-shaded-netty>
+        <hbase-shaded-miscellaneous>4.1.7</hbase-shaded-miscellaneous>
         <libfb303.version>0.9.3</libfb303.version>
         <libthrift.version>0.13.0</libthrift.version>
         <htrace-core.version>4.1.0-incubating</htrace-core.version>
diff --git 
a/ranger-hbase-plugin-shim/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java
 
b/ranger-hbase-plugin-shim/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java
index 3e6e5d08c..35b680fd4 100644
--- 
a/ranger-hbase-plugin-shim/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java
+++ 
b/ranger-hbase-plugin-shim/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java
@@ -278,14 +278,14 @@ public class RangerAuthorizationCoprocessor implements 
RegionCoprocessor, Master
        }
 
        @Override
-       public void preBalance(ObserverContext<MasterCoprocessorEnvironment> c) 
throws IOException {
+       public void preBalance(ObserverContext<MasterCoprocessorEnvironment> c, 
BalanceRequest request) throws IOException {
                if(LOG.isDebugEnabled()) {
                        LOG.debug("==> 
RangerAuthorizationCoprocessor.preBalance()");
                }
 
                try {
                        activatePluginClassLoader();
-                       implMasterObserver.preBalance(c);
+                       implMasterObserver.preBalance(c, request);
                } finally {
                        deactivatePluginClassLoader();
                }
@@ -2386,14 +2386,15 @@ public class RangerAuthorizationCoprocessor implements 
RegionCoprocessor, Master
        }
 
        @Override
-       public void postBalance(ObserverContext<MasterCoprocessorEnvironment> 
ctx, List<RegionPlan> plans) throws IOException {
+       public void postBalance(ObserverContext<MasterCoprocessorEnvironment> 
ctx,
+                                                       BalanceRequest request, 
List<RegionPlan> plans) throws IOException {
                if(LOG.isDebugEnabled()) {
                        LOG.debug("==> 
RangerAuthorizationCoprocessor.postBalance()");
                }
 
                try {
                        activatePluginClassLoader();
-                       implMasterObserver.postBalance(ctx, plans);
+                       implMasterObserver.postBalance(ctx, request, plans);
                } finally {
                        deactivatePluginClassLoader();
                }