Skip to content

Commit b66953f

Browse files
committed
RANGER-2072 - Update HBase to 1.3.2
Signed-off-by: Colm O hEigeartaigh <[email protected]>
1 parent 3edac55 commit b66953f

File tree

3 files changed

+56
-1
lines changed

3 files changed

+56
-1
lines changed

hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessorBase.java

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import org.apache.hadoop.hbase.client.Get;
4040
import org.apache.hadoop.hbase.client.Mutation;
4141
import org.apache.hadoop.hbase.client.Put;
42+
import org.apache.hadoop.hbase.client.Admin.MasterSwitchType;
4243
import org.apache.hadoop.hbase.coprocessor.BaseRegionObserver;
4344
import org.apache.hadoop.hbase.coprocessor.BulkLoadObserver;
4445
import org.apache.hadoop.hbase.coprocessor.MasterCoprocessorEnvironment;
@@ -489,4 +490,31 @@ public void preBalanceRSGroup(final ObserverContext<MasterCoprocessorEnvironment
489490
public void postBalanceRSGroup(final ObserverContext<MasterCoprocessorEnvironment> ctx, String groupName, boolean balancerRan) throws IOException {}
490491
public void preAddRSGroup(ObserverContext<MasterCoprocessorEnvironment> ctx, String name) throws IOException {}
491492
public void postAddRSGroup(ObserverContext<MasterCoprocessorEnvironment> ctx, String name) throws IOException {}
493+
494+
public void postDispatchMerge(ObserverContext<MasterCoprocessorEnvironment> arg0, HRegionInfo arg1,
495+
HRegionInfo arg2)
496+
throws IOException {
497+
// TODO Auto-generated method stub
498+
499+
}
500+
501+
public void postSetSplitOrMergeEnabled(ObserverContext<MasterCoprocessorEnvironment> arg0, boolean arg1,
502+
MasterSwitchType arg2)
503+
throws IOException {
504+
// TODO Auto-generated method stub
505+
506+
}
507+
public void preDispatchMerge(ObserverContext<MasterCoprocessorEnvironment> arg0, HRegionInfo arg1,
508+
HRegionInfo arg2)
509+
throws IOException {
510+
// TODO Auto-generated method stub
511+
512+
}
513+
514+
public boolean preSetSplitOrMergeEnabled(ObserverContext<MasterCoprocessorEnvironment> arg0, boolean arg1,
515+
MasterSwitchType arg2)
516+
throws IOException {
517+
// TODO Auto-generated method stub
518+
return false;
519+
}
492520
}

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162
<guice.version>4.0</guice.version>
163163
<hadoop.version>2.7.1</hadoop.version>
164164
<hamcrest.all.version>1.3</hamcrest.all.version>
165-
<hbase.version>1.2.6</hbase.version>
165+
<hbase.version>1.3.2</hbase.version>
166166
<hive.version>2.3.2</hive.version>
167167
<htrace-core.version>3.1.0-incubating</htrace-core.version>
168168
<httpcomponents.httpclient.version>4.5.3</httpcomponents.httpclient.version>

ranger-hbase-plugin-shim/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
import org.apache.hadoop.hbase.client.Put;
4747
import org.apache.hadoop.hbase.client.Result;
4848
import org.apache.hadoop.hbase.client.Scan;
49+
import org.apache.hadoop.hbase.client.Admin.MasterSwitchType;
4950
import org.apache.hadoop.hbase.coprocessor.BulkLoadObserver;
5051
import org.apache.hadoop.hbase.coprocessor.CoprocessorService;
5152
import org.apache.hadoop.hbase.coprocessor.MasterCoprocessorEnvironment;
@@ -3787,4 +3788,30 @@ public void postBalanceRSGroup(final ObserverContext<MasterCoprocessorEnvironmen
37873788
public void preAddRSGroup(ObserverContext<MasterCoprocessorEnvironment> ctx, String name) throws IOException {}
37883789
public void postAddRSGroup(ObserverContext<MasterCoprocessorEnvironment> ctx, String name) throws IOException {}
37893790

3791+
public void postDispatchMerge(ObserverContext<MasterCoprocessorEnvironment> arg0, HRegionInfo arg1,
3792+
HRegionInfo arg2)
3793+
throws IOException {
3794+
// TODO Auto-generated method stub
3795+
3796+
}
3797+
3798+
public void postSetSplitOrMergeEnabled(ObserverContext<MasterCoprocessorEnvironment> arg0, boolean arg1,
3799+
MasterSwitchType arg2)
3800+
throws IOException {
3801+
// TODO Auto-generated method stub
3802+
3803+
}
3804+
public void preDispatchMerge(ObserverContext<MasterCoprocessorEnvironment> arg0, HRegionInfo arg1,
3805+
HRegionInfo arg2)
3806+
throws IOException {
3807+
// TODO Auto-generated method stub
3808+
3809+
}
3810+
3811+
public boolean preSetSplitOrMergeEnabled(ObserverContext<MasterCoprocessorEnvironment> arg0, boolean arg1,
3812+
MasterSwitchType arg2)
3813+
throws IOException {
3814+
// TODO Auto-generated method stub
3815+
return false;
3816+
}
37903817
}

0 commit comments

Comments
 (0)