Skip to content

Fix logging IP version 6 addresses with scope in RediscoveryImpl #1520

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

Closed
wants to merge 1 commit into from
Closed

Fix logging IP version 6 addresses with scope in RediscoveryImpl #1520

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
7 changes: 3 additions & 4 deletions driver/src/main/java/org/neo4j/driver/internal/cluster/RediscoveryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,13 +299,12 @@ private ClusterComposition handleRoutingProcedureError(
throw new CompletionException(error);
}

// Retriable error happened during discovery.
// Retryable error happened during discovery.
DiscoveryException discoveryError =
new DiscoveryException(format(RECOVERABLE_ROUTING_ERROR, routerAddress), error);
Futures.combineErrors(baseError, discoveryError); // we record each failure here
String warningMessage = format(RECOVERABLE_DISCOVERY_ERROR_WITH_SERVER, routerAddress);
log.warn(warningMessage);
log.debug(warningMessage, discoveryError);
log.warn(RECOVERABLE_DISCOVERY_ERROR_WITH_SERVER, routerAddress);
log.debug(format(RECOVERABLE_DISCOVERY_ERROR_WITH_SERVER, routerAddress), discoveryError);
routingTable.forget(routerAddress);
return null;
}
Expand Down
41 changes: 41 additions & 0 deletions driver/src/test/java/org/neo4j/driver/internal/cluster/RediscoveryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.startsWith;
Expand All @@ -52,9 +54,11 @@
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
Expand Down Expand Up @@ -524,6 +528,43 @@ void shouldResolveToIP() throws UnknownHostException {
assertEquals(new BoltServerAddress(A.host(), localhost.getHostAddress(), A.port()), addresses.get(0));
}

@Test
void shouldLogScopedIPV6AddressWithStringFormattingLogger() throws UnknownHostException {
// GIVEN
BoltServerAddress initialRouter = new BoltServerAddress("initialRouter", 7687);
ClusterCompositionProvider compositionProvider = compositionProviderMock(Collections.emptyMap());
ServerAddressResolver resolver = resolverMock(initialRouter, initialRouter);
DomainNameResolver domainNameResolver = mock(DomainNameResolver.class);
InetAddress address = mock(InetAddress.class);
given(address.getHostAddress()).willReturn("fe80:0:0:0:ce66:1564:db8q:94b6%6");
given(domainNameResolver.resolve(initialRouter.host())).willReturn(new InetAddress[] {address});
RoutingTable table = routingTableMock(true);
ConnectionPool pool = mock(ConnectionPool.class);
CompletableFuture<Connection> failedAcquisition = new CompletableFuture<>();
failedAcquisition.completeExceptionally(new ServiceUnavailableException("not available"));
given(pool.acquire(any())).willReturn(failedAcquisition);
Logging logging = mock(Logging.class);
Logger logger = mock(Logger.class);
given(logging.getLog(any(Class.class))).willReturn(logger);
doAnswer(invocationOnMock -> String.format(invocationOnMock.getArgument(0), invocationOnMock.getArgument(1)))
.when(logger)
.warn(any());
RoutingSettings settings = new RoutingSettings(1, 0, 0);
RediscoveryImpl rediscovery = new RediscoveryImpl(
initialRouter,
settings,
compositionProvider,
GlobalEventExecutor.INSTANCE,
resolver,
logging,
domainNameResolver);

// WHEN & THEN
assertThrows(
ServiceUnavailableException.class,
() -> await(rediscovery.lookupClusterComposition(table, pool, null, null)));
}

private Rediscovery newRediscovery(
BoltServerAddress initialRouter,
ClusterCompositionProvider compositionProvider,
Expand Down