diff --git a/CHANGES.txt b/CHANGES.txt index d3e7d5f9553..bf474d47165 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -796,6 +796,8 @@ Release 0.21.0 - Unreleased repeats info, too many numbers after the point, etc. HBASE-2869 Regularize how we log sequenceids -- sometimes its myseqid, other times its sequence id, etc. + HBASE-2873 Minor clean up in basescanner; fix a log and make deletes of + region processing run in order NEW FEATURES HBASE-1961 HBase EC2 scripts diff --git a/src/main/java/org/apache/hadoop/hbase/master/BaseScanner.java b/src/main/java/org/apache/hadoop/hbase/master/BaseScanner.java index ec1402a8c34..6abac46ad28 100644 --- a/src/main/java/org/apache/hadoop/hbase/master/BaseScanner.java +++ b/src/main/java/org/apache/hadoop/hbase/master/BaseScanner.java @@ -50,6 +50,8 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.NavigableMap; +import java.util.TreeMap; import java.util.concurrent.atomic.AtomicBoolean; @@ -168,7 +170,8 @@ abstract class BaseScanner extends Chore { // Array to hold list of split parents found. Scan adds to list. After // scan we go check if parents can be removed and that their daughters // are in place. - Map splitParents = new HashMap(); + NavigableMap splitParents = + new TreeMap(); List emptyRows = new ArrayList(); int rows = 0; try { @@ -307,8 +310,7 @@ abstract class BaseScanner extends Chore { parent, rowContent, HConstants.SPLITB_QUALIFIER); if (!hasReferencesA && !hasReferencesB) { LOG.info("Deleting region " + parent.getRegionNameAsString() + - " (encoded=" + parent.getEncodedName() + - ") because daughter splits no longer hold references"); + " because daughter splits no longer hold references"); HRegion.deleteRegion(this.master.getFileSystem(), this.master.getRootDir(), parent); HRegion.removeRegionFromMETA(srvr, metaRegionName,