Repository: ranger Updated Branches: refs/heads/master 3edac55fc -> b66953fd1
RANGER-2072 - Update HBase to 1.3.2 Signed-off-by: Colm O hEigeartaigh <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/b66953fd Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/b66953fd Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/b66953fd Branch: refs/heads/master Commit: b66953fd165d0f650141b9d8a68588c5e1689b45 Parents: 3edac55 Author: Colm O hEigeartaigh <[email protected]> Authored: Wed Apr 18 17:27:35 2018 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Wed May 2 17:19:19 2018 +0100 ---------------------------------------------------------------------- .../RangerAuthorizationCoprocessorBase.java | 28 ++++++++++++++++++++ pom.xml | 2 +- .../hbase/RangerAuthorizationCoprocessor.java | 27 +++++++++++++++++++ 3 files changed, 56 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ranger/blob/b66953fd/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessorBase.java ---------------------------------------------------------------------- diff --git a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessorBase.java b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessorBase.java index f34bc12..1062c9e 100644 --- a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessorBase.java +++ b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessorBase.java @@ -39,6 +39,7 @@ import org.apache.hadoop.hbase.client.Durability; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.Mutation; import org.apache.hadoop.hbase.client.Put; +import org.apache.hadoop.hbase.client.Admin.MasterSwitchType; import org.apache.hadoop.hbase.coprocessor.BaseRegionObserver; import org.apache.hadoop.hbase.coprocessor.BulkLoadObserver; import org.apache.hadoop.hbase.coprocessor.MasterCoprocessorEnvironment; @@ -489,4 +490,31 @@ public abstract class RangerAuthorizationCoprocessorBase extends BaseRegionObser public void postBalanceRSGroup(final ObserverContext<MasterCoprocessorEnvironment> ctx, String groupName, boolean balancerRan) throws IOException {} public void preAddRSGroup(ObserverContext<MasterCoprocessorEnvironment> ctx, String name) throws IOException {} public void postAddRSGroup(ObserverContext<MasterCoprocessorEnvironment> ctx, String name) throws IOException {} + + public void postDispatchMerge(ObserverContext<MasterCoprocessorEnvironment> arg0, HRegionInfo arg1, + HRegionInfo arg2) + throws IOException { + // TODO Auto-generated method stub + + } + + public void postSetSplitOrMergeEnabled(ObserverContext<MasterCoprocessorEnvironment> arg0, boolean arg1, + MasterSwitchType arg2) + throws IOException { + // TODO Auto-generated method stub + + } + public void preDispatchMerge(ObserverContext<MasterCoprocessorEnvironment> arg0, HRegionInfo arg1, + HRegionInfo arg2) + throws IOException { + // TODO Auto-generated method stub + + } + + public boolean preSetSplitOrMergeEnabled(ObserverContext<MasterCoprocessorEnvironment> arg0, boolean arg1, + MasterSwitchType arg2) + throws IOException { + // TODO Auto-generated method stub + return false; + } } http://git-wip-us.apache.org/repos/asf/ranger/blob/b66953fd/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 27d52a8..878f5f0 100644 --- a/pom.xml +++ b/pom.xml @@ -162,7 +162,7 @@ <guice.version>4.0</guice.version> <hadoop.version>2.7.1</hadoop.version> <hamcrest.all.version>1.3</hamcrest.all.version> - <hbase.version>1.2.6</hbase.version> + <hbase.version>1.3.2</hbase.version> <hive.version>2.3.2</hive.version> <htrace-core.version>3.1.0-incubating</htrace-core.version> <httpcomponents.httpclient.version>4.5.3</httpcomponents.httpclient.version> http://git-wip-us.apache.org/repos/asf/ranger/blob/b66953fd/ranger-hbase-plugin-shim/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java ---------------------------------------------------------------------- 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 6ab595a..87c6586 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 @@ -46,6 +46,7 @@ import org.apache.hadoop.hbase.client.Mutation; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.Scan; +import org.apache.hadoop.hbase.client.Admin.MasterSwitchType; import org.apache.hadoop.hbase.coprocessor.BulkLoadObserver; import org.apache.hadoop.hbase.coprocessor.CoprocessorService; import org.apache.hadoop.hbase.coprocessor.MasterCoprocessorEnvironment; @@ -3787,4 +3788,30 @@ public class RangerAuthorizationCoprocessor implements MasterObserver, RegionObs public void preAddRSGroup(ObserverContext<MasterCoprocessorEnvironment> ctx, String name) throws IOException {} public void postAddRSGroup(ObserverContext<MasterCoprocessorEnvironment> ctx, String name) throws IOException {} + public void postDispatchMerge(ObserverContext<MasterCoprocessorEnvironment> arg0, HRegionInfo arg1, + HRegionInfo arg2) + throws IOException { + // TODO Auto-generated method stub + + } + + public void postSetSplitOrMergeEnabled(ObserverContext<MasterCoprocessorEnvironment> arg0, boolean arg1, + MasterSwitchType arg2) + throws IOException { + // TODO Auto-generated method stub + + } + public void preDispatchMerge(ObserverContext<MasterCoprocessorEnvironment> arg0, HRegionInfo arg1, + HRegionInfo arg2) + throws IOException { + // TODO Auto-generated method stub + + } + + public boolean preSetSplitOrMergeEnabled(ObserverContext<MasterCoprocessorEnvironment> arg0, boolean arg1, + MasterSwitchType arg2) + throws IOException { + // TODO Auto-generated method stub + return false; + } }
