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 2018/05/03 19:27:02 UTC
[1/2] hbase git commit: HBASE-20414
TestLockProcedure#testMultipleLocks may fail on slow machine
Repository: hbase
Updated Branches:
refs/heads/branch-2 984fb5bd0 -> e92580e20
HBASE-20414 TestLockProcedure#testMultipleLocks may fail on slow machine
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f89c5b08
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f89c5b08
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f89c5b08
Branch: refs/heads/branch-2
Commit: f89c5b08dfc4d7f21e2a926facb98c7883c47c8d
Parents: 984fb5b
Author: tedyu <yu...@gmail.com>
Authored: Wed May 2 06:39:51 2018 -0700
Committer: Michael Stack <st...@apache.org>
Committed: Thu May 3 07:12:11 2018 -0700
----------------------------------------------------------------------
.../apache/hadoop/hbase/master/locking/TestLockProcedure.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/f89c5b08/hbase-server/src/test/java/org/apache/hadoop/hbase/master/locking/TestLockProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/locking/TestLockProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/locking/TestLockProcedure.java
index c985fa7..8fa7747 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/locking/TestLockProcedure.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/locking/TestLockProcedure.java
@@ -300,6 +300,7 @@ public class TestLockProcedure {
// Acquire namespace lock, then queue other locks.
long nsProcId = queueLock(nsLock);
assertTrue(awaitForLocked(nsProcId, 2000));
+ long start = System.currentTimeMillis();
sendHeartbeatAndCheckLocked(nsProcId, true);
long table1ProcId = queueLock(tableLock1);
long table2ProcId = queueLock(tableLock2);
@@ -307,7 +308,9 @@ public class TestLockProcedure {
long regions2ProcId = queueLock(regionsLock2);
// Assert tables & region locks are waiting because of namespace lock.
- Thread.sleep(HEARTBEAT_TIMEOUT / 2);
+ long now = System.currentTimeMillis();
+ // leave extra 10 msec in case more than half the HEARTBEAT_TIMEOUT has passed
+ Thread.sleep(Math.min(HEARTBEAT_TIMEOUT / 2, Math.max(HEARTBEAT_TIMEOUT-(now-start)-10, 0)));
sendHeartbeatAndCheckLocked(nsProcId, true);
sendHeartbeatAndCheckLocked(table1ProcId, false);
sendHeartbeatAndCheckLocked(table2ProcId, false);
[2/2] hbase git commit: HBASE-20507 Do not need to call recoverLease
on the broken file when we fail to create a wal writer
Posted by st...@apache.org.
HBASE-20507 Do not need to call recoverLease on the broken file when we fail to create a wal writer
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e92580e2
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e92580e2
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e92580e2
Branch: refs/heads/branch-2
Commit: e92580e2012fdc7b3741bc73af630efe4b7bd82f
Parents: f89c5b0
Author: Michael Stack <st...@apache.org>
Authored: Thu May 3 12:26:12 2018 -0700
Committer: Michael Stack <st...@apache.org>
Committed: Thu May 3 12:26:54 2018 -0700
----------------------------------------------------------------------
.../hbase/io/asyncfs/TestOverwriteFileUnderConstruction.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/e92580e2/hbase-server/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestOverwriteFileUnderConstruction.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestOverwriteFileUnderConstruction.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestOverwriteFileUnderConstruction.java
index 7f75fdb..aaeed15 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestOverwriteFileUnderConstruction.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestOverwriteFileUnderConstruction.java
@@ -22,6 +22,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
+import java.io.FileNotFoundException;
import java.io.IOException;
import org.apache.hadoop.fs.FSDataInputStream;
import org.apache.hadoop.fs.FSDataOutputStream;
@@ -95,6 +96,8 @@ public class TestOverwriteFileUnderConstruction {
out1.close();
// a successful close is also OK for us so no assertion here, we just need to confirm that the
// data in the file are correct.
+ } catch (FileNotFoundException fnfe) {
+ // hadoop3 throws one of these.
} catch (RemoteException e) {
// expected
assertThat(e.unwrapRemoteException(), instanceOf(LeaseExpiredException.class));