You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zg...@apache.org on 2019/05/29 07:22:09 UTC
[hbase] branch branch-2.1 updated (17b5904 -> 3c848de)
This is an automated email from the ASF dual-hosted git repository.
zghao pushed a change to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/hbase.git.
from 17b5904 HBASE-22471 Our nightly jobs for master and branch-2 are still using hadoop-2.7.1 in integration test
new 21241d0 HBASE-22486 Fix flaky test TestLockManager
new 3c848de HBASE-22488 Cleanup the explicit timeout value for test methods
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:
.../java/org/apache/hadoop/hbase/master/locking/LockProcedure.java | 6 +++++-
.../org/apache/hadoop/hbase/coprocessor/TestMetaTableMetrics.java | 2 +-
.../hadoop/hbase/master/TestMasterHandlerFullWhenTransitRegion.java | 2 +-
.../java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java | 4 ++--
.../org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.java | 2 +-
.../test/java/org/apache/hadoop/hbase/quotas/TestQuotaState.java | 2 +-
.../java/org/apache/hadoop/hbase/regionserver/TestWALLockup.java | 2 +-
.../hbase/regionserver/throttle/TestStoreHotnessProtector.java | 2 +-
8 files changed, 13 insertions(+), 9 deletions(-)
[hbase] 02/02: HBASE-22488 Cleanup the explicit timeout value for
test methods
Posted by zg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zghao pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 3c848de7841e2141762a2a9db8815222d06efc66
Author: Guanghao <zg...@apache.org>
AuthorDate: Wed May 29 14:09:16 2019 +0800
HBASE-22488 Cleanup the explicit timeout value for test methods
---
.../org/apache/hadoop/hbase/coprocessor/TestMetaTableMetrics.java | 2 +-
.../hadoop/hbase/master/TestMasterHandlerFullWhenTransitRegion.java | 2 +-
.../test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java | 4 ++--
.../java/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.java | 2 +-
.../src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaState.java | 2 +-
.../test/java/org/apache/hadoop/hbase/regionserver/TestWALLockup.java | 2 +-
.../hadoop/hbase/regionserver/throttle/TestStoreHotnessProtector.java | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMetaTableMetrics.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMetaTableMetrics.java
index 82ce709..16db86d 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMetaTableMetrics.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMetaTableMetrics.java
@@ -232,7 +232,7 @@ public class TestMetaTableMetrics {
assertEquals(5L, putWithClientMetricsCount);
}
- @Test(timeout = 30000)
+ @Test
public void testConcurrentAccess() {
try {
tablename = Bytes.toBytes("hbase:meta");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterHandlerFullWhenTransitRegion.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterHandlerFullWhenTransitRegion.java
index 049c560..ea5d3d1 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterHandlerFullWhenTransitRegion.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterHandlerFullWhenTransitRegion.java
@@ -63,7 +63,7 @@ public class TestMasterHandlerFullWhenTransitRegion {
UTIL.createTable(TableName.valueOf(TABLENAME), "fa");
}
- @Test(timeout = 30000)
+ @Test
public void test() throws Exception {
RegionInfo regionInfo = UTIL.getAdmin().getRegions(TableName.valueOf(TABLENAME)).get(0);
//See HBASE-21754
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java
index 3aa0396..15b14b4 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java
@@ -309,7 +309,7 @@ public class TestMasterNoCluster {
}
}
- @Test(timeout = 60000)
+ @Test
public void testMasterInitWithSameClientServerZKQuorum() throws Exception {
Configuration conf = new Configuration(TESTUTIL.getConfiguration());
conf.set(HConstants.CLIENT_ZOOKEEPER_QUORUM, HConstants.LOCALHOST);
@@ -320,7 +320,7 @@ public class TestMasterNoCluster {
master.join();
}
- @Test(timeout = 60000)
+ @Test
public void testMasterInitWithObserverModeClientZKQuorum() throws Exception {
Configuration conf = new Configuration(TESTUTIL.getConfiguration());
Assert.assertFalse(Boolean.getBoolean(HConstants.CLIENT_ZOOKEEPER_OBSERVER_MODE));
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.java
index 9a6ca79..696b450 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.java
@@ -238,7 +238,7 @@ public class TestLogsCleaner {
* When zk is working both files should be returned
* @throws Exception
*/
- @Test(timeout=10000)
+ @Test
public void testZooKeeperNormal() throws Exception {
Configuration conf = TEST_UTIL.getConfiguration();
ReplicationLogCleaner cleaner = new ReplicationLogCleaner();
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaState.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaState.java
index 0cbc445..8fa6c22 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaState.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaState.java
@@ -203,7 +203,7 @@ public class TestQuotaState {
assertNoopLimiter(quotaInfo.getTableLimiter(UNKNOWN_TABLE_NAME));
}
- @Test(timeout = 60000)
+ @Test
public void testTableThrottleWithBatch() {
final TableName TABLE_A = TableName.valueOf("TableA");
final int TABLE_A_THROTTLE_1 = 3;
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWALLockup.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWALLockup.java
index bbea064..dca2a72 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWALLockup.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWALLockup.java
@@ -314,7 +314,7 @@ public class TestWALLockup {
* If below is broken, we will see this test timeout because RingBufferEventHandler was stuck in
* attainSafePoint. Everyone will wait for sync to finish forever. See HBASE-14317.
*/
- @Test (timeout=30000)
+ @Test
public void testRingBufferEventHandlerStuckWhenSyncFailed()
throws IOException, InterruptedException {
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/throttle/TestStoreHotnessProtector.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/throttle/TestStoreHotnessProtector.java
index 6d41934..a73d366 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/throttle/TestStoreHotnessProtector.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/throttle/TestStoreHotnessProtector.java
@@ -52,7 +52,7 @@ public class TestStoreHotnessProtector {
@ClassRule public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestStoreHotnessProtector.class);
- @Test(timeout = 60000)
+ @Test
public void testPreparePutCounter() throws Exception {
ExecutorService executorService = Executors.newFixedThreadPool(10);
[hbase] 01/02: HBASE-22486 Fix flaky test TestLockManager
Posted by zg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zghao pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 21241d03d9406ba3990c539b72da0901fbcf15b7
Author: Guanghao <zg...@apache.org>
AuthorDate: Wed May 29 10:58:10 2019 +0800
HBASE-22486 Fix flaky test TestLockManager
---
.../java/org/apache/hadoop/hbase/master/locking/LockProcedure.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/locking/LockProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/locking/LockProcedure.java
index 3a87bbc..dc1e5bc 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/locking/LockProcedure.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/locking/LockProcedure.java
@@ -90,6 +90,8 @@ public final class LockProcedure extends Procedure<MasterProcedureEnv>
// DEFAULT_LOCAL_MASTER_LOCKS_TIMEOUT_MS (10 min) so that there is no need to heartbeat.
private final CountDownLatch lockAcquireLatch;
+ private volatile boolean suspended = false;
+
@Override
public TableName getTableName() {
return tableName;
@@ -219,9 +221,10 @@ public final class LockProcedure extends Procedure<MasterProcedureEnv>
locked.set(false);
// Maybe timeout already awakened the event and the procedure has finished.
synchronized (event) {
- if (!event.isReady()) {
+ if (!event.isReady() && suspended) {
setState(ProcedureProtos.ProcedureState.RUNNABLE);
event.wake(env.getProcedureScheduler());
+ suspended = false;
}
}
}
@@ -244,6 +247,7 @@ public final class LockProcedure extends Procedure<MasterProcedureEnv>
event.suspend();
event.suspendIfNotReady(this);
setState(ProcedureProtos.ProcedureState.WAITING_TIMEOUT);
+ suspended = true;
}
throw new ProcedureSuspendedException();
}