Skip to content

Fix deadlock in adapter access tests across named-lock modules #2033

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
elharo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix deadlock in adapter access tests across named-lock modules #2033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 44 additions & 44 deletions ...java/org/eclipse/aether/internal/impl/synccontext/NamedLockFactoryAdapterTestSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
* UT support for {@link SyncContextFactory}.
*/
public abstract class NamedLockFactoryAdapterTestSupport {
private static final long ADAPTER_TIME = 500L;
private static final long ADAPTER_TIME = 1000L;

private static final TimeUnit ADAPTER_TIME_UNIT = TimeUnit.MILLISECONDS;

Expand Down Expand Up @@ -119,7 +119,7 @@ void multipleAcquires() {
}

@Test
@Timeout(5)
@Timeout(15)
void multipleAcquiresWithALoser() throws InterruptedException {
try (SyncContext syncContext1 = adapter.newInstance(session, false)) {
syncContext1.acquire(Arrays.asList(new DefaultArtifact("groupId:artifactId:1.0")), null);
Expand All @@ -133,106 +133,106 @@ void multipleAcquiresWithALoser() throws InterruptedException {
}
});
t1.start();
t1.join();
loser.await();
t1.join(5000);
assertTrue(loser.await(5, TimeUnit.SECONDS), "expected a loser");
}
}

@Test
@Timeout(5)
@Timeout(15)
public void sharedAccess() throws InterruptedException {
CountDownLatch winners = new CountDownLatch(2); // we expect 2 winners
CountDownLatch losers = new CountDownLatch(0); // we expect 0 losers
Thread t1 = new Thread(new Access(true, winners, losers, adapter, session, null));
Thread t2 = new Thread(new Access(true, winners, losers, adapter, session, null));
t1.start();
t2.start();
t1.join();
t2.join();
winners.await();
losers.await();
t1.join(5000);
t2.join(5000);
assertTrue(winners.await(5, TimeUnit.SECONDS), "expected both threads to win");
assertTrue(losers.await(5, TimeUnit.SECONDS), "expected no loser");
}

@Test
@Timeout(5)
@Timeout(15)
public void exclusiveAccess() throws InterruptedException {
CountDownLatch winners = new CountDownLatch(1); // we expect 1 winner
CountDownLatch losers = new CountDownLatch(1); // we expect 1 loser
Thread t1 = new Thread(new Access(false, winners, losers, adapter, session, null));
Thread t2 = new Thread(new Access(false, winners, losers, adapter, session, null));
t1.start();
t2.start();
t1.join();
t2.join();
winners.await();
losers.await();
t1.join(5000);
t2.join(5000);
assertTrue(winners.await(5, TimeUnit.SECONDS), "expected a winner");
assertTrue(losers.await(5, TimeUnit.SECONDS), "expected a loser");
}

@Test
@Timeout(5)
@Timeout(15)
public void mixedAccess() throws InterruptedException {
CountDownLatch winners = new CountDownLatch(1); // we expect 1 winner
CountDownLatch losers = new CountDownLatch(1); // we expect 1 loser
Thread t1 = new Thread(new Access(true, winners, losers, adapter, session, null));
Thread t2 = new Thread(new Access(false, winners, losers, adapter, session, null));
t1.start();
t2.start();
t1.join();
t2.join();
winners.await();
losers.await();
t1.join(5000);
t2.join(5000);
assertTrue(winners.await(5, TimeUnit.SECONDS), "expected a winner");
assertTrue(losers.await(5, TimeUnit.SECONDS), "expected a loser");
}

@Test
@Timeout(5)
@Timeout(15)
public void nestedSharedShared() throws InterruptedException {
CountDownLatch winners = new CountDownLatch(2); // we expect 2 winners
CountDownLatch losers = new CountDownLatch(0); // we expect 0 losers
Thread t1 = new Thread(new Access(
true, winners, losers, adapter, session, new Access(true, winners, losers, adapter, session, null)));
t1.start();
t1.join();
winners.await();
losers.await();
t1.join(5000);
assertTrue(winners.await(5, TimeUnit.SECONDS), "expected both threads to win");
assertTrue(losers.await(5, TimeUnit.SECONDS), "expected no loser");
}

@Test
@Timeout(5)
@Timeout(15)
public void nestedExclusiveShared() throws InterruptedException {
CountDownLatch winners = new CountDownLatch(2); // we expect 2 winners
CountDownLatch losers = new CountDownLatch(0); // we expect 0 losers
Thread t1 = new Thread(new Access(
false, winners, losers, adapter, session, new Access(true, winners, losers, adapter, session, null)));
t1.start();
t1.join();
winners.await();
losers.await();
t1.join(5000);
assertTrue(winners.await(5, TimeUnit.SECONDS), "expected both threads to win");
assertTrue(losers.await(5, TimeUnit.SECONDS), "expected no loser");
}

