.../org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java index 34576f7..0339f8d 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java @@ -712,6 +712,10 @@ class MemStoreFlusher implements FlushRequester { return (int) getDelay(TimeUnit.MILLISECONDS); } + private boolean regionEquals(Delayed obj) { + return (this.region == (((FlushRegionEntry) obj).region)); + } + @Override public boolean equals(Object obj) { if (this == obj) { @@ -721,6 +725,10 @@ class MemStoreFlusher implements FlushRequester { return false; } Delayed other = (Delayed) obj; + // Ensure that we are having the same region + if (!regionEquals(other)) { + return false; + } return compareTo(other) == 0; } }