[hbase] branch branch-2 updated: HBASE-22894 Move testOpenRegionFailedMemoryLeak to dedicated class

[zh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zhangduo pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2 by this push:
     new df0a40f  HBASE-22894 Move testOpenRegionFailedMemoryLeak to dedicated class
df0a40f is described below

commit df0a40f61f5e8f4771583e6c13c36c2a2561903b
Author: Bing Xiao <bu...@gmail.com>
AuthorDate: Sat Aug 24 12:59:23 2019 +0800

    HBASE-22894 Move testOpenRegionFailedMemoryLeak to dedicated class
    
    Amending-Author: Duo Zhang <zh...@apache.org>
    Signed-off-by: Duo Zhang <zh...@apache.org>
---
 .../hadoop/hbase/regionserver/TestHRegion.java     |  44 ---------
 .../TestOpenRegionFailedMemoryLeak.java            | 108 +++++++++++++++++++++
 2 files changed, 108 insertions(+), 44 deletions(-)

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
index 57f63f5..d2a338e 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
@@ -41,7 +41,6 @@ import static org.mockito.Mockito.when;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;
-import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
 import java.security.PrivilegedExceptionAction;
@@ -53,14 +52,11 @@ import java.util.Map;
 import java.util.NavigableMap;
 import java.util.Objects;
 import java.util.TreeMap;
-import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -167,7 +163,6 @@ import org.apache.hadoop.hbase.wal.WALKeyImpl;
 import org.apache.hadoop.hbase.wal.WALProvider;
 import org.apache.hadoop.hbase.wal.WALProvider.Writer;
 import org.apache.hadoop.hbase.wal.WALSplitUtil;
-import org.apache.hadoop.metrics2.MetricsExecutor;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -6297,45 +6292,6 @@ public class TestHRegion {
         getCoprocessors().contains(ReplicationObserver.class.getSimpleName()));
   }
 
