Skip to content

NO-JIRA half the runtime of CuratorDistributedLockTest with cluster r… #6588

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
gtully wants to merge 1 commit into
base: main
Choose a base branch
from
+66 −24
Open

NO-JIRA half the runtime of CuratorDistributedLockTest with cluster r… #6588

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
90 changes: 66 additions & 24 deletions ...st/java/org/apache/activemq/artemis/lockmanager/zookeeper/CuratorDistributedLockTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@
import org.apache.curator.test.InstanceSpec;
import org.apache.curator.test.TestingCluster;
import org.apache.curator.test.TestingZooKeeperServer;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
Expand All @@ -55,43 +57,72 @@ public class CuratorDistributedLockTest extends DistributedLockTest {
private static final int ZK_NODES = Boolean.getBoolean("fast-tests") ? 1 : 3;

private static final int BASE_SERVER_PORT = 6666;
private static final int CONNECTION_MS = 2000;
private static final int CONNECTION_MS = 500;
// Beware: the server tick must be small enough that to let the session to be correctly expired
private static final int SESSION_MS = 6000;
private static final int SERVER_TICK_MS = 2000;
private static final int SESSION_MS = 1000;
private static final int SERVER_TICK_MS = 100;
private static final int RETRIES_MS = 100;
private static final int RETRIES = 1;

public int zkNodes;
private TestingCluster testingServer;
private InstanceSpec[] clusterSpecs;
private String connectString;
private static TestingCluster testingServer;
private static InstanceSpec[] clusterSpecs;
private static String connectString;
private boolean clusterDirty;

// Temp folder at ./target/tmp/<TestClassName>/<generated>
@TempDir(factory = TargetTempDirFactory.class)
public File tmpFolder;
public static File tmpFolder;

@BeforeEach
@Override
public void setupEnv() throws Throwable {
zkNodes = ZK_NODES; // The number of nodes to use, based on test profile.
@BeforeAll
static void startCluster() throws Exception {
createCluster();
}

clusterSpecs = new InstanceSpec[zkNodes];
for (int i = 0; i < zkNodes; i++) {
@AfterAll
static void tearDownCluster() throws Exception {
destroyCluster();
}

private static void createCluster() throws Exception {
clusterSpecs = new InstanceSpec[ZK_NODES];
for (int i = 0; i < ZK_NODES; i++) {
clusterSpecs[i] = new InstanceSpec(newFolder(tmpFolder, "node" + i), BASE_SERVER_PORT + i, -1, -1, true, i, SERVER_TICK_MS, -1);
}
testingServer = new TestingCluster(clusterSpecs);
testingServer.start();
connectString = testingServer.getConnectString();
}

private static void destroyCluster() {
if (testingServer != null) {
try {
testingServer.stop();
} catch (Exception e) {
}
try {
testingServer.close();
} catch (Exception e) {
}
}
}

@BeforeEach
@Override
public void setupEnv() throws Throwable {
zkNodes = ZK_NODES;
clusterDirty = false;
super.setupEnv();
}

@AfterEach
@Override
public void tearDownEnv() throws Throwable {
super.tearDownEnv();
testingServer.stop();
testingServer.close();
if (clusterDirty) {
destroyCluster();
createCluster();
}
}

@Override
Expand Down Expand Up @@ -128,7 +159,7 @@ public void canAcquireLocksFromDifferentNamespace() throws Exception {
@Test
public void cannotStartManagerWithDisconnectedServer() throws Exception {
final DistributedLockManager manager = createManagedDistributeManager();
testingServer.close();
closeCluster();
assertFalse(manager.start(1, TimeUnit.SECONDS));
}

Expand All @@ -141,7 +172,7 @@ public void cannotAcquireLockWithDisconnectedServer() throws Exception {
final CountDownLatch notAvailable = new CountDownLatch(1);
final DistributedLock.UnavailableLockListener listener = notAvailable::countDown;
lock.addListener(listener);
testingServer.close();
closeCluster();
assertTrue(notAvailable.await(30, TimeUnit.SECONDS));
lock.tryLock();
});
Expand All @@ -153,7 +184,7 @@ public void cannotTryLockWithDisconnectedServer() throws Exception {
final DistributedLockManager manager = createManagedDistributeManager();
manager.start();
final DistributedLock lock = manager.getDistributedLock("a");
testingServer.close();
closeCluster();
lock.tryLock();
});
}
Expand All @@ -166,7 +197,7 @@ public void cannotCheckLockStatusWithDisconnectedServer() throws Exception {
final DistributedLock lock = manager.getDistributedLock("a");
assertFalse(lock.isHeldByCaller());
assertTrue(lock.tryLock());
testingServer.close();
closeCluster();
lock.isHeldByCaller();
});
}
Expand All @@ -182,7 +213,7 @@ public void looseLockAfterServerStop() throws ExecutionException, InterruptedExc
final DistributedLock.UnavailableLockListener listener = notAvailable::countDown;
lock.addListener(listener);
assertEquals(1, notAvailable.getCount());
testingServer.close();
closeCluster();
assertTrue(notAvailable.await(30, TimeUnit.SECONDS));
lock.isHeldByCaller();
});
Expand All @@ -200,7 +231,7 @@ public void canAcquireLockOnMajorityRestart() throws Exception {
final DistributedLock.UnavailableLockListener listener = notAvailable::countDown;
lock.addListener(listener);
assertEquals(1, notAvailable.getCount());
testingServer.stop();
stopCluster();
notAvailable.await();
manager.stop();
restartMajorityNodes(true);
Expand Down Expand Up @@ -316,8 +347,8 @@ public void beNotifiedOfUnavailabilityWhileBlockedOnTimedLock() throws Exception
assertTrue(startedTimedLock.await(10, TimeUnit.SECONDS));
TimeUnit.SECONDS.sleep(1);
stopMajority(true);
TimeUnit.MILLISECONDS.sleep(SESSION_MS + CONNECTION_MS);
Wait.waitFor(() -> unavailableLock.get() > 0, SERVER_TICK_MS);
Wait.waitFor(() -> unavailableLock.get() > 0, SESSION_MS + CONNECTION_MS + SERVER_TICK_MS);
Wait.waitFor(() -> unavailableManager.get() > 0, SESSION_MS + CONNECTION_MS);
assertEquals(1, unavailableManager.get());
Boolean result = unavailableTimedLock.get();
assertNotNull(result);
Expand Down Expand Up @@ -348,7 +379,18 @@ public void beNotifiedOfAlreadyUnavailableManagerAfterAddingListener() throws Ex
}
}

private void stopCluster() throws Exception {
clusterDirty = true;
testingServer.stop();
}

private void closeCluster() throws IOException {
clusterDirty = true;
testingServer.close();
}

private void stopMajority(boolean fromLast) throws Exception {
clusterDirty = true;
List<TestingZooKeeperServer> followers = testingServer.getServers();
final int quorum = (zkNodes / 2) + 1;
for (int i = 0; i < quorum; i++) {
Expand All @@ -369,7 +411,7 @@ private void restartMajorityNodes(boolean startFromLast) throws Exception {

private static File newFolder(File root, String subFolder) throws IOException {
File result = new File(root, subFolder);
if (!result.mkdirs()) {
if (!result.mkdirs() && !result.isDirectory()) {
throw new IOException("Couldn't create folders " + root);
}
return result;
Expand Down
Loading