Skip to content

CURATOR-593: Append chroot for EnsembleProvider::setConnectionString in EnsembleTracker #460

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

Merged
kezhuw merged 2 commits into from
May 23, 2023
Merged

CURATOR-593: Append chroot for EnsembleProvider::setConnectionString in EnsembleTracker #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
077ce3c
CURATOR-593: Append chroot for EnsembleProvider::setConnectionString …
kezhuw May 5, 2023
28b27c6
fixup! CURATOR-593: Append chroot for EnsembleProvider::setConnection…
kezhuw May 22, 2023
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
11 changes: 9 additions & 2 deletions curator-framework/src/main/java/org/apache/curator/framework/imps/EnsembleTracker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,10 +209,17 @@ private void processConfigData(byte[] data) throws Exception
if (!properties.isEmpty())
{
QuorumMaj newConfig = new QuorumMaj(properties);
String connectionString = configToConnectionString(newConfig);
if (connectionString.trim().length() > 0)
String connectionString = configToConnectionString(newConfig).trim();
if (!connectionString.isEmpty())
{
currentConfig.set(newConfig);
String oldConnectionString = ensembleProvider.getConnectionString();
int i = oldConnectionString.indexOf('/');
if (i >= 0)
{
String chroot = oldConnectionString.substring(i);
connectionString += chroot;
}
ensembleProvider.setConnectionString(connectionString);
}
else
Expand Down
68 changes: 65 additions & 3 deletions curator-framework/src/test/java/org/apache/curator/framework/imps/TestReconfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;

import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
Expand Down Expand Up @@ -436,6 +437,52 @@ public void testNewMembers() throws Exception
}
}

@Test
public void testRemoveWithChroot() throws Exception
{
// Use a long chroot path to circumvent ZOOKEEPER-4565 and ZOOKEEPER-4601
String chroot = "/pretty-long-chroot";
CountDownLatch ensembleLatch = new CountDownLatch(1);

try (CuratorFramework client = newClient(cluster.getConnectString() + chroot, ensembleLatch)) {
client.start();
client.create().forPath("/", "deadbeef".getBytes());

QuorumVerifier oldConfig = toQuorumVerifier(client.getConfig().forEnsemble());
assertConfig(oldConfig, cluster.getInstances());

CountDownLatch latch = setChangeWaiter(client);

Collection<InstanceSpec> oldInstances = cluster.getInstances();
InstanceSpec us = cluster.findConnectionInstance(client.getZookeeperClient().getZooKeeper());
InstanceSpec removeSpec = oldInstances.iterator().next();
if ( us.equals(removeSpec) ) {
Iterator<InstanceSpec> iterator = oldInstances.iterator();
iterator.next();
removeSpec = iterator.next();
}

client.reconfig().leaving(Integer.toString(removeSpec.getServerId())).fromConfig(oldConfig.getVersion()).forEnsemble();

assertTrue(timing.awaitLatch(latch));

byte[] newConfigData = client.getConfig().forEnsemble();
QuorumVerifier newConfig = toQuorumVerifier(newConfigData);
List<InstanceSpec> newInstances = Lists.newArrayList(cluster.getInstances());
newInstances.remove(removeSpec);
assertConfig(newConfig, newInstances);

assertTrue(timing.awaitLatch(ensembleLatch));
String connectString = EnsembleTracker.configToConnectionString(newConfig) + chroot;
assertEquals(connectString, ensembleProvider.getConnectionString());

client.getZookeeperClient().reset();
client.sync().forPath("/");
byte[] data = client.getData().forPath("/");
assertThat(data).asString().isEqualTo("deadbeef");
}
}

@Test
public void testConfigToConnectionStringIPv4Normal() throws Exception
{
Expand Down Expand Up @@ -555,7 +602,17 @@ private CuratorFramework newClient(String connectionString) {
return newClient(connectionString, true);
}

private CuratorFramework newClient(String connectionString, boolean withEnsembleProvider)
private CuratorFramework newClient(String connectionString, boolean withEnsembleTracker)
{
return newClient(connectionString, withEnsembleTracker, null);
}

private CuratorFramework newClient(String connectionString, CountDownLatch ensembleLatch)
{
return newClient(connectionString, ensembleLatch != null, ensembleLatch);
}

private CuratorFramework newClient(String connectionString, boolean withEnsembleTracker, CountDownLatch ensembleLatch)
{
final AtomicReference<String> connectString = new AtomicReference<>(connectionString);
ensembleProvider = new EnsembleProvider()
Expand Down Expand Up @@ -585,12 +642,17 @@ public void close() throws IOException
@Override
public void setConnectionString(String connectionString)
{
connectString.set(connectionString);
if (!connectionString.equals(getConnectionString())) {
connectString.set(connectionString);
if (ensembleLatch != null) {
ensembleLatch.countDown();
}
}
}
};
return CuratorFrameworkFactory.builder()
.ensembleProvider(ensembleProvider)
.ensembleTracker(withEnsembleProvider)
.ensembleTracker(withEnsembleTracker)
.sessionTimeoutMs(timing.session())
.connectionTimeoutMs(timing.connection())
.authorization("digest", superUserPassword.getBytes())
Expand Down