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 2017/06/09 19:00:18 UTC

hbase git commit: HBASE-18168 NoSuchElementException when rolling the log (Allan Yang)

Repository: hbase
Updated Branches:
  refs/heads/branch-1.1 b9ff18e94 -> 2a6990123


HBASE-18168 NoSuchElementException when rolling the log (Allan Yang)


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

Branch: refs/heads/branch-1.1
Commit: 2a69901232359e4242e712289c51efd250033ee3
Parents: b9ff18e
Author: Andrew Purtell <ap...@apache.org>
Authored: Fri Jun 9 10:56:11 2017 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Jun 9 10:56:11 2017 -0700

----------------------------------------------------------------------
 .../main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/2a699012/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java
index 2523215..b15f150 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java
@@ -871,7 +871,7 @@ public class FSHLog implements WAL {
       for (Map.Entry<byte[], Long> e: regionsSequenceNums.entrySet()) {
         ConcurrentMap<byte[], Long> m =
             this.oldestUnflushedStoreSequenceIds.get(e.getKey());
-        if (m == null) {
+        if (m == null || m.isEmpty()) {
           continue;
         }
         long unFlushedVal = Collections.min(m.values());