Skip to content

4.0 add retries for cluster overview test #748

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 2 commits into from
Jul 20, 2020
Merged

4.0 add retries for cluster overview test #748

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d51c9d9
Debugging cluster stress test
gjmwoods May 26, 2020
f529f4f
Add in a retry mechanism to account for leader elections in cluster f…
gjmwoods Jul 20, 2020
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
41 changes: 31 additions & 10 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 @@ -236,26 +236,47 @@ private void startNoWait( ClusterMember member )
private Set<ClusterMember> membersWithRole( ClusterMemberRole role )
{
Set<ClusterMember> membersWithRole = new HashSet<>();
int retryCount = 0;

Driver driver = driverToAnyCore( members, clusterDrivers );
final ClusterMemberRoleDiscovery discovery = clusterDrivers.getDiscovery();
final Map<BoltServerAddress,ClusterMemberRole> clusterOverview = discovery.findClusterOverview( driver );
for ( BoltServerAddress boltAddress : clusterOverview.keySet() )
while ( membersWithRole.isEmpty() && retryCount < 10 )
{
if ( role == clusterOverview.get( boltAddress ) )
Driver driver = driverToAnyCore( members, clusterDrivers );
final ClusterMemberRoleDiscovery discovery = clusterDrivers.getDiscovery();
final Map<BoltServerAddress,ClusterMemberRole> clusterOverview = discovery.findClusterOverview( driver );
for ( BoltServerAddress boltAddress : clusterOverview.keySet() )
{
ClusterMember member = findByBoltAddress( boltAddress, members );
if ( member == null )
if ( role == clusterOverview.get( boltAddress ) )
{
ClusterMember member = findByBoltAddress( boltAddress, members );
if ( member == null )
{
throw new IllegalStateException( "Unknown cluster member: '" + boltAddress + "'\n" + this );
}
membersWithRole.add( member );
}
}
retryCount++;

if ( !membersWithRole.isEmpty() )
{
break;
}
else
{
try
{
// give some time for cluster to stabilise
Thread.sleep( 2000 );
}
catch ( InterruptedException ignored )
{
throw new IllegalStateException( "Unknown cluster member: '" + boltAddress + "'\n" + this );
}
membersWithRole.add( member );
}
}

if ( membersWithRole.isEmpty() )
{
throw new IllegalStateException( "No cluster members with role '" + role + "' found.\n" + this );
throw new IllegalStateException( "No cluster members with role '" + role + " " + this );
}

return membersWithRole;
Expand Down