@Test
@Timeout(5)
@Timeout(15)
public void nestedExclusiveExclusive() throws InterruptedException {
CountDownLatch winners = new CountDownLatch(2); // we expect 2 winners
CountDownLatch losers = new CountDownLatch(0); // we expect 0 losers
Thread t1 = new Thread(new Access(
false, winners, losers, adapter, session, new Access(false, winners, losers, adapter, session, null)));
t1.start();
t1.join();
winners.await();
losers.await();
t1.join(5000);
assertTrue(winners.await(5, TimeUnit.SECONDS), "expected both threads to win");
assertTrue(losers.await(5, TimeUnit.SECONDS), "expected no loser");
}

@Test
@Timeout(5)
@Timeout(15)
public void nestedSharedExclusive() throws InterruptedException {
CountDownLatch winners = new CountDownLatch(1); // we expect 1 winner (outer)
CountDownLatch losers = new CountDownLatch(1); // we expect 1 loser (inner)
Thread t1 = new Thread(new Access(
true, winners, losers, adapter, session, new Access(false, winners, losers, adapter, session, null)));
t1.start();
t1.join();
winners.await();
losers.await();
t1.join(5000);
assertTrue(winners.await(5, TimeUnit.SECONDS), "expected a winner");
assertTrue(losers.await(5, TimeUnit.SECONDS), "expected a loser");
}

