subject:"hbase git commit\: HBASE\-20378 Provide a hbck option to cleanup replication barrier for a table"

[04/29] hbase git commit: HBASE-20378 Provide a hbck option to cleanup replication barrier for a table

2018-05-04 Thread zhangduo

HBASE-20378 Provide a hbck option to cleanup replication barrier for a table

Signed-off-by: zhangduo 


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/87f5b5f3
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/87f5b5f3
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/87f5b5f3

Branch: refs/heads/HBASE-19064
Commit: 87f5b5f3411d96c31b4cb61b9a57ced22be91d1f
Parents: 6225b4a
Author: jingyuntian 
Authored: Sat Apr 28 11:34:29 2018 +0800
Committer: zhangduo 
Committed: Fri May 4 15:27:33 2018 +0800

--
 .../org/apache/hadoop/hbase/util/HBaseFsck.java | 131 ++--
 .../TestHBaseFsckCleanReplicationBarriers.java  | 205 +++
 .../hadoop/hbase/util/hbck/HbckTestingUtil.java |  20 +-
 3 files changed, 336 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/87f5b5f3/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
index 9fcf320..6d9ca9a 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
@@ -58,6 +58,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -85,6 +86,7 @@ import org.apache.hadoop.hbase.MetaTableAccessor;
 import org.apache.hadoop.hbase.RegionLocations;
 import org.apache.hadoop.hbase.ServerName;
 import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.TableNotFoundException;
 import org.apache.hadoop.hbase.ZooKeeperConnectionException;
 import org.apache.hadoop.hbase.client.Admin;
 import org.apache.hadoop.hbase.client.ClusterConnection;
@@ -99,7 +101,9 @@ import org.apache.hadoop.hbase.client.RegionInfo;
 import org.apache.hadoop.hbase.client.RegionInfoBuilder;
 import org.apache.hadoop.hbase.client.RegionReplicaUtil;
 import org.apache.hadoop.hbase.client.Result;
+import org.apache.hadoop.hbase.client.ResultScanner;
 import org.apache.hadoop.hbase.client.RowMutations;
+import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.client.Table;
 import org.apache.hadoop.hbase.client.TableDescriptor;
 import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
@@ -115,6 +119,10 @@ import org.apache.hadoop.hbase.regionserver.HRegion;
 import org.apache.hadoop.hbase.regionserver.HRegionFileSystem;
 import org.apache.hadoop.hbase.regionserver.StoreFileInfo;
 import org.apache.hadoop.hbase.replication.ReplicationException;
+import org.apache.hadoop.hbase.replication.ReplicationPeerDescription;
+import org.apache.hadoop.hbase.replication.ReplicationQueueStorage;
+import org.apache.hadoop.hbase.replication.ReplicationStorageFactory;
+import org.apache.hadoop.hbase.replication.ReplicationUtils;
 import org.apache.hadoop.hbase.security.AccessDeniedException;
 import org.apache.hadoop.hbase.security.UserProvider;
 import org.apache.hadoop.hbase.util.Bytes.ByteArrayComparator;
