Apache/hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-17803 Addendum fix NPE

Browse Source
This commit is contained in:
Chia-Ping Tsai 2017-03-19 19:05:25 +08:00
parent 23abc90068
commit 261aa9445c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java
View File

@ -43,6 +43,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
@ -325,7 +326,8 @@ public class PerformanceEvaluation extends Configured implements Tool {
// recreate the table when user has requested presplit or when existing // recreate the table when user has requested presplit or when existing
// {RegionSplitPolicy,replica count} does not match requested. // {RegionSplitPolicy,replica count} does not match requested.
if ((exists && opts.presplitRegions != DEFAULT_OPTS.presplitRegions) if ((exists && opts.presplitRegions != DEFAULT_OPTS.presplitRegions)
|| (!isReadCmd && desc != null && !desc.getRegionSplitPolicyClassName().equals(opts.splitPolicy)) || (!isReadCmd && desc != null &&
!StringUtils.equals(desc.getRegionSplitPolicyClassName(), opts.splitPolicy))
|| (!isReadCmd && desc != null && desc.getRegionReplication() != opts.replicas)) { || (!isReadCmd && desc != null && desc.getRegionReplication() != opts.replicas)) {
needsDelete = true; needsDelete = true;
// wait, why did it delete my table?!? // wait, why did it delete my table?!?