You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2019/05/14 21:39:27 UTC

[hbase] branch branch-1 updated: HBASE-21784 Dump replication queue should show list of wal files ordered chronologically

This is an automated email from the ASF dual-hosted git repository.

apurtell pushed a commit to branch branch-1
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-1 by this push:
     new 46eb56a  HBASE-21784 Dump replication queue should show list of wal files ordered chronologically
46eb56a is described below

commit 46eb56a51b508188da0e2aba19c45bb28abd5f49
Author: Wellington Chevreuil <we...@ChevreuilWellington-MBP15.local>
AuthorDate: Mon May 13 20:30:01 2019 +0100

    HBASE-21784 Dump replication queue should show list of wal files ordered chronologically
    
    Change-Id: I18c372406290e2b1e2b5503e2c87adcb9bf6fe91
    
    Signed-off-by: Andrew Purtell <ap...@apache.org>
---
 .../hadoop/hbase/replication/regionserver/DumpReplicationQueues.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/DumpReplicationQueues.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/DumpReplicationQueues.java
index 631b6c8..6c78963 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/DumpReplicationQueues.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/DumpReplicationQueues.java
@@ -38,7 +38,6 @@ import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;
 import org.apache.hadoop.util.Tool;
 import org.apache.hadoop.util.ToolRunner;
 import org.apache.zookeeper.KeeperException;
-import org.mortbay.util.IO;
 
 import com.google.common.util.concurrent.AtomicLongMap;
 
@@ -319,6 +318,7 @@ public class DumpReplicationQueues extends Configured implements Tool {
         for (String queueId : queueIds) {
           ReplicationQueueInfo queueInfo = new ReplicationQueueInfo(queueId);
           List<String> wals = queuesClient.getLogsInQueue(regionserver, queueId);
+          Collections.sort(wals);
           if (!peerIds.contains(queueInfo.getPeerId())) {
             deletedQueues.add(regionserver + "/" + queueId);
             sb.append(formatQueue(regionserver, replicationQueues, queueInfo, queueId, wals, true, hdfs));