@@ -268,11 +276,13 @@ public class HBaseFsck extends Configured implements 
Closeable {
   private boolean fixHFileLinks = false; // fix lingering HFileLinks
   private boolean fixEmptyMetaCells = false; // fix (remove) empty 
REGIONINFO_QUALIFIER rows
   private boolean fixReplication = false; // fix undeleted replication queues 
for removed peer
+  private boolean cleanReplicationBarrier = false; // clean replication 
barriers of a table
   private boolean fixAny = false; // Set to true if any of the fix is required.
 
   // limit checking/fixes to listed tables, if empty attempt to check/fix all
   // hbase:meta are always checked
   private Set tablesIncluded = new HashSet<>();
+  private TableName cleanReplicationBarrierTable;
   private int maxMerge = DEFAULT_MAX_MERGE; // maximum number of overlapping 
regions to merge
   // maximum number of overlapping regions to sideline
   private int maxOverlapsToSideline = DEFAULT_OVERLAPS_TO_SIDELINE;
@@ -786,6 +796,8 @@ public class HBaseFsck extends Configured implements 
Closeable {
 
 checkAndFixReplication();
 
+cleanReplicationBarrier();
+
 // Remove the hbck znode
 cleanupHbckZnode();
 
@@ -4118,14 +4130,13 @@ public class HBaseFsck extends Configured implements 
Closeable {
 enum ERROR_CODE {
   UNKNOWN, NO_META_REGION,

hbase git commit: HBASE-20378 Provide a hbck option to cleanup replication barrier for a table

2018-05-04 Thread zhangduo

Repository: hbase
Updated Branches:
  refs/heads/branch-2 eaafdff76 -> 5f260451d


HBASE-20378 Provide a hbck option to cleanup replication barrier for a table

Signed-off-by: zhangduo 


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5f260451
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5f260451
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5f260451

Branch: refs/heads/branch-2
Commit: 5f260451d553011a22e8dad28b7e13fcdded6037
Parents: eaafdff
Author: jingyuntian 
Authored: Sat Apr 28 11:34:29 2018 +0800
Committer: zhangduo 
Committed: Fri May 4 15:20:17 2018 +0800

--
 .../org/apache/hadoop/hbase/util/HBaseFsck.java | 131 ++--
 .../TestHBaseFsckCleanReplicationBarriers.java  | 205 +++
 .../hadoop/hbase/util/hbck/HbckTestingUtil.java |  20 +-
 3 files changed, 336 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/5f260451/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
index f5342b0..1f9c9ab 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
@@ -58,6 +58,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -85,6 +86,7 @@ import org.apache.hadoop.hbase.MetaTableAccessor;
 import org.apache.hadoop.hbase.RegionLocations;
 import org.apache.hadoop.hbase.ServerName;
 import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.TableNotFoundException;
 import org.apache.hadoop.hbase.ZooKeeperConnectionException;
 import org.apache.hadoop.hbase.client.Admin;
 import org.apache.hadoop.hbase.client.ClusterConnection;
@@ -99,7 +101,9 @@ import org.apache.hadoop.hbase.client.RegionInfo;
 import org.apache.hadoop.hbase.client.RegionInfoBuilder;
 import org.apache.hadoop.hbase.client.RegionReplicaUtil;
 import org.apache.hadoop.hbase.client.Result;
+import org.apache.hadoop.hbase.client.ResultScanner;
 import org.apache.hadoop.hbase.client.RowMutations;
+import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.client.Table;
 import org.apache.hadoop.hbase.client.TableDescriptor;
 import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
@@ -115,6 +119,10 @@ import org.apache.hadoop.hbase.regionserver.HRegion;
 import org.apache.hadoop.hbase.regionserver.HRegionFileSystem;
 import org.apache.hadoop.hbase.regionserver.StoreFileInfo;
 import org.apache.hadoop.hbase.replication.ReplicationException;
+import org.apache.hadoop.hbase.replication.ReplicationPeerDescription;
+import org.apache.hadoop.hbase.replication.ReplicationQueueStorage;
+import org.apache.hadoop.hbase.replication.ReplicationStorageFactory;
+import org.apache.hadoop.hbase.replication.ReplicationUtils;
 import org.apache.hadoop.hbase.security.AccessDeniedException;
 import org.apache.hadoop.hbase.security.UserProvider;
 import org.apache.hadoop.hbase.util.Bytes.ByteArrayComparator;
@@ -268,11 +276,13 @@ public class HBaseFsck extends Configured implements 
Closeable {
   private boolean fixHFileLinks = false; // fix lingering HFileLinks
   private boolean fixEmptyMetaCells = false; // fix (remove) empty 
REGIONINFO_QUALIFIER rows
   private boolean fixReplication = false; // fix undeleted replication queues 
for removed peer
+  private boolean cleanReplicationBarrier = false; // clean replication 
barriers of a table
   private boolean fixAny = false; // Set to true if any of the fix is required.
 
   // limit checking/fixes to listed tables, if empty attempt to check/fix all
   // hbase:meta are always checked
   private Set tablesIncluded = new HashSet<>();
+  private TableName cleanReplicationBarrierTable;
   private int maxMerge = DEFAULT_MAX_MERGE; // maximum number of overlapping 
regions to merge
   // maximum number of overlapping regions to sideline
   private int maxOverlapsToSideline = DEFAULT_OVERLAPS_TO_SIDELINE;
@@ -786,6 +796,8 @@ public class HBaseFsck extends Configured implements 
Closeable {
 
 checkAndFixReplication();
 
+cleanReplicationBarrier();
+
 // Remove the hbck znode
 cleanupHbckZnode();
 
@@ -4119,14 +4131,13 @@ public class HBaseFsck extends Configured implements

hbase git commit: HBASE-20378 Provide a hbck option to cleanup replication barrier for a table

2018-05-04 Thread zhangduo

Repository: hbase
Updated Branches:
  refs/heads/master 6225b4a49 -> 87f5b5f34


HBASE-20378 Provide a hbck option to cleanup replication barrier for a table

Signed-off-by: zhangduo 


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/87f5b5f3
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/87f5b5f3
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/87f5b5f3

Branch: refs/heads/master
Commit: 87f5b5f3411d96c31b4cb61b9a57ced22be91d1f
Parents: 6225b4a
Author: jingyuntian 
Authored: Sat Apr 28 11:34:29 2018 +0800
Committer: zhangduo 
Committed: Fri May 4 15:27:33 2018 +0800

--
 .../org/apache/hadoop/hbase/util/HBaseFsck.java | 131 ++--
 .../TestHBaseFsckCleanReplicationBarriers.java  | 205 +++
 .../hadoop/hbase/util/hbck/HbckTestingUtil.java |  20 +-
 3 files changed, 336 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/87f5b5f3/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
index 9fcf320..6d9ca9a 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
@@ -58,6 +58,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -85,6 +86,7 @@ import org.apache.hadoop.hbase.MetaTableAccessor;
 import org.apache.hadoop.hbase.RegionLocations;
 import org.apache.hadoop.hbase.ServerName;
 import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.TableNotFoundException;
 import org.apache.hadoop.hbase.ZooKeeperConnectionException;
 import org.apache.hadoop.hbase.client.Admin;
 import org.apache.hadoop.hbase.client.ClusterConnection;
@@ -99,7 +101,9 @@ import org.apache.hadoop.hbase.client.RegionInfo;
 import org.apache.hadoop.hbase.client.RegionInfoBuilder;
 import org.apache.hadoop.hbase.client.RegionReplicaUtil;
 import org.apache.hadoop.hbase.client.Result;
+import org.apache.hadoop.hbase.client.ResultScanner;
 import org.apache.hadoop.hbase.client.RowMutations;
+import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.client.Table;
 import org.apache.hadoop.hbase.client.TableDescriptor;
 import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
@@ -115,6 +119,10 @@ import org.apache.hadoop.hbase.regionserver.HRegion;
 import org.apache.hadoop.hbase.regionserver.HRegionFileSystem;
 import org.apache.hadoop.hbase.regionserver.StoreFileInfo;
 import org.apache.hadoop.hbase.replication.ReplicationException;
+import org.apache.hadoop.hbase.replication.ReplicationPeerDescription;
+import org.apache.hadoop.hbase.replication.ReplicationQueueStorage;
+import org.apache.hadoop.hbase.replication.ReplicationStorageFactory;
+import org.apache.hadoop.hbase.replication.ReplicationUtils;
 import org.apache.hadoop.hbase.security.AccessDeniedException;
 import org.apache.hadoop.hbase.security.UserProvider;
 import org.apache.hadoop.hbase.util.Bytes.ByteArrayComparator;
@@ -268,11 +276,13 @@ public class HBaseFsck extends Configured implements 
Closeable {
   private boolean fixHFileLinks = false; // fix lingering HFileLinks
   private boolean fixEmptyMetaCells = false; // fix (remove) empty 
REGIONINFO_QUALIFIER rows
   private boolean fixReplication = false; // fix undeleted replication queues 
for removed peer
+  private boolean cleanReplicationBarrier = false; // clean replication 
barriers of a table
   private boolean fixAny = false; // Set to true if any of the fix is required.
 
   // limit checking/fixes to listed tables, if empty attempt to check/fix all
   // hbase:meta are always checked
   private Set tablesIncluded = new HashSet<>();
+  private TableName cleanReplicationBarrierTable;
   private int maxMerge = DEFAULT_MAX_MERGE; // maximum number of overlapping 
regions to merge
   // maximum number of overlapping regions to sideline
   private int maxOverlapsToSideline = DEFAULT_OVERLAPS_TO_SIDELINE;
@@ -786,6 +796,8 @@ public class HBaseFsck extends Configured implements 
Closeable {
 
 checkAndFixReplication();
 
+cleanReplicationBarrier();
+
 // Remove the hbck znode
 cleanupHbckZnode();
 
@@ -4118,14 +4130,13 @@ public class HBaseFsck extends Configured implements

[04/29] hbase git commit: HBASE-20378 Provide a hbck option to cleanup replication barrier for a table

hbase git commit: HBASE-20378 Provide a hbck option to cleanup replication barrier for a table

hbase git commit: HBASE-20378 Provide a hbck option to cleanup replication barrier for a table

3 matches

Site Navigation

Mail list logo

Footer information