hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject hbase git commit: HBASE-18788 NPE when running TestSerialReplication (Fabrice Monnier)
Date Mon, 09 Oct 2017 00:08:41 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-2 9ae275058 -> 6e772096a


HBASE-18788 NPE when running TestSerialReplication (Fabrice Monnier)


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

Branch: refs/heads/branch-2
Commit: 6e772096ad766b92d2a6ae69929a3a631789a021
Parents: 9ae2750
Author: Michael Stack <stack@apache.org>
Authored: Sun Oct 8 17:03:39 2017 -0700
Committer: Michael Stack <stack@apache.org>
Committed: Sun Oct 8 17:08:24 2017 -0700

----------------------------------------------------------------------
 .../hadoop/hbase/master/cleaner/ReplicationMetaCleaner.java  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/6e772096/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/ReplicationMetaCleaner.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/ReplicationMetaCleaner.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/ReplicationMetaCleaner.java
index 3f2dab3..23e5a66 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/ReplicationMetaCleaner.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/cleaner/ReplicationMetaCleaner.java
@@ -83,8 +83,12 @@ public class ReplicationMetaCleaner extends ScheduledChore {
 
       List<ReplicationPeerDescription> peers = admin.listReplicationPeers();
       for (ReplicationPeerDescription peerDesc : peers) {
-        for (Map.Entry<TableName, List<String>> map : peerDesc.getPeerConfig().getTableCFsMap()
-            .entrySet()) {
+        Map<TableName, List<String>> tableCFsMap = peerDesc.getPeerConfig().getTableCFsMap();
+        if (tableCFsMap ==null) {
+          continue;
+        }
+
+        for (Map.Entry<TableName, List<String>> map : tableCFsMap.entrySet())
{
           if (serialTables.containsKey(map.getKey().getNameAsString())) {
             serialTables.get(map.getKey().getNameAsString()).add(peerDesc.getPeerId());
             break;


Mime
View raw message