HBASE-18330 NPE in ReplicationZKLockCleanerChore
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/7d2175eb Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7d2175eb Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7d2175eb Branch: refs/heads/branch-1.2 Commit: 7d2175eb3e00ac705adee9dd533c07041bf0f38a Parents: 7db088b Author: Andrew Purtell <apurt...@apache.org> Authored: Wed Jul 19 15:46:45 2017 -0700 Committer: Andrew Purtell <apurt...@apache.org> Committed: Wed Jul 19 15:47:59 2017 -0700 ---------------------------------------------------------------------- .../apache/hadoop/hbase/replication/ReplicationPeersZKImpl.java | 1 - .../hbase/master/cleaner/ReplicationZKLockCleanerChore.java | 4 +++- .../hadoop/hbase/replication/master/ReplicationLogCleaner.java | 2 +- .../hbase/replication/regionserver/ReplicationSourceManager.java | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/7d2175eb/hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationPeersZKImpl.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationPeersZKImpl.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationPeersZKImpl.java index 5bceaa5..cd0fcdb 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationPeersZKImpl.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationPeersZKImpl.java @@ -560,5 +560,4 @@ public class ReplicationPeersZKImpl extends ReplicationStateZKBase implements Re return ProtobufUtil.prependPBMagic(bytes); } - } http://git-wip-us.apache.org/repos/asf/hbase/blob/7d2175eb/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/ReplicationZKLockCleanerChore.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/ReplicationZKLockCleanerChore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/ReplicationZKLockCleanerChore.java index dc5338e..3fa30bf 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/ReplicationZKLockCleanerChore.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/ReplicationZKLockCleanerChore.java @@ -76,7 +76,9 @@ public class ReplicationZKLockCleanerChore extends ScheduledChore { } Set<String> rsSet = new HashSet<String>(regionServers); List<String> replicators = queues.getListOfReplicators(); - + if (replicators == null || replicators.isEmpty()) { + return; + } for (String replicator: replicators) { try { String lockNode = queues.getLockZNode(replicator); http://git-wip-us.apache.org/repos/asf/hbase/blob/7d2175eb/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/master/ReplicationLogCleaner.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/master/ReplicationLogCleaner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/master/ReplicationLogCleaner.java index 9ecba11..7731240 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/master/ReplicationLogCleaner.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/master/ReplicationLogCleaner.java @@ -98,7 +98,7 @@ public class ReplicationLogCleaner extends BaseLogCleanerDelegate { for (int retry = 0; ; retry++) { int v0 = replicationQueues.getQueuesZNodeCversion(); List<String> rss = replicationQueues.getListOfReplicators(); - if (rss == null) { + if (rss == null || rss.isEmpty()) { LOG.debug("Didn't find any region server that replicates, won't prevent any deletions."); return ImmutableSet.of(); } http://git-wip-us.apache.org/repos/asf/hbase/blob/7d2175eb/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java index 603557b..90f818d 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java @@ -230,7 +230,7 @@ public class ReplicationSourceManager implements ReplicationListener { addSource(id); } List<String> currentReplicators = this.replicationQueues.getListOfReplicators(); - if (currentReplicators == null || currentReplicators.size() == 0) { + if (currentReplicators == null || currentReplicators.isEmpty()) { return; } List<String> otherRegionServers = replicationTracker.getListOfRegionServers();
