Skip to content

Get cluster URI from any core member in applicable cluster tests #1141

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

Get cluster URI from any core member in applicable cluster tests #1141

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
6 changes: 3 additions & 3 deletions driver/src/test/java/org/neo4j/driver/integration/TemporalTypesIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@
import java.time.ZonedDateTime;
import java.util.List;
import java.util.concurrent.ThreadLocalRandom;
import java.util.function.Function;
import java.util.function.Supplier;
import java.util.stream.Stream;

import org.neo4j.driver.internal.util.EnabledOnNeo4jWith;
import org.neo4j.driver.Record;
import org.neo4j.driver.Result;
import org.neo4j.driver.Value;
import org.neo4j.driver.internal.util.EnabledOnNeo4jWith;
import org.neo4j.driver.types.IsoDuration;
import java.util.function.Function;
import org.neo4j.driver.util.ParallelizableIT;
import org.neo4j.driver.util.SessionExtension;
import org.neo4j.driver.util.TemporalUtil;
Expand All @@ -48,10 +48,10 @@
import static java.util.Collections.singletonMap;
import static java.util.stream.Collectors.toList;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.neo4j.driver.internal.util.Neo4jFeature.TEMPORAL_TYPES;
import static org.neo4j.driver.Values.isoDuration;
import static org.neo4j.driver.Values.ofOffsetDateTime;
import static org.neo4j.driver.Values.parameters;
import static org.neo4j.driver.internal.util.Neo4jFeature.TEMPORAL_TYPES;

