This is an automated email from the ASF dual-hosted git repository.
psomogyi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase-operator-tools.git
The following commit(s) were added to refs/heads/master by this push:
new 3d76e06 HBASE-23641 Use ReplicationPeerConfig.needToReplicate in
HBaseFsck (#51)
3d76e06 is described below
commit 3d76e06ccb9d1ac0019e752074db8d934e9b3211
Author: Peter Somogyi <[email protected]>
AuthorDate: Wed Jan 8 13:31:42 2020 +0100
HBASE-23641 Use ReplicationPeerConfig.needToReplicate in HBaseFsck (#51)
Signed-off-by: Wellington Chevreuil <[email protected]>
---
hbase-hbck2/src/main/java/org/apache/hbase/hbck1/HBaseFsck.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/hbase-hbck2/src/main/java/org/apache/hbase/hbck1/HBaseFsck.java
b/hbase-hbck2/src/main/java/org/apache/hbase/hbck1/HBaseFsck.java
index 5aa18ab..7cb6c7a 100644
--- a/hbase-hbck2/src/main/java/org/apache/hbase/hbck1/HBaseFsck.java
+++ b/hbase-hbck2/src/main/java/org/apache/hbase/hbck1/HBaseFsck.java
@@ -125,7 +125,6 @@ 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;
@@ -5547,9 +5546,9 @@ public class HBaseFsck extends Configured implements
Closeable {
List<ReplicationPeerDescription> peerDescriptions =
admin.listReplicationPeers();
if (peerDescriptions != null && peerDescriptions.size() > 0) {
List<String> peers = peerDescriptions.stream()
- .filter(peerConfig ->
ReplicationUtils.contains(peerConfig.getPeerConfig(),
- cleanReplicationBarrierTable))
- .map(peerConfig ->
peerConfig.getPeerId()).collect(Collectors.toList());
+ .filter(peerConfig -> peerConfig.getPeerConfig()
+ .needToReplicate(cleanReplicationBarrierTable))
+
.map(ReplicationPeerDescription::getPeerId).collect(Collectors.toList());
try {
List<String> batch = new ArrayList<>();
for (String peer : peers) {
