Revert "Revert "Merge pull request #9128 from mneedham/3.1-listen-on-…

…specified-host-attempt-2"" This reverts commit 30c5cf6.
neo4j · Apr 3, 2017 · c7fd978 · c7fd978
1 parent 30c5cf6
commit c7fd978
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 14 deletions.
diff --git a/...ring/src/main/java/org/neo4j/causalclustering/discovery/HazelcastCoreTopologyService.java b/...ring/src/main/java/org/neo4j/causalclustering/discovery/HazelcastCoreTopologyService.java
@@ -153,7 +153,11 @@ private HazelcastInstance createHazelcastInstance()
         ListenSocketAddress hazelcastAddress = config.get( discovery_listen_address );
         InterfacesConfig interfaces = new InterfacesConfig();
         interfaces.addInterface( hazelcastAddress.getHostname() );
-        interfaces.setEnabled( true );
+
+        if ( !hazelcastAddress.getHostname().equals( "0.0.0.0" ) )
+        {
+            interfaces.setEnabled( true );
+        }
 
         NetworkConfig networkConfig = new NetworkConfig();
         networkConfig.setInterfaces( interfaces );

diff --git a/...usal-clustering/src/test/java/org/neo4j/causalclustering/discovery/CoreClusterMember.java b/...usal-clustering/src/test/java/org/neo4j/causalclustering/discovery/CoreClusterMember.java
@@ -80,28 +80,31 @@ public CoreClusterMember( int serverId, int clusterSize,
 
         String initialMembers = addresses.stream().map( AdvertisedSocketAddress::toString ).collect( joining( "," ) );
 
-        config.put( "dbms.mode", "CORE" );
-        config.put( GraphDatabaseSettings.default_advertised_address.name(), "localhost" );
+        AdvertisedSocketAddress advertisedSocketAddress = Cluster.socketAddressForServer( serverId );
+        String advertisedAddress = advertisedSocketAddress.getHostname();
+        String listenAddress = "127.0.0.1";
+
+        config.put( ClusterSettings.mode.name(), ClusterSettings.Mode.CORE.name() );
+        config.put( GraphDatabaseSettings.default_advertised_address.name(), advertisedAddress );
         config.put( CausalClusteringSettings.initial_discovery_members.name(), initialMembers );
-        config.put( CausalClusteringSettings.discovery_listen_address.name(), "127.0.0.1:" + hazelcastPort );
-        config.put( CausalClusteringSettings.transaction_listen_address.name(), "127.0.0.1:" + txPort );
-        config.put( CausalClusteringSettings.raft_listen_address.name(), "127.0.0.1:" + raftPort );
+        config.put( CausalClusteringSettings.discovery_listen_address.name(), listenAddress + ":" + hazelcastPort );
+        config.put( CausalClusteringSettings.transaction_listen_address.name(), listenAddress + ":" + txPort );
+        config.put( CausalClusteringSettings.raft_listen_address.name(), listenAddress + ":" + raftPort );
         config.put( CausalClusteringSettings.cluster_topology_refresh.name(), "1000ms" );
         config.put( CausalClusteringSettings.expected_core_cluster_size.name(), String.valueOf( clusterSize ) );
         config.put( CausalClusteringSettings.leader_election_timeout.name(), "500ms" );
         config.put( CausalClusteringSettings.raft_messages_log_enable.name(), Settings.TRUE );
         config.put( GraphDatabaseSettings.store_internal_log_level.name(), Level.DEBUG.name() );
         config.put( GraphDatabaseSettings.record_format.name(), recordFormat );
-        config.put( new GraphDatabaseSettings.BoltConnector( "bolt" ).type.name(), "BOLT" );
-        config.put( new GraphDatabaseSettings.BoltConnector( "bolt" ).enabled.name(), "true" );
-        config.put( new GraphDatabaseSettings.BoltConnector( "bolt" ).listen_address.name(), "127.0.0.1:" + boltPort );
-        boltAdvertisedAddress = "127.0.0.1:" + boltPort;
-        config.put( new GraphDatabaseSettings.BoltConnector( "bolt" ).advertised_address.name(), boltAdvertisedAddress );
+        config.put( new BoltConnector( "bolt" ).type.name(), "BOLT" );
+        config.put( new BoltConnector( "bolt" ).enabled.name(), "true" );
+        config.put( new BoltConnector( "bolt" ).listen_address.name(), listenAddress + ":" + boltPort );
+        boltAdvertisedAddress = advertisedAddress + ":" + boltPort;
+        config.put( new BoltConnector( "bolt" ).advertised_address.name(), boltAdvertisedAddress );
         config.put( new HttpConnector( "http", Encryption.NONE ).type.name(), "HTTP" );
         config.put( new HttpConnector( "http", Encryption.NONE ).enabled.name(), "true" );
-        config.put( new HttpConnector( "http", Encryption.NONE ).listen_address.name(), "127.0.0.1:" + httpPort );
-        config.put( new HttpConnector( "http", Encryption.NONE ).advertised_address.name(), "127.0.0.1:" + httpPort );
-
+        config.put( new HttpConnector( "http", Encryption.NONE ).listen_address.name(), listenAddress + ":" + httpPort );
+        config.put( new HttpConnector( "http", Encryption.NONE ).advertised_address.name(), advertisedAddress + ":" + httpPort );
         config.put( GraphDatabaseSettings.pagecache_memory.name(), "8m" );
         config.put( GraphDatabaseSettings.auth_store.name(), new File( parentDir, "auth" ).getAbsolutePath() );
         config.putAll( extraParams );