Skip to content

[fix][client] ControlledClusterFailover avoid unnecessary reconnection. #25178

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
thetumbled merged 2 commits into from
Jan 23, 2026
Merged

[fix][client] ControlledClusterFailover avoid unnecessary reconnection. #25178

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
5ee167b
avoid unnecessary reconnection on first scheduled check when the conf…
Jan 23, 2026
7488cb2
fix test.
Jan 23, 2026
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
10 changes: 10 additions & 0 deletions pulsar-client/src/main/java/org/apache/pulsar/client/impl/ControlledClusterFailover.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import org.apache.pulsar.client.api.ControlledClusterFailoverBuilder;
import org.apache.pulsar.client.api.PulsarClient;
import org.apache.pulsar.client.api.ServiceUrlProvider;
import org.apache.pulsar.client.impl.conf.ClientConfigurationData;
import org.apache.pulsar.client.util.ExecutorProvider;
import org.apache.pulsar.common.util.ObjectMapperFactory;
import org.asynchttpclient.AsyncHttpClient;
Expand Down Expand Up @@ -119,6 +120,15 @@ public void initialize(PulsarClient client) {
.addHeader("Accept", "application/json");
headers.forEach(requestBuilder::addHeader);

// Initialize currentControlledConfiguration from client's current configuration
// to avoid unnecessary reconnection on first scheduled check when the configuration hasn't changed
ClientConfigurationData conf = pulsarClient.getConfiguration();
this.currentControlledConfiguration = new ControlledConfiguration();
this.currentControlledConfiguration.setServiceUrl(currentPulsarServiceUrl);
this.currentControlledConfiguration.setTlsTrustCertsFilePath(conf.getTlsTrustCertsFilePath());
this.currentControlledConfiguration.setAuthPluginClassName(conf.getAuthPluginClassName());
this.currentControlledConfiguration.setAuthParamsString(conf.getAuthParams());

// start to check service url every 30 seconds
this.executor.scheduleAtFixedRate(catchingAndLoggingThrowables(() -> {
ControlledConfiguration controlledConfiguration = null;
Expand Down
5 changes: 5 additions & 0 deletions pulsar-client/src/test/java/org/apache/pulsar/client/impl/ControlledClusterFailoverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import lombok.Cleanup;
import org.apache.pulsar.client.api.Authentication;
import org.apache.pulsar.client.api.ServiceUrlProvider;
import org.apache.pulsar.client.impl.conf.ClientConfigurationData;
import org.asynchttpclient.Request;
import org.awaitility.Awaitility;
import org.mockito.Mockito;
Expand Down Expand Up @@ -57,7 +58,9 @@ public void testBuildControlledClusterFailoverInstance() throws Exception {

PulsarClientImpl pulsarClient = mock(PulsarClientImpl.class);
ConnectionPool connectionPool = mock(ConnectionPool.class);
ClientConfigurationData clientConf = new ClientConfigurationData();
when(pulsarClient.getCnxPool()).thenReturn(connectionPool);
when(pulsarClient.getConfiguration()).thenReturn(clientConf);
controlledClusterFailover.initialize(pulsarClient);

Request request = controlledClusterFailover.getRequestBuilder().build();
Expand Down Expand Up @@ -97,7 +100,9 @@ public void testControlledClusterFailoverSwitch() throws Exception {
ControlledClusterFailover controlledClusterFailover = Mockito.spy((ControlledClusterFailover) provider);
PulsarClientImpl pulsarClient = mock(PulsarClientImpl.class);
ConnectionPool connectionPool = mock(ConnectionPool.class);
ClientConfigurationData clientConf = new ClientConfigurationData();
when(pulsarClient.getCnxPool()).thenReturn(connectionPool);
when(pulsarClient.getConfiguration()).thenReturn(clientConf);

controlledClusterFailover.initialize(pulsarClient);

Expand Down
Loading