You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2019/08/19 19:59:13 UTC
[hbase] branch master updated (46abaef -> 8e488ce)
This is an automated email from the ASF dual-hosted git repository.
stack pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git.
from 46abaef HBASE-22875 TestShell and TestAdminShell2 are broken
new 0b3db50 HBASE-22857 Fix the failed ut TestHRegion and TestHRegionWithInMemoryFlush (#495)
new 8e488ce HBASE-22882 TestFlushSnapshotFromClient#testConcurrentSnapshottingAttempts is flakey (was written flakey)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../hadoop/hbase/procedure/ProcedureCoordinator.java | 5 ++---
.../apache/hadoop/hbase/regionserver/TestHRegion.java | 7 -------
.../hbase/snapshot/TestFlushSnapshotFromClient.java | 17 +++++++++++------
3 files changed, 13 insertions(+), 16 deletions(-)
[hbase] 01/02: HBASE-22857 Fix the failed ut TestHRegion and
TestHRegionWithInMemoryFlush (#495)
Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
stack pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 0b3db5099c2930a81931793cec1550842371e772
Author: Guanghao Zhang <zg...@apache.org>
AuthorDate: Thu Aug 15 15:18:38 2019 -0500
HBASE-22857 Fix the failed ut TestHRegion and TestHRegionWithInMemoryFlush (#495)
Signed-off-by: Peter Somogyi psomogyi@apache.org
Signed-off-by: stack stack@apache.org
---
.../java/org/apache/hadoop/hbase/regionserver/TestHRegion.java | 7 -------
1 file changed, 7 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 eb3cc73..fc5ecad 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
@@ -1230,14 +1230,7 @@ public class TestHRegion {
region.close(true);
wal.close();
- // 2. Test case where START_FLUSH succeeds but COMMIT_FLUSH will throw exception
- wal.flushActions = new FlushAction [] {FlushAction.COMMIT_FLUSH};
- wal = new FailAppendFlushMarkerWAL(FileSystem.get(walConf), FSUtils.getRootDir(walConf),
- method, walConf);
wal.init();
- this.region = initHRegion(tableName, HConstants.EMPTY_START_ROW,
- HConstants.EMPTY_END_ROW, false, Durability.USE_DEFAULT, wal, family);
- region.put(put);
// 3. Test case where ABORT_FLUSH will throw exception.
// Even if ABORT_FLUSH throws exception, we should not fail with IOE, but continue with
[hbase] 02/02: HBASE-22882
TestFlushSnapshotFromClient#testConcurrentSnapshottingAttempts is flakey
(was written flakey)
Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
stack pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 8e488ce9efa61abf1c38c269b0cafa8333178fdf
Author: stack <st...@apache.org>
AuthorDate: Mon Aug 19 12:57:12 2019 -0700
HBASE-22882 TestFlushSnapshotFromClient#testConcurrentSnapshottingAttempts is flakey (was written flakey)
---
.../hadoop/hbase/procedure/ProcedureCoordinator.java | 5 ++---
.../hbase/snapshot/TestFlushSnapshotFromClient.java | 17 +++++++++++------
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ProcedureCoordinator.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ProcedureCoordinator.java
index d8f1b7b..7b4c677 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ProcedureCoordinator.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/ProcedureCoordinator.java
@@ -29,6 +29,7 @@ import java.util.concurrent.SynchronousQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
+import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.yetus.audience.InterfaceAudience;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -67,9 +68,9 @@ public class ProcedureCoordinator {
* The rpc object registers the ProcedureCoordinator and starts any threads in this
* constructor.
*
- * @param rpcs
* @param pool Used for executing procedures.
*/
+ @VisibleForTesting // Only used in tests. SimpleMasterProcedureManager is a test class.
public ProcedureCoordinator(ProcedureCoordinatorRpcs rpcs, ThreadPoolExecutor pool) {
this(rpcs, pool, TIMEOUT_MILLIS_DEFAULT, WAKE_MILLIS_DEFAULT);
}
@@ -80,9 +81,7 @@ public class ProcedureCoordinator {
* The rpc object registers the ProcedureCoordinator and starts any threads in
* this constructor.
*
- * @param rpcs
* @param pool Used for executing procedures.
- * @param timeoutMillis
*/
public ProcedureCoordinator(ProcedureCoordinatorRpcs rpcs, ThreadPoolExecutor pool,
long timeoutMillis, long wakeTimeMillis) {
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.java
index df03313..50a2ed6 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.java
@@ -54,6 +54,7 @@ import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.ClassRule;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
@@ -142,7 +143,6 @@ public class TestFlushSnapshotFromClient {
/**
* Test simple flush snapshotting a table that is online
- * @throws Exception
*/
@Test
public void testFlushTableSnapshot() throws Exception {
@@ -175,7 +175,6 @@ public class TestFlushSnapshotFromClient {
/**
* Test snapshotting a table that is online without flushing
- * @throws Exception
*/
@Test
public void testSkipFlushTableSnapshot() throws Exception {
@@ -215,7 +214,6 @@ public class TestFlushSnapshotFromClient {
/**
* Test simple flush snapshotting a table that is online
- * @throws Exception
*/
@Test
public void testFlushTableSnapshotWithProcedure() throws Exception {
@@ -446,13 +444,20 @@ public class TestFlushSnapshotFromClient {
/**
* Demonstrate that we reject snapshot requests if there is a snapshot already running on the
* same table currently running and that concurrent snapshots on different tables can both
- * succeed concurretly.
+ * succeed concurrently.
*/
+ @Ignore // Turning this test off. It is written flakey (See original submission in HBASE-7536
+ // for admission). While the test ensures we run one snapshot at a time as the above comment
+ // describes, the second part of the comment where we are supposed to allow snapshots against
+ // different tables run concurrently is where there is issue. There is only one
+ // handler thread on the regionserver-side which means that on a second submission, the
+ // second request gets rejected with RejectedExecutionException. The test used to sort-of
+ // pass with 20 attempts but as often-as-not, fails.
@Test
public void testConcurrentSnapshottingAttempts() throws IOException, InterruptedException {
final TableName TABLE2_NAME = TableName.valueOf(TABLE_NAME + "2");
- int ssNum = 20;
+ int ssNum = 2;
// make sure we don't fail on listing snapshots
SnapshotTestingUtils.assertNoSnapshots(admin);
// create second testing table
@@ -489,7 +494,7 @@ public class TestFlushSnapshotFromClient {
// build descriptions
SnapshotDescription[] descs = new SnapshotDescription[ssNum];
for (int i = 0; i < ssNum; i++) {
- if(i % 2 ==0) {
+ if (i % 2 == 0) {
descs[i] = new SnapshotDescription("ss" + i, TABLE_NAME, SnapshotType.FLUSH);
} else {
descs[i] = new SnapshotDescription("ss" + i, TABLE2_NAME, SnapshotType.FLUSH);