bsglz commented on a change in pull request #3049:
URL: https://github.com/apache/hbase/pull/3049#discussion_r594315837
##########
File path:
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
##########
@@ -467,18 +469,28 @@ public boolean requestFlush(HRegion r,
FlushLifeCycleTracker tracker) {
public boolean requestFlush(HRegion r, List<byte[]> families,
FlushLifeCycleTracker tracker) {
synchronized (regionsInQueue) {
- if (!regionsInQueue.containsKey(r)) {
- // This entry has no delay so it will be added at the top of the flush
- // queue. It'll come out near immediately.
- FlushRegionEntry fqe = new FlushRegionEntry(r, families, tracker);
- this.regionsInQueue.put(r, fqe);
- this.flushQueue.add(fqe);
- r.incrementFlushesQueuedCount();
- return true;
- } else {
- tracker.notExecuted("Flush already requested on " + r);
- return false;
+ if (regionsInQueue.containsKey(r)) {
+ FlushRegionEntry existFqe = regionsInQueue.get(r);
+ // if a delayed one exists, just remove it
+ if (existFqe.whenToExpire > existFqe.createTime) {
Review comment:
Good point, will fix, thanks.
##########
File path:
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMemStoreFlusher.java
##########
@@ -0,0 +1,70 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase.regionserver;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.HBaseClassTestRule;
+import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.client.RegionInfo;
+import org.apache.hadoop.hbase.client.RegionInfoBuilder;
+import org.apache.hadoop.hbase.testclassification.RegionServerTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.TestName;
+
+@Category({ RegionServerTests.class, SmallTests.class })
+public class TestMemStoreFlusher {
+
+ @ClassRule
+ public static final HBaseClassTestRule CLASS_RULE =
+ HBaseClassTestRule.forClass(TestMemStoreFlusher.class);
+
+ @Rule
+ public TestName name = new TestName();
+
+ public MemStoreFlusher msf;
+
+ @Before
+ public void setUp() throws Exception {
+ Configuration conf = new Configuration();
+ conf.set("hbase.hstore.flusher.count", "0");
+ msf = new MemStoreFlusher(conf, null);
+ }
+
+ @Test
+ public void testReplaceDelayedFlushEntry() {
+ RegionInfo hri =
+
RegionInfoBuilder.newBuilder(TableName.valueOf(name.getMethodName())).setRegionId(1)
+ .setReplicaId(0).build();
+ HRegion r = mock(HRegion.class);
+ doReturn(hri).when(r).getRegionInfo();
+
+ msf.requestDelayedFlush(r, 100);
+ assertEquals(1, msf.getFlushQueueSize());
+ boolean success = msf.requestFlush(r, FlushLifeCycleTracker.DUMMY);
+ assertEquals(true, success);
Review comment:
Will fix.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
