Skip to content

[fix][client] Fix authentication not update after changing the serviceUrl #19510

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
nodece merged 1 commit into from
Feb 14, 2023
Merged

[fix][client] Fix authentication not update after changing the serviceUrl #19510

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
1 change: 1 addition & 0 deletions pulsar-client/src/main/java/org/apache/pulsar/client/impl/AutoClusterFailover.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ private void updateServiceUrl(String target,
}

pulsarClient.updateServiceUrl(target);
pulsarClient.reloadLookUp();
currentPulsarServiceUrl = target;
} catch (IOException e) {
log.error("Current Pulsar service is {}, "
Expand Down
1 change: 1 addition & 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 @@ -138,6 +138,7 @@ public void initialize(PulsarClient client) {
}

pulsarClient.updateServiceUrl(serviceUrl);
pulsarClient.reloadLookUp();
currentPulsarServiceUrl = serviceUrl;
currentControlledConfiguration = controlledConfiguration;
}
Expand Down
2 changes: 2 additions & 0 deletions pulsar-client/src/test/java/org/apache/pulsar/client/impl/AutoClusterFailoverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,12 +224,14 @@ public void testAutoClusterFailoverSwitchWithAuthentication() throws IOException
autoClusterFailover.initialize(pulsarClient);

Awaitility.await().untilAsserted(() -> assertEquals(autoClusterFailover.getServiceUrl(), secondary));
Mockito.verify(pulsarClient, Mockito.atLeastOnce()).reloadLookUp();
Mockito.verify(pulsarClient, Mockito.atLeastOnce()).updateTlsTrustCertsFilePath(secondaryTlsTrustCertsFilePath);
Mockito.verify(pulsarClient, Mockito.atLeastOnce()).updateAuthentication(secondaryAuthentication);

// primary cluster came back
Mockito.doReturn(true).when(autoClusterFailover).probeAvailable(primary);
Awaitility.await().untilAsserted(() -> assertEquals(autoClusterFailover.getServiceUrl(), primary));
Mockito.verify(pulsarClient, Mockito.atLeastOnce()).reloadLookUp();
Mockito.verify(pulsarClient, Mockito.atLeastOnce()).updateTlsTrustCertsFilePath(primaryTlsTrustCertsFilePath);
Mockito.verify(pulsarClient, Mockito.atLeastOnce()).updateAuthentication(primaryAuthentication);

Expand Down
1 change: 1 addition & 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 @@ -121,6 +121,7 @@ public void testControlledClusterFailoverSwitch() throws IOException {

Awaitility.await().untilAsserted(() ->
Assert.assertEquals(backupServiceUrlV1, controlledClusterFailover.getServiceUrl()));
Mockito.verify(pulsarClient, Mockito.atLeastOnce()).reloadLookUp();
Mockito.verify(pulsarClient, Mockito.atLeastOnce()).updateServiceUrl(backupServiceUrlV1);
Mockito.verify(pulsarClient, Mockito.atLeastOnce())
.updateTlsTrustCertsFilePath(tlsTrustCertsFilePathV1);
Expand Down