http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9e6e3360/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/CacheConfig.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/CacheConfig.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/CacheConfig.html
index a31c60b..f04095f 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/CacheConfig.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/CacheConfig.html
@@ -592,136 +592,145 @@
 <span class="sourceLineNo">584</span>   * @return Returns L2 block cache 
instance (for now it is BucketCache BlockCache all the time)<a 
name="line.584"></a>
 <span class="sourceLineNo">585</span>   * or null if not supposed to be a 
L2.<a name="line.585"></a>
 <span class="sourceLineNo">586</span>   */<a name="line.586"></a>
-<span class="sourceLineNo">587</span>  private static BlockCache getL2(final 
Configuration c) {<a name="line.587"></a>
-<span class="sourceLineNo">588</span>    final boolean useExternal = 
c.getBoolean(EXTERNAL_BLOCKCACHE_KEY, EXTERNAL_BLOCKCACHE_DEFAULT);<a 
name="line.588"></a>
-<span class="sourceLineNo">589</span>    if (LOG.isDebugEnabled()) {<a 
name="line.589"></a>
-<span class="sourceLineNo">590</span>      LOG.debug("Trying to use " + 
(useExternal?" External":" Internal") + " l2 cache");<a name="line.590"></a>
-<span class="sourceLineNo">591</span>    }<a name="line.591"></a>
-<span class="sourceLineNo">592</span><a name="line.592"></a>
-<span class="sourceLineNo">593</span>    // If we want to use an external 
block cache then create that.<a name="line.593"></a>
-<span class="sourceLineNo">594</span>    if (useExternal) {<a 
name="line.594"></a>
-<span class="sourceLineNo">595</span>      return getExternalBlockcache(c);<a 
name="line.595"></a>
-<span class="sourceLineNo">596</span>    }<a name="line.596"></a>
-<span class="sourceLineNo">597</span><a name="line.597"></a>
+<span class="sourceLineNo">587</span>  @VisibleForTesting<a 
name="line.587"></a>
+<span class="sourceLineNo">588</span>  static BlockCache getL2(final 
Configuration c) {<a name="line.588"></a>
+<span class="sourceLineNo">589</span>    final boolean useExternal = 
c.getBoolean(EXTERNAL_BLOCKCACHE_KEY, EXTERNAL_BLOCKCACHE_DEFAULT);<a 
name="line.589"></a>
+<span class="sourceLineNo">590</span>    if (LOG.isDebugEnabled()) {<a 
name="line.590"></a>
+<span class="sourceLineNo">591</span>      LOG.debug("Trying to use " + 
(useExternal?" External":" Internal") + " l2 cache");<a name="line.591"></a>
+<span class="sourceLineNo">592</span>    }<a name="line.592"></a>
+<span class="sourceLineNo">593</span><a name="line.593"></a>
+<span class="sourceLineNo">594</span>    // If we want to use an external 
block cache then create that.<a name="line.594"></a>
+<span class="sourceLineNo">595</span>    if (useExternal) {<a 
name="line.595"></a>
+<span class="sourceLineNo">596</span>      return getExternalBlockcache(c);<a 
name="line.596"></a>
+<span class="sourceLineNo">597</span>    }<a name="line.597"></a>
 <span class="sourceLineNo">598</span>    // otherwise use the bucket cache.<a 
name="line.598"></a>
 <span class="sourceLineNo">599</span>    return getBucketCache(c);<a 
name="line.599"></a>
-<span class="sourceLineNo">600</span><a name="line.600"></a>
-<span class="sourceLineNo">601</span>  }<a name="line.601"></a>
-<span class="sourceLineNo">602</span><a name="line.602"></a>
-<span class="sourceLineNo">603</span>  private static BlockCache 
getExternalBlockcache(Configuration c) {<a name="line.603"></a>
-<span class="sourceLineNo">604</span>    Class klass = null;<a 
name="line.604"></a>
-<span class="sourceLineNo">605</span><a name="line.605"></a>
-<span class="sourceLineNo">606</span>    // Get the class, from the config. 
s<a name="line.606"></a>
-<span class="sourceLineNo">607</span>    try {<a name="line.607"></a>
-<span class="sourceLineNo">608</span>      klass = 
ExternalBlockCaches.valueOf(c.get(EXTERNAL_BLOCKCACHE_CLASS_KEY, 
"memcache")).clazz;<a name="line.608"></a>
-<span class="sourceLineNo">609</span>    } catch (IllegalArgumentException 
exception) {<a name="line.609"></a>
-<span class="sourceLineNo">610</span>      try {<a name="line.610"></a>
-<span class="sourceLineNo">611</span>        klass = 
c.getClass(EXTERNAL_BLOCKCACHE_CLASS_KEY, Class.forName(<a name="line.611"></a>
-<span class="sourceLineNo">612</span>            
"org.apache.hadoop.hbase.io.hfile.MemcachedBlockCache"));<a name="line.612"></a>
-<span class="sourceLineNo">613</span>      } catch (ClassNotFoundException e) 
{<a name="line.613"></a>
-<span class="sourceLineNo">614</span>        return null;<a 
name="line.614"></a>
-<span class="sourceLineNo">615</span>      }<a name="line.615"></a>
-<span class="sourceLineNo">616</span>    }<a name="line.616"></a>
-<span class="sourceLineNo">617</span><a name="line.617"></a>
-<span class="sourceLineNo">618</span>    // Now try and create an instance of 
the block cache.<a name="line.618"></a>
-<span class="sourceLineNo">619</span>    try {<a name="line.619"></a>
-<span class="sourceLineNo">620</span>      LOG.info("Creating external block 
cache of type: " + klass);<a name="line.620"></a>
-<span class="sourceLineNo">621</span>      return (BlockCache) 
ReflectionUtils.newInstance(klass, c);<a name="line.621"></a>
-<span class="sourceLineNo">622</span>    } catch (Exception e) {<a 
name="line.622"></a>
-<span class="sourceLineNo">623</span>      LOG.warn("Error creating external 
block cache", e);<a name="line.623"></a>
-<span class="sourceLineNo">624</span>    }<a name="line.624"></a>
-<span class="sourceLineNo">625</span>    return null;<a name="line.625"></a>
-<span class="sourceLineNo">626</span><a name="line.626"></a>
-<span class="sourceLineNo">627</span>  }<a name="line.627"></a>
-<span class="sourceLineNo">628</span><a name="line.628"></a>
-<span class="sourceLineNo">629</span>  private static BlockCache 
getBucketCache(Configuration c) {<a name="line.629"></a>
-<span class="sourceLineNo">630</span>    // Check for L2.  ioengine name must 
be non-null.<a name="line.630"></a>
-<span class="sourceLineNo">631</span>    String bucketCacheIOEngineName = 
c.get(BUCKET_CACHE_IOENGINE_KEY, null);<a name="line.631"></a>
-<span class="sourceLineNo">632</span>    if (bucketCacheIOEngineName == null 
|| bucketCacheIOEngineName.length() &lt;= 0) return null;<a name="line.632"></a>
-<span class="sourceLineNo">633</span><a name="line.633"></a>
-<span class="sourceLineNo">634</span>    int blockSize = 
c.getInt(BLOCKCACHE_BLOCKSIZE_KEY, HConstants.DEFAULT_BLOCKSIZE);<a 
name="line.634"></a>
-<span class="sourceLineNo">635</span>    final long bucketCacheSize = 
MemorySizeUtil.getBucketCacheSize(c);<a name="line.635"></a>
-<span class="sourceLineNo">636</span>    if (bucketCacheSize &lt;= 0) {<a 
name="line.636"></a>
-<span class="sourceLineNo">637</span>      throw new 
IllegalStateException("bucketCacheSize &lt;= 0; Check " +<a name="line.637"></a>
-<span class="sourceLineNo">638</span>        BUCKET_CACHE_SIZE_KEY + " setting 
and/or server java heap size");<a name="line.638"></a>
-<span class="sourceLineNo">639</span>    }<a name="line.639"></a>
-<span class="sourceLineNo">640</span>    if 
(c.get("hbase.bucketcache.percentage.in.combinedcache") != null) {<a 
name="line.640"></a>
-<span class="sourceLineNo">641</span>      LOG.warn("Configuration 
'hbase.bucketcache.percentage.in.combinedcache' is no longer "<a 
name="line.641"></a>
-<span class="sourceLineNo">642</span>          + "respected. See comments in 
http://hbase.apache.org/book.html#_changes_of_note";);<a name="line.642"></a>
-<span class="sourceLineNo">643</span>    }<a name="line.643"></a>
-<span class="sourceLineNo">644</span>    int writerThreads = 
c.getInt(BUCKET_CACHE_WRITER_THREADS_KEY,<a name="line.644"></a>
-<span class="sourceLineNo">645</span>      
DEFAULT_BUCKET_CACHE_WRITER_THREADS);<a name="line.645"></a>
-<span class="sourceLineNo">646</span>    int writerQueueLen = 
c.getInt(BUCKET_CACHE_WRITER_QUEUE_KEY,<a name="line.646"></a>
-<span class="sourceLineNo">647</span>      
DEFAULT_BUCKET_CACHE_WRITER_QUEUE);<a name="line.647"></a>
-<span class="sourceLineNo">648</span>    String persistentPath = 
c.get(BUCKET_CACHE_PERSISTENT_PATH_KEY);<a name="line.648"></a>
-<span class="sourceLineNo">649</span>    String[] configuredBucketSizes = 
c.getStrings(BUCKET_CACHE_BUCKETS_KEY);<a name="line.649"></a>
-<span class="sourceLineNo">650</span>    int [] bucketSizes = null;<a 
name="line.650"></a>
-<span class="sourceLineNo">651</span>    if (configuredBucketSizes != null) 
{<a name="line.651"></a>
-<span class="sourceLineNo">652</span>      bucketSizes = new 
int[configuredBucketSizes.length];<a name="line.652"></a>
-<span class="sourceLineNo">653</span>      for (int i = 0; i &lt; 
configuredBucketSizes.length; i++) {<a name="line.653"></a>
-<span class="sourceLineNo">654</span>        bucketSizes[i] = 
Integer.parseInt(configuredBucketSizes[i].trim());<a name="line.654"></a>
-<span class="sourceLineNo">655</span>      }<a name="line.655"></a>
-<span class="sourceLineNo">656</span>    }<a name="line.656"></a>
-<span class="sourceLineNo">657</span>    BucketCache bucketCache = null;<a 
name="line.657"></a>
-<span class="sourceLineNo">658</span>    try {<a name="line.658"></a>
-<span class="sourceLineNo">659</span>      int ioErrorsTolerationDuration = 
c.getInt(<a name="line.659"></a>
-<span class="sourceLineNo">660</span>        
"hbase.bucketcache.ioengine.errors.tolerated.duration",<a name="line.660"></a>
-<span class="sourceLineNo">661</span>        
BucketCache.DEFAULT_ERROR_TOLERATION_DURATION);<a name="line.661"></a>
-<span class="sourceLineNo">662</span>      // Bucket cache logs its stats on 
creation internal to the constructor.<a name="line.662"></a>
-<span class="sourceLineNo">663</span>      bucketCache = new 
BucketCache(bucketCacheIOEngineName,<a name="line.663"></a>
-<span class="sourceLineNo">664</span>        bucketCacheSize, blockSize, 
bucketSizes, writerThreads, writerQueueLen, persistentPath,<a 
name="line.664"></a>
-<span class="sourceLineNo">665</span>        ioErrorsTolerationDuration);<a 
name="line.665"></a>
-<span class="sourceLineNo">666</span>    } catch (IOException ioex) {<a 
name="line.666"></a>
-<span class="sourceLineNo">667</span>      LOG.error("Can't instantiate bucket 
cache", ioex); throw new RuntimeException(ioex);<a name="line.667"></a>
-<span class="sourceLineNo">668</span>    }<a name="line.668"></a>
-<span class="sourceLineNo">669</span>    return bucketCache;<a 
name="line.669"></a>
-<span class="sourceLineNo">670</span>  }<a name="line.670"></a>
-<span class="sourceLineNo">671</span><a name="line.671"></a>
-<span class="sourceLineNo">672</span>  /**<a name="line.672"></a>
-<span class="sourceLineNo">673</span>   * Returns the block cache or 
&lt;code&gt;null&lt;/code&gt; in case none should be used.<a 
name="line.673"></a>
-<span class="sourceLineNo">674</span>   * Sets GLOBAL_BLOCK_CACHE_INSTANCE<a 
name="line.674"></a>
-<span class="sourceLineNo">675</span>   *<a name="line.675"></a>
-<span class="sourceLineNo">676</span>   * @param conf  The current 
configuration.<a name="line.676"></a>
-<span class="sourceLineNo">677</span>   * @return The block cache or 
&lt;code&gt;null&lt;/code&gt;.<a name="line.677"></a>
-<span class="sourceLineNo">678</span>   */<a name="line.678"></a>
-<span class="sourceLineNo">679</span>  public static synchronized BlockCache 
instantiateBlockCache(Configuration conf) {<a name="line.679"></a>
-<span class="sourceLineNo">680</span>    if (GLOBAL_BLOCK_CACHE_INSTANCE != 
null) return GLOBAL_BLOCK_CACHE_INSTANCE;<a name="line.680"></a>
-<span class="sourceLineNo">681</span>    if (blockCacheDisabled) return 
null;<a name="line.681"></a>
-<span class="sourceLineNo">682</span>    LruBlockCache l1 = 
getL1Internal(conf);<a name="line.682"></a>
-<span class="sourceLineNo">683</span>    // blockCacheDisabled is set as a 
side-effect of getL1Internal(), so check it again after the call.<a 
name="line.683"></a>
-<span class="sourceLineNo">684</span>    if (blockCacheDisabled) return 
null;<a name="line.684"></a>
-<span class="sourceLineNo">685</span>    BlockCache l2 = getL2(conf);<a 
name="line.685"></a>
-<span class="sourceLineNo">686</span>    if (l2 == null) {<a 
name="line.686"></a>
-<span class="sourceLineNo">687</span>      GLOBAL_BLOCK_CACHE_INSTANCE = l1;<a 
name="line.687"></a>
-<span class="sourceLineNo">688</span>    } else {<a name="line.688"></a>
-<span class="sourceLineNo">689</span>      boolean useExternal = 
conf.getBoolean(EXTERNAL_BLOCKCACHE_KEY, EXTERNAL_BLOCKCACHE_DEFAULT);<a 
name="line.689"></a>
-<span class="sourceLineNo">690</span>      boolean combinedWithLru = 
conf.getBoolean(BUCKET_CACHE_COMBINED_KEY,<a name="line.690"></a>
-<span class="sourceLineNo">691</span>        DEFAULT_BUCKET_CACHE_COMBINED);<a 
name="line.691"></a>
-<span class="sourceLineNo">692</span>      if (useExternal) {<a 
name="line.692"></a>
-<span class="sourceLineNo">693</span>        GLOBAL_BLOCK_CACHE_INSTANCE = new 
InclusiveCombinedBlockCache(l1, l2);<a name="line.693"></a>
-<span class="sourceLineNo">694</span>      } else {<a name="line.694"></a>
-<span class="sourceLineNo">695</span>        if (combinedWithLru) {<a 
name="line.695"></a>
-<span class="sourceLineNo">696</span>          GLOBAL_BLOCK_CACHE_INSTANCE = 
new CombinedBlockCache(l1, l2);<a name="line.696"></a>
-<span class="sourceLineNo">697</span>        } else {<a name="line.697"></a>
-<span class="sourceLineNo">698</span>          // L1 and L2 are not 
'combined'.  They are connected via the LruBlockCache victimhandler<a 
name="line.698"></a>
-<span class="sourceLineNo">699</span>          // mechanism.  It is a little 
ugly but works according to the following: when the<a name="line.699"></a>
-<span class="sourceLineNo">700</span>          // background eviction thread 
runs, blocks evicted from L1 will go to L2 AND when we get<a 
name="line.700"></a>
-<span class="sourceLineNo">701</span>          // a block from the L1 cache, 
if not in L1, we will search L2.<a name="line.701"></a>
-<span class="sourceLineNo">702</span>          GLOBAL_BLOCK_CACHE_INSTANCE = 
l1;<a name="line.702"></a>
-<span class="sourceLineNo">703</span>        }<a name="line.703"></a>
-<span class="sourceLineNo">704</span>      }<a name="line.704"></a>
-<span class="sourceLineNo">705</span>      l1.setVictimCache(l2);<a 
name="line.705"></a>
-<span class="sourceLineNo">706</span>    }<a name="line.706"></a>
-<span class="sourceLineNo">707</span>    return GLOBAL_BLOCK_CACHE_INSTANCE;<a 
name="line.707"></a>
-<span class="sourceLineNo">708</span>  }<a name="line.708"></a>
-<span class="sourceLineNo">709</span><a name="line.709"></a>
-<span class="sourceLineNo">710</span>  // Supposed to use only from tests. 
Some tests want to reinit the Global block cache instance<a name="line.710"></a>
-<span class="sourceLineNo">711</span>  @VisibleForTesting<a 
name="line.711"></a>
-<span class="sourceLineNo">712</span>  static synchronized void 
clearGlobalInstances() {<a name="line.712"></a>
-<span class="sourceLineNo">713</span>    GLOBAL_L1_CACHE_INSTANCE = null;<a 
name="line.713"></a>
-<span class="sourceLineNo">714</span>    GLOBAL_BLOCK_CACHE_INSTANCE = null;<a 
name="line.714"></a>
-<span class="sourceLineNo">715</span>  }<a name="line.715"></a>
-<span class="sourceLineNo">716</span>}<a name="line.716"></a>
+<span class="sourceLineNo">600</span>  }<a name="line.600"></a>
+<span class="sourceLineNo">601</span><a name="line.601"></a>
+<span class="sourceLineNo">602</span>  private static BlockCache 
getExternalBlockcache(Configuration c) {<a name="line.602"></a>
+<span class="sourceLineNo">603</span>    Class klass = null;<a 
name="line.603"></a>
+<span class="sourceLineNo">604</span><a name="line.604"></a>
+<span class="sourceLineNo">605</span>    // Get the class, from the config. 
s<a name="line.605"></a>
+<span class="sourceLineNo">606</span>    try {<a name="line.606"></a>
+<span class="sourceLineNo">607</span>      klass = 
ExternalBlockCaches.valueOf(c.get(EXTERNAL_BLOCKCACHE_CLASS_KEY, 
"memcache")).clazz;<a name="line.607"></a>
+<span class="sourceLineNo">608</span>    } catch (IllegalArgumentException 
exception) {<a name="line.608"></a>
+<span class="sourceLineNo">609</span>      try {<a name="line.609"></a>
+<span class="sourceLineNo">610</span>        klass = 
c.getClass(EXTERNAL_BLOCKCACHE_CLASS_KEY, Class.forName(<a name="line.610"></a>
+<span class="sourceLineNo">611</span>            
"org.apache.hadoop.hbase.io.hfile.MemcachedBlockCache"));<a name="line.611"></a>
+<span class="sourceLineNo">612</span>      } catch (ClassNotFoundException e) 
{<a name="line.612"></a>
+<span class="sourceLineNo">613</span>        return null;<a 
name="line.613"></a>
+<span class="sourceLineNo">614</span>      }<a name="line.614"></a>
+<span class="sourceLineNo">615</span>    }<a name="line.615"></a>
+<span class="sourceLineNo">616</span><a name="line.616"></a>
+<span class="sourceLineNo">617</span>    // Now try and create an instance of 
the block cache.<a name="line.617"></a>
+<span class="sourceLineNo">618</span>    try {<a name="line.618"></a>
+<span class="sourceLineNo">619</span>      LOG.info("Creating external block 
cache of type: " + klass);<a name="line.619"></a>
+<span class="sourceLineNo">620</span>      return (BlockCache) 
ReflectionUtils.newInstance(klass, c);<a name="line.620"></a>
+<span class="sourceLineNo">621</span>    } catch (Exception e) {<a 
name="line.621"></a>
+<span class="sourceLineNo">622</span>      LOG.warn("Error creating external 
block cache", e);<a name="line.622"></a>
+<span class="sourceLineNo">623</span>    }<a name="line.623"></a>
+<span class="sourceLineNo">624</span>    return null;<a name="line.624"></a>
+<span class="sourceLineNo">625</span><a name="line.625"></a>
+<span class="sourceLineNo">626</span>  }<a name="line.626"></a>
+<span class="sourceLineNo">627</span><a name="line.627"></a>
+<span class="sourceLineNo">628</span>  private static BlockCache 
getBucketCache(Configuration c) {<a name="line.628"></a>
+<span class="sourceLineNo">629</span>    // Check for L2.  ioengine name must 
be non-null.<a name="line.629"></a>
+<span class="sourceLineNo">630</span>    String bucketCacheIOEngineName = 
c.get(BUCKET_CACHE_IOENGINE_KEY, null);<a name="line.630"></a>
+<span class="sourceLineNo">631</span>    if (bucketCacheIOEngineName == null 
|| bucketCacheIOEngineName.length() &lt;= 0) return null;<a name="line.631"></a>
+<span class="sourceLineNo">632</span><a name="line.632"></a>
+<span class="sourceLineNo">633</span>    int blockSize = 
c.getInt(BLOCKCACHE_BLOCKSIZE_KEY, HConstants.DEFAULT_BLOCKSIZE);<a 
name="line.633"></a>
+<span class="sourceLineNo">634</span>    final long bucketCacheSize = 
MemorySizeUtil.getBucketCacheSize(c);<a name="line.634"></a>
+<span class="sourceLineNo">635</span>    if (bucketCacheSize &lt;= 0) {<a 
name="line.635"></a>
+<span class="sourceLineNo">636</span>      throw new 
IllegalStateException("bucketCacheSize &lt;= 0; Check " +<a name="line.636"></a>
+<span class="sourceLineNo">637</span>        BUCKET_CACHE_SIZE_KEY + " setting 
and/or server java heap size");<a name="line.637"></a>
+<span class="sourceLineNo">638</span>    }<a name="line.638"></a>
+<span class="sourceLineNo">639</span>    if 
(c.get("hbase.bucketcache.percentage.in.combinedcache") != null) {<a 
name="line.639"></a>
+<span class="sourceLineNo">640</span>      LOG.warn("Configuration 
'hbase.bucketcache.percentage.in.combinedcache' is no longer "<a 
name="line.640"></a>
+<span class="sourceLineNo">641</span>          + "respected. See comments in 
http://hbase.apache.org/book.html#_changes_of_note";);<a name="line.641"></a>
+<span class="sourceLineNo">642</span>    }<a name="line.642"></a>
+<span class="sourceLineNo">643</span>    int writerThreads = 
c.getInt(BUCKET_CACHE_WRITER_THREADS_KEY,<a name="line.643"></a>
+<span class="sourceLineNo">644</span>      
DEFAULT_BUCKET_CACHE_WRITER_THREADS);<a name="line.644"></a>
+<span class="sourceLineNo">645</span>    int writerQueueLen = 
c.getInt(BUCKET_CACHE_WRITER_QUEUE_KEY,<a name="line.645"></a>
+<span class="sourceLineNo">646</span>      
DEFAULT_BUCKET_CACHE_WRITER_QUEUE);<a name="line.646"></a>
+<span class="sourceLineNo">647</span>    String persistentPath = 
c.get(BUCKET_CACHE_PERSISTENT_PATH_KEY);<a name="line.647"></a>
+<span class="sourceLineNo">648</span>    String[] configuredBucketSizes = 
c.getStrings(BUCKET_CACHE_BUCKETS_KEY);<a name="line.648"></a>
+<span class="sourceLineNo">649</span>    int [] bucketSizes = null;<a 
name="line.649"></a>
+<span class="sourceLineNo">650</span>    if (configuredBucketSizes != null) 
{<a name="line.650"></a>
+<span class="sourceLineNo">651</span>      bucketSizes = new 
int[configuredBucketSizes.length];<a name="line.651"></a>
+<span class="sourceLineNo">652</span>      for (int i = 0; i &lt; 
configuredBucketSizes.length; i++) {<a name="line.652"></a>
+<span class="sourceLineNo">653</span>        int bucketSize = 
Integer.parseInt(configuredBucketSizes[i].trim());<a name="line.653"></a>
+<span class="sourceLineNo">654</span>        if (bucketSize % 256 != 0) {<a 
name="line.654"></a>
+<span class="sourceLineNo">655</span>          // We need all the bucket sizes 
to be multiples of 256. Having all the configured bucket<a name="line.655"></a>
+<span class="sourceLineNo">656</span>          // sizes to be multiples of 256 
will ensure that the block offsets within buckets,<a name="line.656"></a>
+<span class="sourceLineNo">657</span>          // that are calculated, will 
also be multiples of 256.<a name="line.657"></a>
+<span class="sourceLineNo">658</span>          // See BucketEntry where offset 
to each block is represented using 5 bytes (instead of 8<a name="line.658"></a>
+<span class="sourceLineNo">659</span>          // bytes long). We would like 
to save heap overhead as less as possible.<a name="line.659"></a>
+<span class="sourceLineNo">660</span>          throw new 
IllegalArgumentException("Illegal value: " + bucketSize + " configured for '"<a 
name="line.660"></a>
+<span class="sourceLineNo">661</span>              + BUCKET_CACHE_BUCKETS_KEY 
+ "'. All bucket sizes to be multiples of 256");<a name="line.661"></a>
+<span class="sourceLineNo">662</span>        }<a name="line.662"></a>
+<span class="sourceLineNo">663</span>        bucketSizes[i] = bucketSize;<a 
name="line.663"></a>
+<span class="sourceLineNo">664</span>      }<a name="line.664"></a>
+<span class="sourceLineNo">665</span>    }<a name="line.665"></a>
+<span class="sourceLineNo">666</span>    BucketCache bucketCache = null;<a 
name="line.666"></a>
+<span class="sourceLineNo">667</span>    try {<a name="line.667"></a>
+<span class="sourceLineNo">668</span>      int ioErrorsTolerationDuration = 
c.getInt(<a name="line.668"></a>
+<span class="sourceLineNo">669</span>        
"hbase.bucketcache.ioengine.errors.tolerated.duration",<a name="line.669"></a>
+<span class="sourceLineNo">670</span>        
BucketCache.DEFAULT_ERROR_TOLERATION_DURATION);<a name="line.670"></a>
+<span class="sourceLineNo">671</span>      // Bucket cache logs its stats on 
creation internal to the constructor.<a name="line.671"></a>
+<span class="sourceLineNo">672</span>      bucketCache = new 
BucketCache(bucketCacheIOEngineName,<a name="line.672"></a>
+<span class="sourceLineNo">673</span>        bucketCacheSize, blockSize, 
bucketSizes, writerThreads, writerQueueLen, persistentPath,<a 
name="line.673"></a>
+<span class="sourceLineNo">674</span>        ioErrorsTolerationDuration);<a 
name="line.674"></a>
+<span class="sourceLineNo">675</span>    } catch (IOException ioex) {<a 
name="line.675"></a>
+<span class="sourceLineNo">676</span>      LOG.error("Can't instantiate bucket 
cache", ioex); throw new RuntimeException(ioex);<a name="line.676"></a>
+<span class="sourceLineNo">677</span>    }<a name="line.677"></a>
+<span class="sourceLineNo">678</span>    return bucketCache;<a 
name="line.678"></a>
+<span class="sourceLineNo">679</span>  }<a name="line.679"></a>
+<span class="sourceLineNo">680</span><a name="line.680"></a>
+<span class="sourceLineNo">681</span>  /**<a name="line.681"></a>
+<span class="sourceLineNo">682</span>   * Returns the block cache or 
&lt;code&gt;null&lt;/code&gt; in case none should be used.<a 
name="line.682"></a>
+<span class="sourceLineNo">683</span>   * Sets GLOBAL_BLOCK_CACHE_INSTANCE<a 
name="line.683"></a>
+<span class="sourceLineNo">684</span>   *<a name="line.684"></a>
+<span class="sourceLineNo">685</span>   * @param conf  The current 
configuration.<a name="line.685"></a>
+<span class="sourceLineNo">686</span>   * @return The block cache or 
&lt;code&gt;null&lt;/code&gt;.<a name="line.686"></a>
+<span class="sourceLineNo">687</span>   */<a name="line.687"></a>
+<span class="sourceLineNo">688</span>  public static synchronized BlockCache 
instantiateBlockCache(Configuration conf) {<a name="line.688"></a>
+<span class="sourceLineNo">689</span>    if (GLOBAL_BLOCK_CACHE_INSTANCE != 
null) return GLOBAL_BLOCK_CACHE_INSTANCE;<a name="line.689"></a>
+<span class="sourceLineNo">690</span>    if (blockCacheDisabled) return 
null;<a name="line.690"></a>
+<span class="sourceLineNo">691</span>    LruBlockCache l1 = 
getL1Internal(conf);<a name="line.691"></a>
+<span class="sourceLineNo">692</span>    // blockCacheDisabled is set as a 
side-effect of getL1Internal(), so check it again after the call.<a 
name="line.692"></a>
+<span class="sourceLineNo">693</span>    if (blockCacheDisabled) return 
null;<a name="line.693"></a>
+<span class="sourceLineNo">694</span>    BlockCache l2 = getL2(conf);<a 
name="line.694"></a>
+<span class="sourceLineNo">695</span>    if (l2 == null) {<a 
name="line.695"></a>
+<span class="sourceLineNo">696</span>      GLOBAL_BLOCK_CACHE_INSTANCE = l1;<a 
name="line.696"></a>
+<span class="sourceLineNo">697</span>    } else {<a name="line.697"></a>
+<span class="sourceLineNo">698</span>      boolean useExternal = 
conf.getBoolean(EXTERNAL_BLOCKCACHE_KEY, EXTERNAL_BLOCKCACHE_DEFAULT);<a 
name="line.698"></a>
+<span class="sourceLineNo">699</span>      boolean combinedWithLru = 
conf.getBoolean(BUCKET_CACHE_COMBINED_KEY,<a name="line.699"></a>
+<span class="sourceLineNo">700</span>        DEFAULT_BUCKET_CACHE_COMBINED);<a 
name="line.700"></a>
+<span class="sourceLineNo">701</span>      if (useExternal) {<a 
name="line.701"></a>
+<span class="sourceLineNo">702</span>        GLOBAL_BLOCK_CACHE_INSTANCE = new 
InclusiveCombinedBlockCache(l1, l2);<a name="line.702"></a>
+<span class="sourceLineNo">703</span>      } else {<a name="line.703"></a>
+<span class="sourceLineNo">704</span>        if (combinedWithLru) {<a 
name="line.704"></a>
+<span class="sourceLineNo">705</span>          GLOBAL_BLOCK_CACHE_INSTANCE = 
new CombinedBlockCache(l1, l2);<a name="line.705"></a>
+<span class="sourceLineNo">706</span>        } else {<a name="line.706"></a>
+<span class="sourceLineNo">707</span>          // L1 and L2 are not 
'combined'.  They are connected via the LruBlockCache victimhandler<a 
name="line.707"></a>
+<span class="sourceLineNo">708</span>          // mechanism.  It is a little 
ugly but works according to the following: when the<a name="line.708"></a>
+<span class="sourceLineNo">709</span>          // background eviction thread 
runs, blocks evicted from L1 will go to L2 AND when we get<a 
name="line.709"></a>
+<span class="sourceLineNo">710</span>          // a block from the L1 cache, 
if not in L1, we will search L2.<a name="line.710"></a>
+<span class="sourceLineNo">711</span>          GLOBAL_BLOCK_CACHE_INSTANCE = 
l1;<a name="line.711"></a>
+<span class="sourceLineNo">712</span>        }<a name="line.712"></a>
+<span class="sourceLineNo">713</span>      }<a name="line.713"></a>
+<span class="sourceLineNo">714</span>      l1.setVictimCache(l2);<a 
name="line.714"></a>
+<span class="sourceLineNo">715</span>    }<a name="line.715"></a>
+<span class="sourceLineNo">716</span>    return GLOBAL_BLOCK_CACHE_INSTANCE;<a 
name="line.716"></a>
+<span class="sourceLineNo">717</span>  }<a name="line.717"></a>
+<span class="sourceLineNo">718</span><a name="line.718"></a>
+<span class="sourceLineNo">719</span>  // Supposed to use only from tests. 
Some tests want to reinit the Global block cache instance<a name="line.719"></a>
+<span class="sourceLineNo">720</span>  @VisibleForTesting<a 
name="line.720"></a>
+<span class="sourceLineNo">721</span>  static synchronized void 
clearGlobalInstances() {<a name="line.721"></a>
+<span class="sourceLineNo">722</span>    GLOBAL_L1_CACHE_INSTANCE = null;<a 
name="line.722"></a>
+<span class="sourceLineNo">723</span>    GLOBAL_BLOCK_CACHE_INSTANCE = null;<a 
name="line.723"></a>
+<span class="sourceLineNo">724</span>  }<a name="line.724"></a>
+<span class="sourceLineNo">725</span>}<a name="line.725"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9e6e3360/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/ReplicationZKNodeCleaner.ReplicationQueueDeletor.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/ReplicationZKNodeCleaner.ReplicationQueueDeletor.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/ReplicationZKNodeCleaner.ReplicationQueueDeletor.html
index f0e8759..3d2ce7e 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/ReplicationZKNodeCleaner.ReplicationQueueDeletor.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/ReplicationZKNodeCleaner.ReplicationQueueDeletor.html
@@ -85,129 +85,132 @@
 <span class="sourceLineNo">077</span>    Set&lt;String&gt; peerIds = new 
HashSet&lt;&gt;(this.replicationPeers.getAllPeerIds());<a name="line.77"></a>
 <span class="sourceLineNo">078</span>    try {<a name="line.78"></a>
 <span class="sourceLineNo">079</span>      List&lt;String&gt; replicators = 
this.queuesClient.getListOfReplicators();<a name="line.79"></a>
-<span class="sourceLineNo">080</span>      for (String replicator : 
replicators) {<a name="line.80"></a>
-<span class="sourceLineNo">081</span>        List&lt;String&gt; queueIds = 
this.queuesClient.getAllQueues(replicator);<a name="line.81"></a>
-<span class="sourceLineNo">082</span>        for (String queueId : queueIds) 
{<a name="line.82"></a>
-<span class="sourceLineNo">083</span>          ReplicationQueueInfo queueInfo 
= new ReplicationQueueInfo(queueId);<a name="line.83"></a>
-<span class="sourceLineNo">084</span>          if 
(!peerIds.contains(queueInfo.getPeerId())) {<a name="line.84"></a>
-<span class="sourceLineNo">085</span>            
undeletedQueues.computeIfAbsent(replicator, (key) -&gt; new 
ArrayList&lt;&gt;()).add(<a name="line.85"></a>
-<span class="sourceLineNo">086</span>              queueId);<a 
name="line.86"></a>
-<span class="sourceLineNo">087</span>            if (LOG.isDebugEnabled()) {<a 
name="line.87"></a>
-<span class="sourceLineNo">088</span>              LOG.debug("Undeleted 
replication queue for removed peer found: "<a name="line.88"></a>
-<span class="sourceLineNo">089</span>                  + 
String.format("[removedPeerId=%s, replicator=%s, queueId=%s]",<a 
name="line.89"></a>
-<span class="sourceLineNo">090</span>                    
queueInfo.getPeerId(), replicator, queueId));<a name="line.90"></a>
-<span class="sourceLineNo">091</span>            }<a name="line.91"></a>
-<span class="sourceLineNo">092</span>          }<a name="line.92"></a>
-<span class="sourceLineNo">093</span>        }<a name="line.93"></a>
-<span class="sourceLineNo">094</span>      }<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    } catch (KeeperException ke) {<a 
name="line.95"></a>
-<span class="sourceLineNo">096</span>      throw new IOException("Failed to 
get the replication queues of all replicators", ke);<a name="line.96"></a>
-<span class="sourceLineNo">097</span>    }<a name="line.97"></a>
-<span class="sourceLineNo">098</span>    return undeletedQueues;<a 
name="line.98"></a>
-<span class="sourceLineNo">099</span>  }<a name="line.99"></a>
-<span class="sourceLineNo">100</span><a name="line.100"></a>
-<span class="sourceLineNo">101</span>  /**<a name="line.101"></a>
-<span class="sourceLineNo">102</span>   * @return undeletedHFileRefsQueue 
replicator with its undeleted queueIds for removed peers in<a 
name="line.102"></a>
-<span class="sourceLineNo">103</span>   *         hfile-refs queue<a 
name="line.103"></a>
-<span class="sourceLineNo">104</span>   * @throws IOException<a 
name="line.104"></a>
-<span class="sourceLineNo">105</span>   */<a name="line.105"></a>
-<span class="sourceLineNo">106</span>  public Set&lt;String&gt; 
getUnDeletedHFileRefsQueues() throws IOException {<a name="line.106"></a>
-<span class="sourceLineNo">107</span>    Set&lt;String&gt; 
undeletedHFileRefsQueue = new HashSet&lt;&gt;();<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    Set&lt;String&gt; peerIds = new 
HashSet&lt;&gt;(this.replicationPeers.getAllPeerIds());<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    String hfileRefsZNode = 
queueDeletor.getHfileRefsZNode();<a name="line.109"></a>
-<span class="sourceLineNo">110</span>    try {<a name="line.110"></a>
-<span class="sourceLineNo">111</span>      if (-1 == ZKUtil.checkExists(zkw, 
hfileRefsZNode)) {<a name="line.111"></a>
-<span class="sourceLineNo">112</span>        return null;<a 
name="line.112"></a>
-<span class="sourceLineNo">113</span>      }<a name="line.113"></a>
-<span class="sourceLineNo">114</span>      List&lt;String&gt; listOfPeers = 
this.queuesClient.getAllPeersFromHFileRefsQueue();<a name="line.114"></a>
-<span class="sourceLineNo">115</span>      Set&lt;String&gt; peers = new 
HashSet&lt;&gt;(listOfPeers);<a name="line.115"></a>
-<span class="sourceLineNo">116</span>      peers.removeAll(peerIds);<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>      if (!peers.isEmpty()) {<a 
name="line.117"></a>
-<span class="sourceLineNo">118</span>        
undeletedHFileRefsQueue.addAll(peers);<a name="line.118"></a>
-<span class="sourceLineNo">119</span>      }<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    } catch (KeeperException e) {<a 
name="line.120"></a>
-<span class="sourceLineNo">121</span>      throw new IOException("Failed to 
get list of all peers from hfile-refs znode "<a name="line.121"></a>
-<span class="sourceLineNo">122</span>          + hfileRefsZNode, e);<a 
name="line.122"></a>
-<span class="sourceLineNo">123</span>    }<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    return undeletedHFileRefsQueue;<a 
name="line.124"></a>
-<span class="sourceLineNo">125</span>  }<a name="line.125"></a>
-<span class="sourceLineNo">126</span><a name="line.126"></a>
-<span class="sourceLineNo">127</span>  private class ReplicationQueueDeletor 
extends ReplicationStateZKBase {<a name="line.127"></a>
-<span class="sourceLineNo">128</span><a name="line.128"></a>
-<span class="sourceLineNo">129</span>    public 
ReplicationQueueDeletor(ZooKeeperWatcher zk, Configuration conf, Abortable 
abortable) {<a name="line.129"></a>
-<span class="sourceLineNo">130</span>      super(zk, conf, abortable);<a 
name="line.130"></a>
-<span class="sourceLineNo">131</span>    }<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span>    /**<a name="line.133"></a>
-<span class="sourceLineNo">134</span>     * @param replicator The regionserver 
which has undeleted queue<a name="line.134"></a>
-<span class="sourceLineNo">135</span>     * @param queueId The undeleted queue 
id<a name="line.135"></a>
-<span class="sourceLineNo">136</span>     * @throws IOException<a 
name="line.136"></a>
-<span class="sourceLineNo">137</span>     */<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    public void removeQueue(final String 
replicator, final String queueId) throws IOException {<a name="line.138"></a>
-<span class="sourceLineNo">139</span>      String queueZnodePath = 
ZKUtil.joinZNode(ZKUtil.joinZNode(this.queuesZNode, replicator),<a 
name="line.139"></a>
-<span class="sourceLineNo">140</span>        queueId);<a name="line.140"></a>
-<span class="sourceLineNo">141</span>      try {<a name="line.141"></a>
-<span class="sourceLineNo">142</span>        ReplicationQueueInfo queueInfo = 
new ReplicationQueueInfo(queueId);<a name="line.142"></a>
-<span class="sourceLineNo">143</span>        if 
(!replicationPeers.getAllPeerIds().contains(queueInfo.getPeerId())) {<a 
name="line.143"></a>
-<span class="sourceLineNo">144</span>          
ZKUtil.deleteNodeRecursively(this.zookeeper, queueZnodePath);<a 
name="line.144"></a>
-<span class="sourceLineNo">145</span>          LOG.info("Successfully removed 
replication queue, replicator: " + replicator<a name="line.145"></a>
-<span class="sourceLineNo">146</span>              + ", queueId: " + 
queueId);<a name="line.146"></a>
-<span class="sourceLineNo">147</span>        }<a name="line.147"></a>
-<span class="sourceLineNo">148</span>      } catch (KeeperException e) {<a 
name="line.148"></a>
-<span class="sourceLineNo">149</span>        throw new IOException("Failed to 
delete queue, replicator: " + replicator + ", queueId: "<a name="line.149"></a>
-<span class="sourceLineNo">150</span>            + queueId);<a 
name="line.150"></a>
-<span class="sourceLineNo">151</span>      }<a name="line.151"></a>
-<span class="sourceLineNo">152</span>    }<a name="line.152"></a>
-<span class="sourceLineNo">153</span><a name="line.153"></a>
-<span class="sourceLineNo">154</span>    /**<a name="line.154"></a>
-<span class="sourceLineNo">155</span>     * @param hfileRefsQueueId The 
undeleted hfile-refs queue id<a name="line.155"></a>
-<span class="sourceLineNo">156</span>     * @throws IOException<a 
name="line.156"></a>
-<span class="sourceLineNo">157</span>     */<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    public void 
removeHFileRefsQueue(final String hfileRefsQueueId) throws IOException {<a 
name="line.158"></a>
-<span class="sourceLineNo">159</span>      String node = 
ZKUtil.joinZNode(this.hfileRefsZNode, hfileRefsQueueId);<a name="line.159"></a>
-<span class="sourceLineNo">160</span>      try {<a name="line.160"></a>
-<span class="sourceLineNo">161</span>        if 
(!replicationPeers.getAllPeerIds().contains(hfileRefsQueueId)) {<a 
name="line.161"></a>
-<span class="sourceLineNo">162</span>          
ZKUtil.deleteNodeRecursively(this.zookeeper, node);<a name="line.162"></a>
-<span class="sourceLineNo">163</span>          LOG.info("Successfully removed 
hfile-refs queue " + hfileRefsQueueId + " from path "<a name="line.163"></a>
-<span class="sourceLineNo">164</span>              + hfileRefsZNode);<a 
name="line.164"></a>
-<span class="sourceLineNo">165</span>        }<a name="line.165"></a>
-<span class="sourceLineNo">166</span>      } catch (KeeperException e) {<a 
name="line.166"></a>
-<span class="sourceLineNo">167</span>        throw new IOException("Failed to 
delete hfile-refs queue " + hfileRefsQueueId<a name="line.167"></a>
-<span class="sourceLineNo">168</span>            + " from path " + 
hfileRefsZNode);<a name="line.168"></a>
-<span class="sourceLineNo">169</span>      }<a name="line.169"></a>
-<span class="sourceLineNo">170</span>    }<a name="line.170"></a>
-<span class="sourceLineNo">171</span><a name="line.171"></a>
-<span class="sourceLineNo">172</span>    String getHfileRefsZNode() {<a 
name="line.172"></a>
-<span class="sourceLineNo">173</span>      return this.hfileRefsZNode;<a 
name="line.173"></a>
-<span class="sourceLineNo">174</span>    }<a name="line.174"></a>
-<span class="sourceLineNo">175</span>  }<a name="line.175"></a>
-<span class="sourceLineNo">176</span><a name="line.176"></a>
-<span class="sourceLineNo">177</span>  /**<a name="line.177"></a>
-<span class="sourceLineNo">178</span>   * Remove the undeleted replication 
queue's zk node for removed peers.<a name="line.178"></a>
-<span class="sourceLineNo">179</span>   * @param undeletedQueues replicator 
with its queueIds for removed peers<a name="line.179"></a>
-<span class="sourceLineNo">180</span>   * @throws IOException<a 
name="line.180"></a>
-<span class="sourceLineNo">181</span>   */<a name="line.181"></a>
-<span class="sourceLineNo">182</span>  public void removeQueues(final 
Map&lt;String, List&lt;String&gt;&gt; undeletedQueues) throws IOException {<a 
name="line.182"></a>
-<span class="sourceLineNo">183</span>    for (Entry&lt;String, 
List&lt;String&gt;&gt; replicatorAndQueueIds : undeletedQueues.entrySet()) {<a 
name="line.183"></a>
-<span class="sourceLineNo">184</span>      String replicator = 
replicatorAndQueueIds.getKey();<a name="line.184"></a>
-<span class="sourceLineNo">185</span>      for (String queueId : 
replicatorAndQueueIds.getValue()) {<a name="line.185"></a>
-<span class="sourceLineNo">186</span>        
queueDeletor.removeQueue(replicator, queueId);<a name="line.186"></a>
-<span class="sourceLineNo">187</span>      }<a name="line.187"></a>
-<span class="sourceLineNo">188</span>    }<a name="line.188"></a>
-<span class="sourceLineNo">189</span>  }<a name="line.189"></a>
-<span class="sourceLineNo">190</span><a name="line.190"></a>
-<span class="sourceLineNo">191</span>  /**<a name="line.191"></a>
-<span class="sourceLineNo">192</span>   * Remove the undeleted hfile-refs 
queue's zk node for removed peers.<a name="line.192"></a>
-<span class="sourceLineNo">193</span>   * @param undeletedHFileRefsQueues 
replicator with its undeleted queueIds for removed peers in<a 
name="line.193"></a>
-<span class="sourceLineNo">194</span>   *          hfile-refs queue<a 
name="line.194"></a>
-<span class="sourceLineNo">195</span>   * @throws IOException<a 
name="line.195"></a>
-<span class="sourceLineNo">196</span>   */<a name="line.196"></a>
-<span class="sourceLineNo">197</span>  public void removeHFileRefsQueues(final 
Set&lt;String&gt; undeletedHFileRefsQueues) throws IOException {<a 
name="line.197"></a>
-<span class="sourceLineNo">198</span>    for (String hfileRefsQueueId : 
undeletedHFileRefsQueues) {<a name="line.198"></a>
-<span class="sourceLineNo">199</span>      
queueDeletor.removeHFileRefsQueue(hfileRefsQueueId);<a name="line.199"></a>
-<span class="sourceLineNo">200</span>    }<a name="line.200"></a>
-<span class="sourceLineNo">201</span>  }<a name="line.201"></a>
-<span class="sourceLineNo">202</span>}<a name="line.202"></a>
+<span class="sourceLineNo">080</span>      if (replicators == null || 
replicators.isEmpty()) {<a name="line.80"></a>
+<span class="sourceLineNo">081</span>        return undeletedQueues;<a 
name="line.81"></a>
+<span class="sourceLineNo">082</span>      }<a name="line.82"></a>
+<span class="sourceLineNo">083</span>      for (String replicator : 
replicators) {<a name="line.83"></a>
+<span class="sourceLineNo">084</span>        List&lt;String&gt; queueIds = 
this.queuesClient.getAllQueues(replicator);<a name="line.84"></a>
+<span class="sourceLineNo">085</span>        for (String queueId : queueIds) 
{<a name="line.85"></a>
+<span class="sourceLineNo">086</span>          ReplicationQueueInfo queueInfo 
= new ReplicationQueueInfo(queueId);<a name="line.86"></a>
+<span class="sourceLineNo">087</span>          if 
(!peerIds.contains(queueInfo.getPeerId())) {<a name="line.87"></a>
+<span class="sourceLineNo">088</span>            
undeletedQueues.computeIfAbsent(replicator, (key) -&gt; new 
ArrayList&lt;&gt;()).add(<a name="line.88"></a>
+<span class="sourceLineNo">089</span>              queueId);<a 
name="line.89"></a>
+<span class="sourceLineNo">090</span>            if (LOG.isDebugEnabled()) {<a 
name="line.90"></a>
+<span class="sourceLineNo">091</span>              LOG.debug("Undeleted 
replication queue for removed peer found: "<a name="line.91"></a>
+<span class="sourceLineNo">092</span>                  + 
String.format("[removedPeerId=%s, replicator=%s, queueId=%s]",<a 
name="line.92"></a>
+<span class="sourceLineNo">093</span>                    
queueInfo.getPeerId(), replicator, queueId));<a name="line.93"></a>
+<span class="sourceLineNo">094</span>            }<a name="line.94"></a>
+<span class="sourceLineNo">095</span>          }<a name="line.95"></a>
+<span class="sourceLineNo">096</span>        }<a name="line.96"></a>
+<span class="sourceLineNo">097</span>      }<a name="line.97"></a>
+<span class="sourceLineNo">098</span>    } catch (KeeperException ke) {<a 
name="line.98"></a>
+<span class="sourceLineNo">099</span>      throw new IOException("Failed to 
get the replication queues of all replicators", ke);<a name="line.99"></a>
+<span class="sourceLineNo">100</span>    }<a name="line.100"></a>
+<span class="sourceLineNo">101</span>    return undeletedQueues;<a 
name="line.101"></a>
+<span class="sourceLineNo">102</span>  }<a name="line.102"></a>
+<span class="sourceLineNo">103</span><a name="line.103"></a>
+<span class="sourceLineNo">104</span>  /**<a name="line.104"></a>
+<span class="sourceLineNo">105</span>   * @return undeletedHFileRefsQueue 
replicator with its undeleted queueIds for removed peers in<a 
name="line.105"></a>
+<span class="sourceLineNo">106</span>   *         hfile-refs queue<a 
name="line.106"></a>
+<span class="sourceLineNo">107</span>   * @throws IOException<a 
name="line.107"></a>
+<span class="sourceLineNo">108</span>   */<a name="line.108"></a>
+<span class="sourceLineNo">109</span>  public Set&lt;String&gt; 
getUnDeletedHFileRefsQueues() throws IOException {<a name="line.109"></a>
+<span class="sourceLineNo">110</span>    Set&lt;String&gt; 
undeletedHFileRefsQueue = new HashSet&lt;&gt;();<a name="line.110"></a>
+<span class="sourceLineNo">111</span>    Set&lt;String&gt; peerIds = new 
HashSet&lt;&gt;(this.replicationPeers.getAllPeerIds());<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    String hfileRefsZNode = 
queueDeletor.getHfileRefsZNode();<a name="line.112"></a>
+<span class="sourceLineNo">113</span>    try {<a name="line.113"></a>
+<span class="sourceLineNo">114</span>      if (-1 == ZKUtil.checkExists(zkw, 
hfileRefsZNode)) {<a name="line.114"></a>
+<span class="sourceLineNo">115</span>        return null;<a 
name="line.115"></a>
+<span class="sourceLineNo">116</span>      }<a name="line.116"></a>
+<span class="sourceLineNo">117</span>      List&lt;String&gt; listOfPeers = 
this.queuesClient.getAllPeersFromHFileRefsQueue();<a name="line.117"></a>
+<span class="sourceLineNo">118</span>      Set&lt;String&gt; peers = new 
HashSet&lt;&gt;(listOfPeers);<a name="line.118"></a>
+<span class="sourceLineNo">119</span>      peers.removeAll(peerIds);<a 
name="line.119"></a>
+<span class="sourceLineNo">120</span>      if (!peers.isEmpty()) {<a 
name="line.120"></a>
+<span class="sourceLineNo">121</span>        
undeletedHFileRefsQueue.addAll(peers);<a name="line.121"></a>
+<span class="sourceLineNo">122</span>      }<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    } catch (KeeperException e) {<a 
name="line.123"></a>
+<span class="sourceLineNo">124</span>      throw new IOException("Failed to 
get list of all peers from hfile-refs znode "<a name="line.124"></a>
+<span class="sourceLineNo">125</span>          + hfileRefsZNode, e);<a 
name="line.125"></a>
+<span class="sourceLineNo">126</span>    }<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    return undeletedHFileRefsQueue;<a 
name="line.127"></a>
+<span class="sourceLineNo">128</span>  }<a name="line.128"></a>
+<span class="sourceLineNo">129</span><a name="line.129"></a>
+<span class="sourceLineNo">130</span>  private class ReplicationQueueDeletor 
extends ReplicationStateZKBase {<a name="line.130"></a>
+<span class="sourceLineNo">131</span><a name="line.131"></a>
+<span class="sourceLineNo">132</span>    public 
ReplicationQueueDeletor(ZooKeeperWatcher zk, Configuration conf, Abortable 
abortable) {<a name="line.132"></a>
+<span class="sourceLineNo">133</span>      super(zk, conf, abortable);<a 
name="line.133"></a>
+<span class="sourceLineNo">134</span>    }<a name="line.134"></a>
+<span class="sourceLineNo">135</span><a name="line.135"></a>
+<span class="sourceLineNo">136</span>    /**<a name="line.136"></a>
+<span class="sourceLineNo">137</span>     * @param replicator The regionserver 
which has undeleted queue<a name="line.137"></a>
+<span class="sourceLineNo">138</span>     * @param queueId The undeleted queue 
id<a name="line.138"></a>
+<span class="sourceLineNo">139</span>     * @throws IOException<a 
name="line.139"></a>
+<span class="sourceLineNo">140</span>     */<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    public void removeQueue(final String 
replicator, final String queueId) throws IOException {<a name="line.141"></a>
+<span class="sourceLineNo">142</span>      String queueZnodePath = 
ZKUtil.joinZNode(ZKUtil.joinZNode(this.queuesZNode, replicator),<a 
name="line.142"></a>
+<span class="sourceLineNo">143</span>        queueId);<a name="line.143"></a>
+<span class="sourceLineNo">144</span>      try {<a name="line.144"></a>
+<span class="sourceLineNo">145</span>        ReplicationQueueInfo queueInfo = 
new ReplicationQueueInfo(queueId);<a name="line.145"></a>
+<span class="sourceLineNo">146</span>        if 
(!replicationPeers.getAllPeerIds().contains(queueInfo.getPeerId())) {<a 
name="line.146"></a>
+<span class="sourceLineNo">147</span>          
ZKUtil.deleteNodeRecursively(this.zookeeper, queueZnodePath);<a 
name="line.147"></a>
+<span class="sourceLineNo">148</span>          LOG.info("Successfully removed 
replication queue, replicator: " + replicator<a name="line.148"></a>
+<span class="sourceLineNo">149</span>              + ", queueId: " + 
queueId);<a name="line.149"></a>
+<span class="sourceLineNo">150</span>        }<a name="line.150"></a>
+<span class="sourceLineNo">151</span>      } catch (KeeperException e) {<a 
name="line.151"></a>
+<span class="sourceLineNo">152</span>        throw new IOException("Failed to 
delete queue, replicator: " + replicator + ", queueId: "<a name="line.152"></a>
+<span class="sourceLineNo">153</span>            + queueId);<a 
name="line.153"></a>
+<span class="sourceLineNo">154</span>      }<a name="line.154"></a>
+<span class="sourceLineNo">155</span>    }<a name="line.155"></a>
+<span class="sourceLineNo">156</span><a name="line.156"></a>
+<span class="sourceLineNo">157</span>    /**<a name="line.157"></a>
+<span class="sourceLineNo">158</span>     * @param hfileRefsQueueId The 
undeleted hfile-refs queue id<a name="line.158"></a>
+<span class="sourceLineNo">159</span>     * @throws IOException<a 
name="line.159"></a>
+<span class="sourceLineNo">160</span>     */<a name="line.160"></a>
+<span class="sourceLineNo">161</span>    public void 
removeHFileRefsQueue(final String hfileRefsQueueId) throws IOException {<a 
name="line.161"></a>
+<span class="sourceLineNo">162</span>      String node = 
ZKUtil.joinZNode(this.hfileRefsZNode, hfileRefsQueueId);<a name="line.162"></a>
+<span class="sourceLineNo">163</span>      try {<a name="line.163"></a>
+<span class="sourceLineNo">164</span>        if 
(!replicationPeers.getAllPeerIds().contains(hfileRefsQueueId)) {<a 
name="line.164"></a>
+<span class="sourceLineNo">165</span>          
ZKUtil.deleteNodeRecursively(this.zookeeper, node);<a name="line.165"></a>
+<span class="sourceLineNo">166</span>          LOG.info("Successfully removed 
hfile-refs queue " + hfileRefsQueueId + " from path "<a name="line.166"></a>
+<span class="sourceLineNo">167</span>              + hfileRefsZNode);<a 
name="line.167"></a>
+<span class="sourceLineNo">168</span>        }<a name="line.168"></a>
+<span class="sourceLineNo">169</span>      } catch (KeeperException e) {<a 
name="line.169"></a>
+<span class="sourceLineNo">170</span>        throw new IOException("Failed to 
delete hfile-refs queue " + hfileRefsQueueId<a name="line.170"></a>
+<span class="sourceLineNo">171</span>            + " from path " + 
hfileRefsZNode);<a name="line.171"></a>
+<span class="sourceLineNo">172</span>      }<a name="line.172"></a>
+<span class="sourceLineNo">173</span>    }<a name="line.173"></a>
+<span class="sourceLineNo">174</span><a name="line.174"></a>
+<span class="sourceLineNo">175</span>    String getHfileRefsZNode() {<a 
name="line.175"></a>
+<span class="sourceLineNo">176</span>      return this.hfileRefsZNode;<a 
name="line.176"></a>
+<span class="sourceLineNo">177</span>    }<a name="line.177"></a>
+<span class="sourceLineNo">178</span>  }<a name="line.178"></a>
+<span class="sourceLineNo">179</span><a name="line.179"></a>
+<span class="sourceLineNo">180</span>  /**<a name="line.180"></a>
+<span class="sourceLineNo">181</span>   * Remove the undeleted replication 
queue's zk node for removed peers.<a name="line.181"></a>
+<span class="sourceLineNo">182</span>   * @param undeletedQueues replicator 
with its queueIds for removed peers<a name="line.182"></a>
+<span class="sourceLineNo">183</span>   * @throws IOException<a 
name="line.183"></a>
+<span class="sourceLineNo">184</span>   */<a name="line.184"></a>
+<span class="sourceLineNo">185</span>  public void removeQueues(final 
Map&lt;String, List&lt;String&gt;&gt; undeletedQueues) throws IOException {<a 
name="line.185"></a>
+<span class="sourceLineNo">186</span>    for (Entry&lt;String, 
List&lt;String&gt;&gt; replicatorAndQueueIds : undeletedQueues.entrySet()) {<a 
name="line.186"></a>
+<span class="sourceLineNo">187</span>      String replicator = 
replicatorAndQueueIds.getKey();<a name="line.187"></a>
+<span class="sourceLineNo">188</span>      for (String queueId : 
replicatorAndQueueIds.getValue()) {<a name="line.188"></a>
+<span class="sourceLineNo">189</span>        
queueDeletor.removeQueue(replicator, queueId);<a name="line.189"></a>
+<span class="sourceLineNo">190</span>      }<a name="line.190"></a>
+<span class="sourceLineNo">191</span>    }<a name="line.191"></a>
+<span class="sourceLineNo">192</span>  }<a name="line.192"></a>
+<span class="sourceLineNo">193</span><a name="line.193"></a>
+<span class="sourceLineNo">194</span>  /**<a name="line.194"></a>
+<span class="sourceLineNo">195</span>   * Remove the undeleted hfile-refs 
queue's zk node for removed peers.<a name="line.195"></a>
+<span class="sourceLineNo">196</span>   * @param undeletedHFileRefsQueues 
replicator with its undeleted queueIds for removed peers in<a 
name="line.196"></a>
+<span class="sourceLineNo">197</span>   *          hfile-refs queue<a 
name="line.197"></a>
+<span class="sourceLineNo">198</span>   * @throws IOException<a 
name="line.198"></a>
+<span class="sourceLineNo">199</span>   */<a name="line.199"></a>
+<span class="sourceLineNo">200</span>  public void removeHFileRefsQueues(final 
Set&lt;String&gt; undeletedHFileRefsQueues) throws IOException {<a 
name="line.200"></a>
+<span class="sourceLineNo">201</span>    for (String hfileRefsQueueId : 
undeletedHFileRefsQueues) {<a name="line.201"></a>
+<span class="sourceLineNo">202</span>      
queueDeletor.removeHFileRefsQueue(hfileRefsQueueId);<a name="line.202"></a>
+<span class="sourceLineNo">203</span>    }<a name="line.203"></a>
+<span class="sourceLineNo">204</span>  }<a name="line.204"></a>
+<span class="sourceLineNo">205</span>}<a name="line.205"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9e6e3360/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/ReplicationZKNodeCleaner.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/ReplicationZKNodeCleaner.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/ReplicationZKNodeCleaner.html
index f0e8759..3d2ce7e 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/ReplicationZKNodeCleaner.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/ReplicationZKNodeCleaner.html
@@ -85,129 +85,132 @@
 <span class="sourceLineNo">077</span>    Set&lt;String&gt; peerIds = new 
HashSet&lt;&gt;(this.replicationPeers.getAllPeerIds());<a name="line.77"></a>
 <span class="sourceLineNo">078</span>    try {<a name="line.78"></a>
 <span class="sourceLineNo">079</span>      List&lt;String&gt; replicators = 
this.queuesClient.getListOfReplicators();<a name="line.79"></a>
-<span class="sourceLineNo">080</span>      for (String replicator : 
replicators) {<a name="line.80"></a>
-<span class="sourceLineNo">081</span>        List&lt;String&gt; queueIds = 
this.queuesClient.getAllQueues(replicator);<a name="line.81"></a>
-<span class="sourceLineNo">082</span>        for (String queueId : queueIds) 
{<a name="line.82"></a>
-<span class="sourceLineNo">083</span>          ReplicationQueueInfo queueInfo 
= new ReplicationQueueInfo(queueId);<a name="line.83"></a>
-<span class="sourceLineNo">084</span>          if 
(!peerIds.contains(queueInfo.getPeerId())) {<a name="line.84"></a>
-<span class="sourceLineNo">085</span>            
undeletedQueues.computeIfAbsent(replicator, (key) -&gt; new 
ArrayList&lt;&gt;()).add(<a name="line.85"></a>
-<span class="sourceLineNo">086</span>              queueId);<a 
name="line.86"></a>
-<span class="sourceLineNo">087</span>            if (LOG.isDebugEnabled()) {<a 
name="line.87"></a>
-<span class="sourceLineNo">088</span>              LOG.debug("Undeleted 
replication queue for removed peer found: "<a name="line.88"></a>
-<span class="sourceLineNo">089</span>                  + 
String.format("[removedPeerId=%s, replicator=%s, queueId=%s]",<a 
name="line.89"></a>
-<span class="sourceLineNo">090</span>                    
queueInfo.getPeerId(), replicator, queueId));<a name="line.90"></a>
-<span class="sourceLineNo">091</span>            }<a name="line.91"></a>
-<span class="sourceLineNo">092</span>          }<a name="line.92"></a>
-<span class="sourceLineNo">093</span>        }<a name="line.93"></a>
-<span class="sourceLineNo">094</span>      }<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    } catch (KeeperException ke) {<a 
name="line.95"></a>
-<span class="sourceLineNo">096</span>      throw new IOException("Failed to 
get the replication queues of all replicators", ke);<a name="line.96"></a>
-<span class="sourceLineNo">097</span>    }<a name="line.97"></a>
-<span class="sourceLineNo">098</span>    return undeletedQueues;<a 
name="line.98"></a>
-<span class="sourceLineNo">099</span>  }<a name="line.99"></a>
-<span class="sourceLineNo">100</span><a name="line.100"></a>
-<span class="sourceLineNo">101</span>  /**<a name="line.101"></a>
-<span class="sourceLineNo">102</span>   * @return undeletedHFileRefsQueue 
replicator with its undeleted queueIds for removed peers in<a 
name="line.102"></a>
-<span class="sourceLineNo">103</span>   *         hfile-refs queue<a 
name="line.103"></a>
-<span class="sourceLineNo">104</span>   * @throws IOException<a 
name="line.104"></a>
-<span class="sourceLineNo">105</span>   */<a name="line.105"></a>
-<span class="sourceLineNo">106</span>  public Set&lt;String&gt; 
getUnDeletedHFileRefsQueues() throws IOException {<a name="line.106"></a>
-<span class="sourceLineNo">107</span>    Set&lt;String&gt; 
undeletedHFileRefsQueue = new HashSet&lt;&gt;();<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    Set&lt;String&gt; peerIds = new 
HashSet&lt;&gt;(this.replicationPeers.getAllPeerIds());<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    String hfileRefsZNode = 
queueDeletor.getHfileRefsZNode();<a name="line.109"></a>
-<span class="sourceLineNo">110</span>    try {<a name="line.110"></a>
-<span class="sourceLineNo">111</span>      if (-1 == ZKUtil.checkExists(zkw, 
hfileRefsZNode)) {<a name="line.111"></a>
-<span class="sourceLineNo">112</span>        return null;<a 
name="line.112"></a>
-<span class="sourceLineNo">113</span>      }<a name="line.113"></a>
-<span class="sourceLineNo">114</span>      List&lt;String&gt; listOfPeers = 
this.queuesClient.getAllPeersFromHFileRefsQueue();<a name="line.114"></a>
-<span class="sourceLineNo">115</span>      Set&lt;String&gt; peers = new 
HashSet&lt;&gt;(listOfPeers);<a name="line.115"></a>
-<span class="sourceLineNo">116</span>      peers.removeAll(peerIds);<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>      if (!peers.isEmpty()) {<a 
name="line.117"></a>
-<span class="sourceLineNo">118</span>        
undeletedHFileRefsQueue.addAll(peers);<a name="line.118"></a>
-<span class="sourceLineNo">119</span>      }<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    } catch (KeeperException e) {<a 
name="line.120"></a>
-<span class="sourceLineNo">121</span>      throw new IOException("Failed to 
get list of all peers from hfile-refs znode "<a name="line.121"></a>
-<span class="sourceLineNo">122</span>          + hfileRefsZNode, e);<a 
name="line.122"></a>
-<span class="sourceLineNo">123</span>    }<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    return undeletedHFileRefsQueue;<a 
name="line.124"></a>
-<span class="sourceLineNo">125</span>  }<a name="line.125"></a>
-<span class="sourceLineNo">126</span><a name="line.126"></a>
-<span class="sourceLineNo">127</span>  private class ReplicationQueueDeletor 
extends ReplicationStateZKBase {<a name="line.127"></a>
-<span class="sourceLineNo">128</span><a name="line.128"></a>
-<span class="sourceLineNo">129</span>    public 
ReplicationQueueDeletor(ZooKeeperWatcher zk, Configuration conf, Abortable 
abortable) {<a name="line.129"></a>
-<span class="sourceLineNo">130</span>      super(zk, conf, abortable);<a 
name="line.130"></a>
-<span class="sourceLineNo">131</span>    }<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span>    /**<a name="line.133"></a>
-<span class="sourceLineNo">134</span>     * @param replicator The regionserver 
which has undeleted queue<a name="line.134"></a>
-<span class="sourceLineNo">135</span>     * @param queueId The undeleted queue 
id<a name="line.135"></a>
-<span class="sourceLineNo">136</span>     * @throws IOException<a 
name="line.136"></a>
-<span class="sourceLineNo">137</span>     */<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    public void removeQueue(final String 
replicator, final String queueId) throws IOException {<a name="line.138"></a>
-<span class="sourceLineNo">139</span>      String queueZnodePath = 
ZKUtil.joinZNode(ZKUtil.joinZNode(this.queuesZNode, replicator),<a 
name="line.139"></a>
-<span class="sourceLineNo">140</span>        queueId);<a name="line.140"></a>
-<span class="sourceLineNo">141</span>      try {<a name="line.141"></a>
-<span class="sourceLineNo">142</span>        ReplicationQueueInfo queueInfo = 
new ReplicationQueueInfo(queueId);<a name="line.142"></a>
-<span class="sourceLineNo">143</span>        if 
(!replicationPeers.getAllPeerIds().contains(queueInfo.getPeerId())) {<a 
name="line.143"></a>
-<span class="sourceLineNo">144</span>          
ZKUtil.deleteNodeRecursively(this.zookeeper, queueZnodePath);<a 
name="line.144"></a>
-<span class="sourceLineNo">145</span>          LOG.info("Successfully removed 
replication queue, replicator: " + replicator<a name="line.145"></a>
-<span class="sourceLineNo">146</span>              + ", queueId: " + 
queueId);<a name="line.146"></a>
-<span class="sourceLineNo">147</span>        }<a name="line.147"></a>
-<span class="sourceLineNo">148</span>      } catch (KeeperException e) {<a 
name="line.148"></a>
-<span class="sourceLineNo">149</span>        throw new IOException("Failed to 
delete queue, replicator: " + replicator + ", queueId: "<a name="line.149"></a>
-<span class="sourceLineNo">150</span>            + queueId);<a 
name="line.150"></a>
-<span class="sourceLineNo">151</span>      }<a name="line.151"></a>
-<span class="sourceLineNo">152</span>    }<a name="line.152"></a>
-<span class="sourceLineNo">153</span><a name="line.153"></a>
-<span class="sourceLineNo">154</span>    /**<a name="line.154"></a>
-<span class="sourceLineNo">155</span>     * @param hfileRefsQueueId The 
undeleted hfile-refs queue id<a name="line.155"></a>
-<span class="sourceLineNo">156</span>     * @throws IOException<a 
name="line.156"></a>
-<span class="sourceLineNo">157</span>     */<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    public void 
removeHFileRefsQueue(final String hfileRefsQueueId) throws IOException {<a 
name="line.158"></a>
-<span class="sourceLineNo">159</span>      String node = 
ZKUtil.joinZNode(this.hfileRefsZNode, hfileRefsQueueId);<a name="line.159"></a>
-<span class="sourceLineNo">160</span>      try {<a name="line.160"></a>
-<span class="sourceLineNo">161</span>        if 
(!replicationPeers.getAllPeerIds().contains(hfileRefsQueueId)) {<a 
name="line.161"></a>
-<span class="sourceLineNo">162</span>          
ZKUtil.deleteNodeRecursively(this.zookeeper, node);<a name="line.162"></a>
-<span class="sourceLineNo">163</span>          LOG.info("Successfully removed 
hfile-refs queue " + hfileRefsQueueId + " from path "<a name="line.163"></a>
-<span class="sourceLineNo">164</span>              + hfileRefsZNode);<a 
name="line.164"></a>
-<span class="sourceLineNo">165</span>        }<a name="line.165"></a>
-<span class="sourceLineNo">166</span>      } catch (KeeperException e) {<a 
name="line.166"></a>
-<span class="sourceLineNo">167</span>        throw new IOException("Failed to 
delete hfile-refs queue " + hfileRefsQueueId<a name="line.167"></a>
-<span class="sourceLineNo">168</span>            + " from path " + 
hfileRefsZNode);<a name="line.168"></a>
-<span class="sourceLineNo">169</span>      }<a name="line.169"></a>
-<span class="sourceLineNo">170</span>    }<a name="line.170"></a>
-<span class="sourceLineNo">171</span><a name="line.171"></a>
-<span class="sourceLineNo">172</span>    String getHfileRefsZNode() {<a 
name="line.172"></a>
-<span class="sourceLineNo">173</span>      return this.hfileRefsZNode;<a 
name="line.173"></a>
-<span class="sourceLineNo">174</span>    }<a name="line.174"></a>
-<span class="sourceLineNo">175</span>  }<a name="line.175"></a>
-<span class="sourceLineNo">176</span><a name="line.176"></a>
-<span class="sourceLineNo">177</span>  /**<a name="line.177"></a>
-<span class="sourceLineNo">178</span>   * Remove the undeleted replication 
queue's zk node for removed peers.<a name="line.178"></a>
-<span class="sourceLineNo">179</span>   * @param undeletedQueues replicator 
with its queueIds for removed peers<a name="line.179"></a>
-<span class="sourceLineNo">180</span>   * @throws IOException<a 
name="line.180"></a>
-<span class="sourceLineNo">181</span>   */<a name="line.181"></a>
-<span class="sourceLineNo">182</span>  public void removeQueues(final 
Map&lt;String, List&lt;String&gt;&gt; undeletedQueues) throws IOException {<a 
name="line.182"></a>
-<span class="sourceLineNo">183</span>    for (Entry&lt;String, 
List&lt;String&gt;&gt; replicatorAndQueueIds : undeletedQueues.entrySet()) {<a 
name="line.183"></a>
-<span class="sourceLineNo">184</span>      String replicator = 
replicatorAndQueueIds.getKey();<a name="line.184"></a>
-<span class="sourceLineNo">185</span>      for (String queueId : 
replicatorAndQueueIds.getValue()) {<a name="line.185"></a>
-<span class="sourceLineNo">186</span>        
queueDeletor.removeQueue(replicator, queueId);<a name="line.186"></a>
-<span class="sourceLineNo">187</span>      }<a name="line.187"></a>
-<span class="sourceLineNo">188</span>    }<a name="line.188"></a>
-<span class="sourceLineNo">189</span>  }<a name="line.189"></a>
-<span class="sourceLineNo">190</span><a name="line.190"></a>
-<span class="sourceLineNo">191</span>  /**<a name="line.191"></a>
-<span class="sourceLineNo">192</span>   * Remove the undeleted hfile-refs 
queue's zk node for removed peers.<a name="line.192"></a>
-<span class="sourceLineNo">193</span>   * @param undeletedHFileRefsQueues 
replicator with its undeleted queueIds for removed peers in<a 
name="line.193"></a>
-<span class="sourceLineNo">194</span>   *          hfile-refs queue<a 
name="line.194"></a>
-<span class="sourceLineNo">195</span>   * @throws IOException<a 
name="line.195"></a>
-<span class="sourceLineNo">196</span>   */<a name="line.196"></a>
-<span class="sourceLineNo">197</span>  public void removeHFileRefsQueues(final 
Set&lt;String&gt; undeletedHFileRefsQueues) throws IOException {<a 
name="line.197"></a>
-<span class="sourceLineNo">198</span>    for (String hfileRefsQueueId : 
undeletedHFileRefsQueues) {<a name="line.198"></a>
-<span class="sourceLineNo">199</span>      
queueDeletor.removeHFileRefsQueue(hfileRefsQueueId);<a name="line.199"></a>
-<span class="sourceLineNo">200</span>    }<a name="line.200"></a>
-<span class="sourceLineNo">201</span>  }<a name="line.201"></a>
-<span class="sourceLineNo">202</span>}<a name="line.202"></a>
+<span class="sourceLineNo">080</span>      if (replicators == null || 
replicators.isEmpty()) {<a name="line.80"></a>
+<span class="sourceLineNo">081</span>        return undeletedQueues;<a 
name="line.81"></a>
+<span class="sourceLineNo">082</span>      }<a name="line.82"></a>
+<span class="sourceLineNo">083</span>      for (String replicator : 
replicators) {<a name="line.83"></a>
+<span class="sourceLineNo">084</span>        List&lt;String&gt; queueIds = 
this.queuesClient.getAllQueues(replicator);<a name="line.84"></a>
+<span class="sourceLineNo">085</span>        for (String queueId : queueIds) 
{<a name="line.85"></a>
+<span class="sourceLineNo">086</span>          ReplicationQueueInfo queueInfo 
= new ReplicationQueueInfo(queueId);<a name="line.86"></a>
+<span class="sourceLineNo">087</span>          if 
(!peerIds.contains(queueInfo.getPeerId())) {<a name="line.87"></a>
+<span class="sourceLineNo">088</span>            
undeletedQueues.computeIfAbsent(replicator, (key) -&gt; new 
ArrayList&lt;&gt;()).add(<a name="line.88"></a>
+<span class="sourceLineNo">089</span>              queueId);<a 
name="line.89"></a>
+<span class="sourceLineNo">090</span>            if (LOG.isDebugEnabled()) {<a 
name="line.90"></a>
+<span class="sourceLineNo">091</span>              LOG.debug("Undeleted 
replication queue for removed peer found: "<a name="line.91"></a>
+<span class="sourceLineNo">092</span>                  + 
String.format("[removedPeerId=%s, replicator=%s, queueId=%s]",<a 
name="line.92"></a>
+<span class="sourceLineNo">093</span>                    
queueInfo.getPeerId(), replicator, queueId));<a name="line.93"></a>
+<span class="sourceLineNo">094</span>            }<a name="line.94"></a>
+<span class="sourceLineNo">095</span>          }<a name="line.95"></a>
+<span class="sourceLineNo">096</span>        }<a name="line.96"></a>
+<span class="sourceLineNo">097</span>      }<a name="line.97"></a>
+<span class="sourceLineNo">098</span>    } catch (KeeperException ke) {<a 
name="line.98"></a>
+<span class="sourceLineNo">099</span>      throw new IOException("Failed to 
get the replication queues of all replicators", ke);<a name="line.99"></a>
+<span class="sourceLineNo">100</span>    }<a name="line.100"></a>
+<span class="sourceLineNo">101</span>    return undeletedQueues;<a 
name="line.101"></a>
+<span class="sourceLineNo">102</span>  }<a name="line.102"></a>
+<span class="sourceLineNo">103</span><a name="line.103"></a>
+<span class="sourceLineNo">104</span>  /**<a name="line.104"></a>
+<span class="sourceLineNo">105</span>   * @return undeletedHFileRefsQueue 
replicator with its undeleted queueIds for removed peers in<a 
name="line.105"></a>
+<span class="sourceLineNo">106</span>   *         hfile-refs queue<a 
name="line.106"></a>
+<span class="sourceLineNo">107</span>   * @throws IOException<a 
name="line.107"></a>
+<span class="sourceLineNo">108</span>   */<a name="line.108"></a>
+<span class="sourceLineNo">109</span>  public Set&lt;String&gt; 
getUnDeletedHFileRefsQueues() throws IOException {<a name="line.109"></a>
+<span class="sourceLineNo">110</span>    Set&lt;String&gt; 
undeletedHFileRefsQueue = new HashSet&lt;&gt;();<a name="line.110"></a>
+<span class="sourceLineNo">111</span>    Set&lt;String&gt; peerIds = new 
HashSet&lt;&gt;(this.replicationPeers.getAllPeerIds());<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    String hfileRefsZNode = 
queueDeletor.getHfileRefsZNode();<a name="line.112"></a>
+<span class="sourceLineNo">113</span>    try {<a name="line.113"></a>
+<span class="sourceLineNo">114</span>      if (-1 == ZKUtil.checkExists(zkw, 
hfileRefsZNode)) {<a name="line.114"></a>
+<span class="sourceLineNo">115</span>        return null;<a 
name="line.115"></a>
+<span class="sourceLineNo">116</span>      }<a name="line.116"></a>
+<span class="sourceLineNo">117</span>      List&lt;String&gt; listOfPeers = 
this.queuesClient.getAllPeersFromHFileRefsQueue();<a name="line.117"></a>
+<span class="sourceLineNo">118</span>      Set&lt;String&gt; peers = new 
HashSet&lt;&gt;(listOfPeers);<a name="line.118"></a>
+<span class="sourceLineNo">119</span>      peers.removeAll(peerIds);<a 
name="line.119"></a>
+<span class="sourceLineNo">120</span>      if (!peers.isEmpty()) {<a 
name="line.120"></a>
+<span class="sourceLineNo">121</span>        
undeletedHFileRefsQueue.addAll(peers);<a name="line.121"></a>
+<span class="sourceLineNo">122</span>      }<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    } catch (KeeperException e) {<a 
name="line.123"></a>
+<span class="sourceLineNo">124</span>      throw new IOException("Failed to 
get list of all peers from hfile-refs znode "<a name="line.124"></a>
+<span class="sourceLineNo">125</span>          + hfileRefsZNode, e);<a 
name="line.125"></a>
+<span class="sourceLineNo">126</span>    }<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    return undeletedHFileRefsQueue;<a 
name="line.127"></a>
+<span class="sourceLineNo">128</span>  }<a name="line.128"></a>
+<span class="sourceLineNo">129</span><a name="line.129"></a>
+<span class="sourceLineNo">130</span>  private class ReplicationQueueDeletor 
extends ReplicationStateZKBase {<a name="line.130"></a>
+<span class="sourceLineNo">131</span><a name="line.131"></a>
+<span class="sourceLineNo">132</span>    public 
ReplicationQueueDeletor(ZooKeeperWatcher zk, Configuration conf, Abortable 
abortable) {<a name="line.132"></a>
+<span class="sourceLineNo">133</span>      super(zk, conf, abortable);<a 
name="line.133"></a>
+<span class="sourceLineNo">134</span>    }<a name="line.134"></a>
+<span class="sourceLineNo">135</span><a name="line.135"></a>
+<span class="sourceLineNo">136</span>    /**<a name="line.136"></a>
+<span class="sourceLineNo">137</span>     * @param replicator The regionserver 
which has undeleted queue<a name="line.137"></a>
+<span class="sourceLineNo">138</span>     * @param queueId The undeleted queue 
id<a name="line.138"></a>
+<span class="sourceLineNo">139</span>     * @throws IOException<a 
name="line.139"></a>
+<span class="sourceLineNo">140</span>     */<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    public void removeQueue(final String 
replicator, final String queueId) throws IOException {<a name="line.141"></a>
+<span class="sourceLineNo">142</span>      String queueZnodePath = 
ZKUtil.joinZNode(ZKUtil.joinZNode(this.queuesZNode, replicator),<a 
name="line.142"></a>
+<span class="sourceLineNo">143</span>        queueId);<a name="line.143"></a>
+<span class="sourceLineNo">144</span>      try {<a name="line.144"></a>
+<span class="sourceLineNo">145</span>        ReplicationQueueInfo queueInfo = 
new ReplicationQueueInfo(queueId);<a name="line.145"></a>
+<span class="sourceLineNo">146</span>        if 
(!replicationPeers.getAllPeerIds().contains(queueInfo.getPeerId())) {<a 
name="line.146"></a>
+<span class="sourceLineNo">147</span>          
ZKUtil.deleteNodeRecursively(this.zookeeper, queueZnodePath);<a 
name="line.147"></a>
+<span class="sourceLineNo">148</span>          LOG.info("Successfully removed 
replication queue, replicator: " + replicator<a name="line.148"></a>
+<span class="sourceLineNo">149</span>              + ", queueId: " + 
queueId);<a name="line.149"></a>
+<span class="sourceLineNo">150</span>        }<a name="line.150"></a>
+<span class="sourceLineNo">151</span>      } catch (KeeperException e) {<a 
name="line.151"></a>
+<span class="sourceLineNo">152</span>        throw new IOException("Failed to 
delete queue, replicator: " + replicator + ", queueId: "<a name="line.152"></a>
+<span class="sourceLineNo">153</span>            + queueId);<a 
name="line.153"></a>
+<span class="sourceLineNo">154</span>      }<a name="line.154"></a>
+<span class="sourceLineNo">155</span>    }<a name="line.155"></a>
+<span class="sourceLineNo">156</span><a name="line.156"></a>
+<span class="sourceLineNo">157</span>    /**<a name="line.157"></a>
+<span class="sourceLineNo">158</span>     * @param hfileRefsQueueId The 
undeleted hfile-refs queue id<a name="line.158"></a>
+<span class="sourceLineNo">159</span>     * @throws IOException<a 
name="line.159"></a>
+<span class="sourceLineNo">160</span>     */<a name="line.160"></a>
+<span class="sourceLineNo">161</span>    public void 
removeHFileRefsQueue(final String hfileRefsQueueId) throws IOException {<a 
name="line.161"></a>
+<span class="sourceLineNo">162</span>      String node = 
ZKUtil.joinZNode(this.hfileRefsZNode, hfileRefsQueueId);<a name="line.162"></a>
+<span class="sourceLineNo">163</span>      try {<a name="line.163"></a>
+<span class="sourceLineNo">164</span>        if 
(!replicationPeers.getAllPeerIds().contains(hfileRefsQueueId)) {<a 
name="line.164"></a>
+<span class="sourceLineNo">165</span>          
ZKUtil.deleteNodeRecursively(this.zookeeper, node);<a name="line.165"></a>
+<span class="sourceLineNo">166</span>          LOG.info("Successfully removed 
hfile-refs queue " + hfileRefsQueueId + " from path "<a name="line.166"></a>
+<span class="sourceLineNo">167</span>              + hfileRefsZNode);<a 
name="line.167"></a>
+<span class="sourceLineNo">168</span>        }<a name="line.168"></a>
+<span class="sourceLineNo">169</span>      } catch (KeeperException e) {<a 
name="line.169"></a>
+<span class="sourceLineNo">170</span>        throw new IOException("Failed to 
delete hfile-refs queue " + hfileRefsQueueId<a name="line.170"></a>
+<span class="sourceLineNo">171</span>            + " from path " + 
hfileRefsZNode);<a name="line.171"></a>
+<span class="sourceLineNo">172</span>      }<a name="line.172"></a>
+<span class="sourceLineNo">173</span>    }<a name="line.173"></a>
+<span class="sourceLineNo">174</span><a name="line.174"></a>
+<span class="sourceLineNo">175</span>    String getHfileRefsZNode() {<a 
name="line.175"></a>
+<span class="sourceLineNo">176</span>      return this.hfileRefsZNode;<a 
name="line.176"></a>
+<span class="sourceLineNo">177</span>    }<a name="line.177"></a>
+<span class="sourceLineNo">178</span>  }<a name="line.178"></a>
+<span class="sourceLineNo">179</span><a name="line.179"></a>
+<span class="sourceLineNo">180</span>  /**<a name="line.180"></a>
+<span class="sourceLineNo">181</span>   * Remove the undeleted replication 
queue's zk node for removed peers.<a name="line.181"></a>
+<span class="sourceLineNo">182</span>   * @param undeletedQueues replicator 
with its queueIds for removed peers<a name="line.182"></a>
+<span class="sourceLineNo">183</span>   * @throws IOException<a 
name="line.183"></a>
+<span class="sourceLineNo">184</span>   */<a name="line.184"></a>
+<span class="sourceLineNo">185</span>  public void removeQueues(final 
Map&lt;String, List&lt;String&gt;&gt; undeletedQueues) throws IOException {<a 
name="line.185"></a>
+<span class="sourceLineNo">186</span>    for (Entry&lt;String, 
List&lt;String&gt;&gt; replicatorAndQueueIds : undeletedQueues.entrySet()) {<a 
name="line.186"></a>
+<span class="sourceLineNo">187</span>      String replicator = 
replicatorAndQueueIds.getKey();<a name="line.187"></a>
+<span class="sourceLineNo">188</span>      for (String queueId : 
replicatorAndQueueIds.getValue()) {<a name="line.188"></a>
+<span class="sourceLineNo">189</span>        
queueDeletor.removeQueue(replicator, queueId);<a name="line.189"></a>
+<span class="sourceLineNo">190</span>      }<a name="line.190"></a>
+<span class="sourceLineNo">191</span>    }<a name="line.191"></a>
+<span class="sourceLineNo">192</span>  }<a name="line.192"></a>
+<span class="sourceLineNo">193</span><a name="line.193"></a>
+<span class="sourceLineNo">194</span>  /**<a name="line.194"></a>
+<span class="sourceLineNo">195</span>   * Remove the undeleted hfile-refs 
queue's zk node for removed peers.<a name="line.195"></a>
+<span class="sourceLineNo">196</span>   * @param undeletedHFileRefsQueues 
replicator with its undeleted queueIds for removed peers in<a 
name="line.196"></a>
+<span class="sourceLineNo">197</span>   *          hfile-refs queue<a 
name="line.197"></a>
+<span class="sourceLineNo">198</span>   * @throws IOException<a 
name="line.198"></a>
+<span class="sourceLineNo">199</span>   */<a name="line.199"></a>
+<span class="sourceLineNo">200</span>  public void removeHFileRefsQueues(final 
Set&lt;String&gt; undeletedHFileRefsQueues) throws IOException {<a 
name="line.200"></a>
+<span class="sourceLineNo">201</span>    for (String hfileRefsQueueId : 
undeletedHFileRefsQueues) {<a name="line.201"></a>
+<span class="sourceLineNo">202</span>      
queueDeletor.removeHFileRefsQueue(hfileRefsQueueId);<a name="line.202"></a>
+<span class="sourceLineNo">203</span>    }<a name="line.203"></a>
+<span class="sourceLineNo">204</span>  }<a name="line.204"></a>
+<span class="sourceLineNo">205</span>}<a name="line.205"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9e6e3360/devapidocs/src-html/org/apache/hadoop/hbase/replication/ReplicationPeersZKImpl.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/replication/ReplicationPeersZKImpl.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/replication/ReplicationPeersZKImpl.html
index 5257abe..7a7233b 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/replication/ReplicationPeersZKImpl.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/replication/ReplicationPeersZKImpl.html
@@ -528,27 +528,30 @@
 <span class="sourceLineNo">520</span>    if (queuesClient == null) return;<a 
name="line.520"></a>
 <span class="sourceLineNo">521</span>    try {<a name="line.521"></a>
 <span class="sourceLineNo">522</span>      List&lt;String&gt; replicators = 
queuesClient.getListOfReplicators();<a name="line.522"></a>
-<span class="sourceLineNo">523</span>      for (String replicator : 
replicators) {<a name="line.523"></a>
-<span class="sourceLineNo">524</span>        List&lt;String&gt; queueIds = 
queuesClient.getAllQueues(replicator);<a name="line.524"></a>
-<span class="sourceLineNo">525</span>        for (String queueId : queueIds) 
{<a name="line.525"></a>
-<span class="sourceLineNo">526</span>          ReplicationQueueInfo queueInfo 
= new ReplicationQueueInfo(queueId);<a name="line.526"></a>
-<span class="sourceLineNo">527</span>          if 
(queueInfo.getPeerId().equals(peerId)) {<a name="line.527"></a>
-<span class="sourceLineNo">528</span>            throw new 
ReplicationException("undeleted queue for peerId: " + peerId<a 
name="line.528"></a>
-<span class="sourceLineNo">529</span>                + ", replicator: " + 
replicator + ", queueId: " + queueId);<a name="line.529"></a>
-<span class="sourceLineNo">530</span>          }<a name="line.530"></a>
-<span class="sourceLineNo">531</span>        }<a name="line.531"></a>
-<span class="sourceLineNo">532</span>      }<a name="line.532"></a>
-<span class="sourceLineNo">533</span>      // Check for hfile-refs queue<a 
name="line.533"></a>
-<span class="sourceLineNo">534</span>      if (-1 != 
ZKUtil.checkExists(zookeeper, hfileRefsZNode)<a name="line.534"></a>
-<span class="sourceLineNo">535</span>          &amp;&amp; 
queuesClient.getAllPeersFromHFileRefsQueue().contains(peerId)) {<a 
name="line.535"></a>
-<span class="sourceLineNo">536</span>        throw new 
ReplicationException("Undeleted queue for peerId: " + peerId<a 
name="line.536"></a>
-<span class="sourceLineNo">537</span>            + ", found in hfile-refs node 
path " + hfileRefsZNode);<a name="line.537"></a>
-<span class="sourceLineNo">538</span>      }<a name="line.538"></a>
-<span class="sourceLineNo">539</span>    } catch (KeeperException e) {<a 
name="line.539"></a>
-<span class="sourceLineNo">540</span>      throw new 
ReplicationException("Could not check queues deleted with id=" + peerId, e);<a 
name="line.540"></a>
-<span class="sourceLineNo">541</span>    }<a name="line.541"></a>
-<span class="sourceLineNo">542</span>  }<a name="line.542"></a>
-<span class="sourceLineNo">543</span>}<a name="line.543"></a>
+<span class="sourceLineNo">523</span>      if (replicators == null || 
replicators.isEmpty()) {<a name="line.523"></a>
+<span class="sourceLineNo">524</span>        return;<a name="line.524"></a>
+<span class="sourceLineNo">525</span>      }<a name="line.525"></a>
+<span class="sourceLineNo">526</span>      for (String replicator : 
replicators) {<a name="line.526"></a>
+<span class="sourceLineNo">527</span>        List&lt;String&gt; queueIds = 
queuesClient.getAllQueues(replicator);<a name="line.527"></a>
+<span class="sourceLineNo">528</span>        for (String queueId : queueIds) 
{<a name="line.528"></a>
+<span class="sourceLineNo">529</span>          ReplicationQueueInfo queueInfo 
= new ReplicationQueueInfo(queueId);<a name="line.529"></a>
+<span class="sourceLineNo">530</span>          if 
(queueInfo.getPeerId().equals(peerId)) {<a name="line.530"></a>
+<span class="sourceLineNo">531</span>            throw new 
ReplicationException("undeleted queue for peerId: " + peerId<a 
name="line.531"></a>
+<span class="sourceLineNo">532</span>                + ", replicator: " + 
replicator + ", queueId: " + queueId);<a name="line.532"></a>
+<span class="sourceLineNo">533</span>          }<a name="line.533"></a>
+<span class="sourceLineNo">534</span>        }<a name="line.534"></a>
+<span class="sourceLineNo">535</span>      }<a name="line.535"></a>
+<span class="sourceLineNo">536</span>      // Check for hfile-refs queue<a 
name="line.536"></a>
+<span class="sourceLineNo">537</span>      if (-1 != 
ZKUtil.checkExists(zookeeper, hfileRefsZNode)<a name="line.537"></a>
+<span class="sourceLineNo">538</span>          &amp;&amp; 
queuesClient.getAllPeersFromHFileRefsQueue().contains(peerId)) {<a 
name="line.538"></a>
+<span class="sourceLineNo">539</span>        throw new 
ReplicationException("Undeleted queue for peerId: " + peerId<a 
name="line.539"></a>
+<span class="sourceLineNo">540</span>            + ", found in hfile-refs node 
path " + hfileRefsZNode);<a name="line.540"></a>
+<span class="sourceLineNo">541</span>      }<a name="line.541"></a>
+<span class="sourceLineNo">542</span>    } catch (KeeperException e) {<a 
name="line.542"></a>
+<span class="sourceLineNo">543</span>      throw new 
ReplicationException("Could not check queues deleted with id=" + peerId, e);<a 
name="line.543"></a>
+<span class="sourceLineNo">544</span>    }<a name="line.544"></a>
+<span class="sourceLineNo">545</span>  }<a name="line.545"></a>
+<span class="sourceLineNo">546</span>}<a name="line.546"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/9e6e3360/devapidocs/src-html/org/apache/hadoop/hbase/replication/ReplicationQueuesClientZKImpl.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/replication/ReplicationQueuesClientZKImpl.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/replication/ReplicationQueuesClientZKImpl.html
index 2515c4c..6fe3489 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/replication/ReplicationQueuesClientZKImpl.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/replication/ReplicationQueuesClientZKImpl.html
@@ -106,7 +106,7 @@
 <span class="sourceLineNo">098</span>    for (int retry = 0; ; retry++) {<a 
name="line.98"></a>
 <span class="sourceLineNo">099</span>      int v0 = 
getQueuesZNodeCversion();<a name="line.99"></a>
 <span class="sourceLineNo">100</span>      List&lt;String&gt; rss = 
getListOfReplicators();<a name="line.100"></a>
-<span class="sourceLineNo">101</span>      if (rss == null) {<a 
name="line.101"></a>
+<span class="sourceLineNo">101</span>      if (rss == null || rss.isEmpty()) 
{<a name="line.101"></a>
 <span class="sourceLineNo">102</span>        LOG.debug("Didn't find any region 
server that replicates, won't prevent any deletions.");<a name="line.102"></a>
 <span class="sourceLineNo">103</span>        return ImmutableSet.of();<a 
name="line.103"></a>
 <span class="sourceLineNo">104</span>      }<a name="line.104"></a>

Reply via email to