-  // make sure region is success close when coprocessor wrong region open failed
-  @Test
-  public void testOpenRegionFailedMemoryLeak() throws Exception {
-    final ServerName serverName = ServerName.valueOf("testOpenRegionFailed", 100, 42);
-    final RegionServerServices rss = spy(TEST_UTIL.createMockRegionServerService(serverName));
-
-    HTableDescriptor htd
-      = new HTableDescriptor(TableName.valueOf("testOpenRegionFailed"));
-    htd.addFamily(new HColumnDescriptor(fam1));
-    htd.setValue("COPROCESSOR$1", "hdfs://test/test.jar|test||");
-
-    HRegionInfo hri = new HRegionInfo(htd.getTableName(),
-      HConstants.EMPTY_BYTE_ARRAY, HConstants.EMPTY_BYTE_ARRAY);
-    ScheduledExecutorService executor = CompatibilitySingletonFactory.
-      getInstance(MetricsExecutor.class).getExecutor();
-    for (int i = 0; i < 20 ; i++) {
-      try {
-        HRegion.openHRegion(hri, htd, rss.getWAL(hri),
-          TEST_UTIL.getConfiguration(), rss, null);
-      }catch(Throwable t){
-        LOG.info("Expected exception, continue");
-      }
-    }
-    TimeUnit.SECONDS.sleep(MetricsRegionWrapperImpl.PERIOD);
-    Field[] fields = ThreadPoolExecutor.class.getDeclaredFields();
-    boolean found = false;
-    for(Field field : fields){
-      if(field.getName().equals("workQueue")){
-        field.setAccessible(true);
-        BlockingQueue<Runnable> workQueue = (BlockingQueue<Runnable>)field.get(executor);
-        //there are still two task not cancel, can not cause to memory lack
-        Assert.assertTrue("ScheduledExecutor#workQueue should equals 2, now is " +
-          workQueue.size() + ", please check region is close", 2 == workQueue.size());
-        found = true;
-      }
-    }
-    Assert.assertTrue("can not find workQueue, test failed", found);
-  }
-
   /**
    * The same as HRegion class, the only difference is that instantiateHStore will
    * create a different HStore - HStoreForTesting. [HBASE-8518]
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestOpenRegionFailedMemoryLeak.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestOpenRegionFailedMemoryLeak.java
new file mode 100644
index 0000000..f533d8c
--- /dev/null
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestOpenRegionFailedMemoryLeak.java
@@ -0,0 +1,108 @@
+/**
+ * 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.apache.hadoop.hbase.HBaseTestingUtility.fam1;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.spy;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import org.apache.hadoop.hbase.CompatibilitySingletonFactory;
+import org.apache.hadoop.hbase.HBaseClassTestRule;
+import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.ServerName;
+import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
+import org.apache.hadoop.hbase.client.RegionInfo;
+import org.apache.hadoop.hbase.client.RegionInfoBuilder;
+import org.apache.hadoop.hbase.client.TableDescriptor;
+import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
+import org.apache.hadoop.hbase.testclassification.LargeTests;
+import org.apache.hadoop.hbase.testclassification.RegionServerTests;
+import org.apache.hadoop.hbase.util.EnvironmentEdgeManagerTestHelper;
+import org.apache.hadoop.metrics2.MetricsExecutor;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@Category({ RegionServerTests.class, LargeTests.class })
+public class TestOpenRegionFailedMemoryLeak {
+
+  @ClassRule
+  public static final HBaseClassTestRule CLASS_RULE =
+    HBaseClassTestRule.forClass(TestOpenRegionFailedMemoryLeak.class);
+
+  private static final Logger LOG = LoggerFactory.getLogger(TestOpenRegionFailedMemoryLeak.class);
+
+  private static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+
+  @AfterClass
+  public static void tearDown() throws IOException {
+    EnvironmentEdgeManagerTestHelper.reset();
+    LOG.info("Cleaning test directory: " + TEST_UTIL.getDataTestDir());
+    TEST_UTIL.cleanupTestDir();
+  }
+
+  // make sure the region is successfully closed when the coprocessor config is wrong
+  @Test
+  public void testOpenRegionFailedMemoryLeak() throws Exception {
+    final ServerName serverName = ServerName.valueOf("testOpenRegionFailed", 100, 42);
+    final RegionServerServices rss = spy(TEST_UTIL.createMockRegionServerService(serverName));
+
+    TableDescriptor htd =
+      TableDescriptorBuilder.newBuilder(TableName.valueOf("testOpenRegionFailed"))
+        .setColumnFamily(ColumnFamilyDescriptorBuilder.of(fam1))
+        .setValue("COPROCESSOR$1", "hdfs://test/test.jar|test||").build();
+
+    RegionInfo hri = RegionInfoBuilder.newBuilder(htd.getTableName()).build();
+    ScheduledExecutorService executor =
+      CompatibilitySingletonFactory.getInstance(MetricsExecutor.class).getExecutor();
+    for (int i = 0; i < 20; i++) {
+      try {
+        HRegion.openHRegion(hri, htd, rss.getWAL(hri), TEST_UTIL.getConfiguration(), rss, null);
+        fail("Should fail otherwise the test will be useless");
+      } catch (Throwable t) {
+        LOG.info("Expected exception, continue", t);
+      }
+    }
+    TimeUnit.SECONDS.sleep(MetricsRegionWrapperImpl.PERIOD);
+    Field[] fields = ThreadPoolExecutor.class.getDeclaredFields();
+    boolean found = false;
+    for (Field field : fields) {
+      if (field.getName().equals("workQueue")) {
+        field.setAccessible(true);
+        BlockingQueue<Runnable> workQueue = (BlockingQueue<Runnable>) field.get(executor);
+        // there are still two task not cancel, can not cause to memory lack
+        Assert.assertTrue("ScheduledExecutor#workQueue should equals 2, now is " +
+          workQueue.size() + ", please check region is close", 2 == workQueue.size());
+        found = true;
+      }
+    }
+    Assert.assertTrue("can not find workQueue, test failed", found);
+  }
+
+}
\ No newline at end of file