@EnabledOnNeo4jWith( TEMPORAL_TYPES )
@ParallelizableIT
Expand Down
30 changes: 14 additions & 16 deletions driver/src/test/java/org/neo4j/driver/stress/CausalClusteringIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ public Session newSession( AccessMode mode )
{
if ( driver == null )
{
driver = createDriver( clusterRule.getCluster().leader().getRoutingUri() );
driver = createDriver( clusterRule.getCluster().getRoutingUri() );
}

return driver.session( builder().withDefaultAccessMode( mode ).build() );
Expand Down Expand Up @@ -275,7 +275,7 @@ void shouldDropBrokenOldConnections() throws Exception
FakeClock clock = new FakeClock();
ChannelTrackingDriverFactory driverFactory = new ChannelTrackingDriverFactory( clock );

URI routingUri = cluster.leader().getRoutingUri();
URI routingUri = cluster.getRoutingUri();
AuthToken auth = clusterRule.getDefaultAuthToken();

try ( Driver driver = driverFactory.newInstance( routingUri, auth, RoutingSettings.DEFAULT, RetrySettings.DEFAULT, config, SecurityPlanImpl.insecure() ) )
Expand Down Expand Up @@ -458,10 +458,9 @@ void shouldAcceptMultipleBookmarks() throws Exception
String value = "Alice";

Cluster cluster = clusterRule.getCluster();
ClusterMember leader = cluster.leader();
executor = newExecutor();

try ( Driver driver = createDriver( leader.getRoutingUri() ) )
try ( Driver driver = createDriver( cluster.getRoutingUri() ) )
{
List<Future<Bookmark>> futures = new ArrayList<>();
for ( int i = 0; i < threadCount; i++ )
Expand Down Expand Up @@ -490,16 +489,18 @@ void shouldAcceptMultipleBookmarks() throws Exception
void shouldNotReuseReadConnectionForWriteTransaction()
{
Cluster cluster = clusterRule.getCluster();
ClusterMember leader = cluster.leader();

try ( Driver driver = createDriver( leader.getRoutingUri() ) )
try ( Driver driver = createDriver( cluster.getRoutingUri() ) )
{
AsyncSession session = driver.asyncSession( builder().withDefaultAccessMode( AccessMode.READ ).build() );

CompletionStage<List<RecordAndSummary>> resultsStage = session.runAsync( "RETURN 42" )
.thenCompose( cursor1 ->
session.writeTransactionAsync( tx -> tx.runAsync( "CREATE (:Node1) RETURN 42" )
.thenCompose( cursor2 -> combineCursors( cursor2, cursor1 ) ) ) );
.thenCompose( cursor1 ->
session.writeTransactionAsync(
tx -> tx.runAsync( "CREATE (:Node1) RETURN 42" )
.thenCompose(
cursor2 -> combineCursors( cursor2,
cursor1 ) ) ) );

List<RecordAndSummary> results = await( resultsStage );
assertEquals( 2, results.size() );
Expand Down Expand Up @@ -528,15 +529,14 @@ void shouldNotReuseReadConnectionForWriteTransaction()
void shouldRespectMaxConnectionPoolSizePerClusterMember()
{
Cluster cluster = clusterRule.getCluster();
ClusterMember leader = cluster.leader();

Config config = Config.builder()
.withMaxConnectionPoolSize( 2 )
.withConnectionAcquisitionTimeout( 42, MILLISECONDS )
.withLogging( DEV_NULL_LOGGING )
.build();

try ( Driver driver = createDriver( leader.getRoutingUri(), config ) )
try ( Driver driver = createDriver( cluster.getRoutingUri(), config ) )
{
Session writeSession1 = driver.session( builder().withDefaultAccessMode( AccessMode.WRITE ).build() );
writeSession1.beginTransaction();
Expand All @@ -561,11 +561,10 @@ void shouldRespectMaxConnectionPoolSizePerClusterMember()
void shouldAllowExistingTransactionToCompleteAfterDifferentConnectionBreaks()
{
Cluster cluster = clusterRule.getCluster();
ClusterMember leader = cluster.leader();

FailingConnectionDriverFactory driverFactory = new FailingConnectionDriverFactory();

try ( Driver driver = driverFactory.newInstance( leader.getRoutingUri(), clusterRule.getDefaultAuthToken(),
try ( Driver driver = driverFactory.newInstance( cluster.getRoutingUri(), clusterRule.getDefaultAuthToken(),
RoutingSettings.DEFAULT, RetrySettings.DEFAULT, configWithoutLogging(), SecurityPlanImpl.insecure() ) )
{
Session session1 = driver.session();
Expand Down Expand Up @@ -604,10 +603,9 @@ RoutingSettings.DEFAULT, RetrySettings.DEFAULT, configWithoutLogging(), Security
void shouldRediscoverWhenConnectionsToAllCoresBreak()
{
Cluster cluster = clusterRule.getCluster();
ClusterMember leader = cluster.leader();

ChannelTrackingDriverFactory driverFactory = new ChannelTrackingDriverFactory();
try ( Driver driver = driverFactory.newInstance( leader.getRoutingUri(), clusterRule.getDefaultAuthToken(),
try ( Driver driver = driverFactory.newInstance( cluster.getRoutingUri(), clusterRule.getDefaultAuthToken(),
RoutingSettings.DEFAULT, RetrySettings.DEFAULT, configWithoutLogging(), SecurityPlanImpl.insecure() ) )
{
try ( Session session = driver.session() )
Expand Down Expand Up @@ -673,7 +671,7 @@ void shouldKeepOperatingWhenConnectionsBreak() throws Exception
.withMaxTransactionRetryTime( testRunTimeMs, MILLISECONDS )
.build();

try ( Driver driver = driverFactory.newInstance( cluster.leader().getRoutingUri(), clusterRule.getDefaultAuthToken(),
try ( Driver driver = driverFactory.newInstance( cluster.getRoutingUri(), clusterRule.getDefaultAuthToken(),
RoutingSettings.DEFAULT, RetrySettings.DEFAULT, config, SecurityPlanImpl.insecure() ) )
{
List<Future<?>> results = new ArrayList<>();
Expand Down
42 changes: 5 additions & 37 deletions driver/src/test/java/org/neo4j/driver/util/cc/Cluster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,16 @@
package org.neo4j.driver.util.cc;

import java.io.FileNotFoundException;
import java.net.InetAddress;
import java.net.URI;
import java.net.UnknownHostException;
import java.nio.file.Path;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.TimeUnit;

import org.neo4j.driver.Bookmark;
import org.neo4j.driver.Driver;
import org.neo4j.driver.Record;
import org.neo4j.driver.internal.BoltServerAddress;
import org.neo4j.driver.util.TestUtil;
import org.neo4j.driver.util.cc.ClusterMemberRoleDiscoveryFactory.ClusterMemberRoleDiscovery;
Expand Down Expand Up @@ -71,6 +67,11 @@ Cluster withMembers( Set<ClusterMember> newMembers ) throws ClusterUnavailableEx
return new Cluster( path, newMembers, clusterDrivers );
}

public URI getRoutingUri()
{
return randomOf( cores() ).getRoutingUri();
}

public Path getPath()
{
return path;
Expand Down Expand Up @@ -165,13 +166,6 @@ public void stop( ClusterMember member )
waitForMembersToBeOnline();
}

public void kill( ClusterMember member )
{
removeOfflineMember( member );
SharedCluster.kill( member );
waitForMembersToBeOnline();
}

public Driver getDirectDriver( ClusterMember member )
{
return clusterDrivers.getDriver( member );
Expand Down Expand Up @@ -389,32 +383,6 @@ private static Set<BoltServerAddress> extractBoltAddresses( Set<ClusterMember> m
return addresses;
}

private static BoltServerAddress extractBoltAddress( Record record )
{
List<Object> addresses = record.get( "addresses" ).asList();
String boltUriString = (String) addresses.get( 0 );
URI boltUri = URI.create( boltUriString );
return newBoltServerAddress( boltUri );
}

private static BoltServerAddress newBoltServerAddress( URI uri )
{
try
{
return new BoltServerAddress( InetAddress.getByName( uri.getHost() ).getHostAddress(), uri.getPort() );
}
catch ( UnknownHostException e )
{
throw new RuntimeException( "Unable to resolve host to IP in URI: '" + uri + "'" );
}
}

private static ClusterMemberRole extractRole( Record record )
{
String roleString = record.get( "role" ).asString();
return ClusterMemberRole.valueOf( roleString.toUpperCase() );
}

private static ClusterMember findByBoltAddress( BoltServerAddress boltAddress, Set<ClusterMember> members )
{
for ( ClusterMember member : members )
Expand Down
2 changes: 1 addition & 1 deletion driver/src/test/java/org/neo4j/driver/util/cc/LocalOrRemoteClusterExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public void beforeAll( ExtensionContext context ) throws Exception
{
localClusterExtension = new ClusterExtension();
localClusterExtension.beforeAll( context );
clusterUri = localClusterExtension.getCluster().leader().getRoutingUri();
clusterUri = localClusterExtension.getCluster().getRoutingUri();
}
}

Expand Down
7 changes: 0 additions & 7 deletions driver/src/test/java/org/neo4j/driver/util/cc/SharedCluster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,6 @@ static void kill()
debug( "Cluster at `%s` killed.", clusterInstance.getPath() );
}

static void kill( ClusterMember member )
{
assertClusterExists();
ClusterControl.killClusterMember( member.getPath() );
debug( "Cluster member at `%s` killed.", member.getPath() );
}

private static Set<ClusterMember> parseStartCommandOutput( String output )
{
Set<ClusterMember> result = new HashSet<>();
Expand Down