From e6b1cc07a6bf959d84c02dd651d6f51a8e5ebec5 Mon Sep 17 00:00:00 2001 From: jimwebber Date: Wed, 10 Aug 2016 11:09:47 +0100 Subject: [PATCH] Tweaking Config Properties Changed the property names and default values to reflect their use inside the code and to reduce ambiguity (particularly around the term "cluster" which is used extensively). --- .../core/CoreEdgeClusterSettings.java | 22 +++++++++---------- .../discovery/HazelcastServerLifecycle.java | 4 ++-- .../coreedge/discovery/CoreClusterMember.java | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/CoreEdgeClusterSettings.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/CoreEdgeClusterSettings.java index 5b30dc48f6532..a9f832305f9b6 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/CoreEdgeClusterSettings.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/core/CoreEdgeClusterSettings.java @@ -46,7 +46,7 @@ @Description("Settings for Core-Edge Clusters") public class CoreEdgeClusterSettings { - public static final Function LISTEN_SOCKET_ADDRESS = new Function LISTEN_SOCKET_ADDRESS = new Function() { @Override @@ -63,7 +63,7 @@ public String toString() } }; - public static final Function ADVERTISED_SOCKET_ADDRESS = new Function ADVERTISED_SOCKET_ADDRESS = new Function() { @Override @@ -121,25 +121,25 @@ public String toString() public static final Setting lock_read_timeout = setting( "core_edge.lock_read_timeout", DURATION, "20s" ); - @Description("Network interface and port for the RAFT server to listen on.") + @Description("Network interface and port for the transaction shipping server to listen on.") public static final Setting transaction_listen_address = - setting( "core_edge.transaction_listen_address", LISTEN_SOCKET_ADDRESS, "0.0.0.0:6001" ); + setting( "core_edge.transaction_listen_address", LISTEN_SOCKET_ADDRESS, "0.0.0.0:6000" ); - @Description("Hostname/IP address and port that other RAFT servers can use to communicate with us.") + @Description("Hostname/IP address and port for the transaction shipping server to listen on.") public static final Setting transaction_advertised_address = - setting( "core_edge.transaction_advertised_address", ADVERTISED_SOCKET_ADDRESS, "localhost:6001" ); + setting( "core_edge.transaction_advertised_address", ADVERTISED_SOCKET_ADDRESS, "localhost:6000" ); @Description("Network interface and port for the RAFT server to listen on.") public static final Setting raft_listen_address = - setting( "core_edge.raft_listen_address", LISTEN_SOCKET_ADDRESS, "0.0.0.0:7400" ); + setting( "core_edge.raft_listen_address", LISTEN_SOCKET_ADDRESS, "0.0.0.0:7000" ); - @Description("Hostname/IP address and port that other RAFT servers can use to communicate with us.") + @Description("Hostname/IP address and port for the RAFT server to listen on.") public static final Setting raft_advertised_address = - setting( "core_edge.raft_advertised_address", ADVERTISED_SOCKET_ADDRESS, "localhost:7400" ); + setting( "core_edge.raft_advertised_address", ADVERTISED_SOCKET_ADDRESS, "localhost:7000" ); @Description("Host and port to bind the cluster management communication.") - public static final Setting cluster_listen_address = - setting( "core_edge.cluster_listen_address", LISTEN_SOCKET_ADDRESS, "0.0.0.0:5001" ); + public static final Setting hazelcast_listen_address = + setting( "core_edge.hazelcast_listen_address", LISTEN_SOCKET_ADDRESS, "0.0.0.0:5000" ); @Description("A comma-separated list of other members of the cluster to join.") public static final Setting> initial_core_cluster_members = diff --git a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/HazelcastServerLifecycle.java b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/HazelcastServerLifecycle.java index ca6818515732c..e1c9769139cea 100644 --- a/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/HazelcastServerLifecycle.java +++ b/enterprise/core-edge/src/main/java/org/neo4j/coreedge/discovery/HazelcastServerLifecycle.java @@ -103,8 +103,8 @@ private HazelcastInstance createHazelcastInstance() log.info( "Discovering cluster with initial members: " + initialMembers ); NetworkConfig networkConfig = new NetworkConfig(); - ListenSocketAddress address = config.get( CoreEdgeClusterSettings.cluster_listen_address ); - networkConfig.setPort( address.socketAddress().getPort() ); + ListenSocketAddress hazelcastAddress = config.get( CoreEdgeClusterSettings.hazelcast_listen_address ); + networkConfig.setPort( hazelcastAddress.socketAddress().getPort() ); networkConfig.setJoin( joinConfig ); com.hazelcast.config.Config c = new com.hazelcast.config.Config(); diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/CoreClusterMember.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/CoreClusterMember.java index ea88ae3e19d3e..7401992933df7 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/CoreClusterMember.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/CoreClusterMember.java @@ -53,7 +53,7 @@ public class CoreClusterMember private final int serverId; private CoreGraphDatabase database; - public static final String CLUSTER_NAME = "core-neo4j"; + static final String CLUSTER_NAME = "core-neo4j"; public CoreClusterMember( int serverId, int clusterSize, List addresses, @@ -77,7 +77,7 @@ public CoreClusterMember( int serverId, int clusterSize, params.put( CoreEdgeClusterSettings.cluster_name.name(), CLUSTER_NAME ); params.put( CoreEdgeClusterSettings.initial_core_cluster_members.name(), initialMembers ); params.put( GraphDatabaseSettings.record_format.name(), recordFormat ); - params.put( CoreEdgeClusterSettings.cluster_listen_address.name(), "localhost:" + clusterPort ); + params.put( CoreEdgeClusterSettings.hazelcast_listen_address.name(), "localhost:" + clusterPort ); params.put( CoreEdgeClusterSettings.transaction_advertised_address.name(), "localhost:" + txPort ); params.put( CoreEdgeClusterSettings.transaction_listen_address.name(), "127.0.0.1:" + txPort ); params.put( CoreEdgeClusterSettings.raft_advertised_address.name(), "localhost:" + raftPort );