@Test
Expand All @@ -244,10 +244,10 @@ void fullyConsumeLockTime() throws InterruptedException {
Thread t2 = new Thread(new Access(false, winners, losers, adapter, session, null));
t1.start();
t2.start();
t1.join();
t2.join();
winners.await();
losers.await();
t1.join(5000);
t2.join(5000);
assertTrue(winners.await(5, TimeUnit.SECONDS), "expected a winner");
assertTrue(losers.await(5, TimeUnit.SECONDS), "expected a loser");
long end = System.nanoTime();
long duration = end - start;
long expectedDuration = ADAPTER_TIME_UNIT.toNanos(ADAPTER_TIME);
Expand All @@ -261,9 +261,9 @@ void releasedExclusiveAllowAccess() throws InterruptedException {
Thread t1 = new Thread(new Access(false, winners, losers, adapter, session, null));
new Access(false, winners, losers, adapter, session, null).run();
t1.start();
t1.join();
winners.await();
losers.await();
t1.join(5000);
assertTrue(winners.await(5, TimeUnit.SECONDS), "expected both threads to win");
assertTrue(losers.await(5, TimeUnit.SECONDS), "expected no loser");
}

private static class Access implements Runnable {
Expand Down Expand Up @@ -302,10 +302,10 @@ public void run() {
if (chained != null) {
chained.run();
}
loser.await();
loser.await(5, TimeUnit.SECONDS);
} catch (IllegalStateException | LockUpgradeNotSupportedException e) {
loser.countDown();
winner.await();
winner.await(5, TimeUnit.SECONDS);
}
} catch (InterruptedException e) {
fail("interrupted");
Expand Down
68 changes: 34 additions & 34 deletions .../src/test/java/org/eclipse/aether/named/hazelcast/NamedLockFactoryAdapterTestSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
public abstract class NamedLockFactoryAdapterTestSupport {
protected static final HazelcastClientUtils utils = new HazelcastClientUtils();

private static final long ADAPTER_TIME = 100L;
private static final long ADAPTER_TIME = 1000L;

private static final TimeUnit ADAPTER_TIME_UNIT = TimeUnit.MILLISECONDS;

Expand Down Expand Up @@ -106,100 +106,100 @@ void justAcquire() {
}

@Test
@Timeout(5)
@Timeout(15)
public void sharedAccess() throws InterruptedException {
CountDownLatch winners = new CountDownLatch(2); // we expect 2 winners
CountDownLatch losers = new CountDownLatch(0); // we expect 0 losers
Thread t1 = new Thread(new Access(true, winners, losers, adapter, session, null));
Thread t2 = new Thread(new Access(true, winners, losers, adapter, session, null));
t1.start();
t2.start();
t1.join();
t2.join();
winners.await();
losers.await();
t1.join(5000);
t2.join(5000);
assertTrue(winners.await(5, TimeUnit.SECONDS), "expected both threads to win");
assertTrue(losers.await(5, TimeUnit.SECONDS), "expected no loser");
}

@Test
@Timeout(5)
@Timeout(15)
public void exclusiveAccess() throws InterruptedException {
CountDownLatch winners = new CountDownLatch(1); // we expect 1 winner
CountDownLatch losers = new CountDownLatch(1); // we expect 1 loser
Thread t1 = new Thread(new Access(false, winners, losers, adapter, session, null));
Thread t2 = new Thread(new Access(false, winners, losers, adapter, session, null));
t1.start();
t2.start();
t1.join();
t2.join();
winners.await();
losers.await();
t1.join(5000);
t2.join(5000);
assertTrue(winners.await(5, TimeUnit.SECONDS), "expected a winner");
assertTrue(losers.await(5, TimeUnit.SECONDS), "expected a loser");
}

@Test
@Timeout(5)
@Timeout(15)
public void mixedAccess() throws InterruptedException {
CountDownLatch winners = new CountDownLatch(1); // we expect 1 winner
CountDownLatch losers = new CountDownLatch(1); // we expect 1 loser
Thread t1 = new Thread(new Access(true, winners, losers, adapter, session, null));
Thread t2 = new Thread(new Access(false, winners, losers, adapter, session, null));
t1.start();
t2.start();
t1.join();
t2.join();
winners.await();
losers.await();
t1.join(5000);
t2.join(5000);
assertTrue(winners.await(5, TimeUnit.SECONDS), "expected a winner");
assertTrue(losers.await(5, TimeUnit.SECONDS), "expected a loser");
}

@Test
@Timeout(5)
@Timeout(15)
public void nestedSharedShared() throws InterruptedException {
CountDownLatch winners = new CountDownLatch(2); // we expect 2 winners
CountDownLatch losers = new CountDownLatch(0); // we expect 0 losers
Thread t1 = new Thread(new Access(
true, winners, losers, adapter, session, new Access(true, winners, losers, adapter, session, null)));
t1.start();
t1.join();
winners.await();
losers.await();
t1.join(5000);
assertTrue(winners.await(5, TimeUnit.SECONDS), "expected both threads to win");
assertTrue(losers.await(5, TimeUnit.SECONDS), "expected no loser");
}

@Test
@Timeout(5)
@Timeout(15)
public void nestedExclusiveShared() throws InterruptedException {
CountDownLatch winners = new CountDownLatch(2); // we expect 2 winners
CountDownLatch losers = new CountDownLatch(0); // we expect 0 losers
Thread t1 = new Thread(new Access(
false, winners, losers, adapter, session, new Access(true, winners, losers, adapter, session, null)));
t1.start();
t1.join();
winners.await();
losers.await();
t1.join(5000);
assertTrue(winners.await(5, TimeUnit.SECONDS), "expected both threads to win");
assertTrue(losers.await(5, TimeUnit.SECONDS), "expected no loser");
}

@Test
@Timeout(5)
@Timeout(15)
public void nestedExclusiveExclusive() throws InterruptedException {
CountDownLatch winners = new CountDownLatch(2); // we expect 2 winners
CountDownLatch losers = new CountDownLatch(0); // we expect 0 losers
Thread t1 = new Thread(new Access(
false, winners, losers, adapter, session, new Access(false, winners, losers, adapter, session, null)));
t1.start();
t1.join();
winners.await();
losers.await();
t1.join(5000);
assertTrue(winners.await(5, TimeUnit.SECONDS), "expected both threads to win");
assertTrue(losers.await(5, TimeUnit.SECONDS), "expected no loser");
}

@Test
@Timeout(5)
@Timeout(15)
public void nestedSharedExclusive() throws InterruptedException {
CountDownLatch winners = new CountDownLatch(1); // we expect 1 winner (outer)
CountDownLatch losers = new CountDownLatch(1); // we expect 1 loser (inner)
Thread t1 = new Thread(new Access(
true, winners, losers, adapter, session, new Access(false, winners, losers, adapter, session, null)));
t1.start();
t1.join();
winners.await();
losers.await();
t1.join(5000);
assertTrue(winners.await(5, TimeUnit.SECONDS), "expected a winner");
assertTrue(losers.await(5, TimeUnit.SECONDS), "expected a loser");
}

private static class Access implements Runnable {
Expand Down Expand Up @@ -238,10 +238,10 @@ public void run() {
if (chained != null) {
chained.run();
}
loser.await();
loser.await(5, TimeUnit.SECONDS);
} catch (IllegalStateException | LockUpgradeNotSupportedException e) {
loser.countDown();
winner.await();
winner.await(5, TimeUnit.SECONDS);
}
} catch (InterruptedException e) {
fail("interrupted");
Expand Down
Loading
Loading