Skip to content

Commit 7e857ab

Browse files
author
Zhen Li
committed
Fix the error where the cluster memeber cannot be started in tests.
The cluster memeber shutdown requires proper stop call rather than kill to ensure the databases are closed properly in 4.0. Also the status check shall not assume a LEADER is always presented in the cluster.
1 parent 0f74b0b commit 7e857ab

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

driver/src/test/java/org/neo4j/driver/v1/integration/CausalClusteringIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ void shouldNotServeWritesWhenMajorityOfCoresAreDead()
386386
Set<ClusterMember> cores = cluster.cores();
387387
for ( ClusterMember follower : cluster.followers() )
388388
{
389-
cluster.kill( follower );
389+
cluster.stop( follower );
390390
}
391391
awaitLeaderToStepDown( cores );
392392

@@ -428,7 +428,7 @@ void shouldServeReadsWhenMajorityOfCoresAreDead()
428428
Set<ClusterMember> cores = cluster.cores();
429429
for ( ClusterMember follower : cluster.followers() )
430430
{
431-
cluster.kill( follower );
431+
cluster.stop( follower );
432432
}
433433
awaitLeaderToStepDown( cores );
434434

driver/src/test/java/org/neo4j/driver/v1/integration/CredentialsIT.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
import java.util.Map;
2727

2828
import org.neo4j.driver.internal.security.InternalAuthToken;
29+
import org.neo4j.driver.internal.util.DisabledOnNeo4jWith;
30+
import org.neo4j.driver.internal.util.Neo4jFeature;
2931
import org.neo4j.driver.v1.AuthToken;
3032
import org.neo4j.driver.v1.AuthTokens;
3133
import org.neo4j.driver.v1.Config;
@@ -58,6 +60,8 @@ class CredentialsIT
5860
static final DatabaseExtension neo4j = new DatabaseExtension();
5961

6062
@Test
63+
@DisabledOnNeo4jWith( Neo4jFeature.BOLT_V4 )
64+
// This feature is removed in 4.0
6165
void shouldBePossibleToChangePassword() throws Exception
6266
{
6367
String newPassword = "secret";

driver/src/test/java/org/neo4j/driver/v1/util/cc/Cluster.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -273,11 +273,7 @@ private static void waitForMembersToBeOnline( Set<ClusterMember> members, Cluste
273273
try
274274
{
275275
final Map<BoltServerAddress,ClusterMemberRole> clusterOverview = discovery.findClusterOverview( driver );
276-
// we will wait until the leader is online
277-
if ( clusterOverview.containsValue( ClusterMemberRole.LEADER ) )
278-
{
279-
actualOnlineAddresses = clusterOverview.keySet();
280-
}
276+
actualOnlineAddresses = clusterOverview.keySet();
281277
}
282278
catch ( Throwable t )
283279
{

0 commit comments

Comments
 (0)