Merge remote-tracking branch 'upstream/2.3' into 3.0

neo4j · Nov 12, 2015 · 3f9b46c · 3f9b46c
2 parents d4e469c + 97bb67c
commit 3f9b46c
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 33 deletions.
diff --git a/enterprise/cluster/src/main/java/org/neo4j/cluster/com/NetworkReceiver.java b/enterprise/cluster/src/main/java/org/neo4j/cluster/com/NetworkReceiver.java
@@ -19,15 +19,6 @@
  */
 package org.neo4j.cluster.com;
 
-import java.net.ConnectException;
-import java.net.InetSocketAddress;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.UnknownHostException;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.Executors;
-
 import org.jboss.netty.bootstrap.ServerBootstrap;
 import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelException;
@@ -46,6 +37,14 @@
 import org.jboss.netty.util.ThreadNameDeterminer;
 import org.jboss.netty.util.ThreadRenamingRunnable;
 
+import java.net.ConnectException;
+import java.net.InetSocketAddress;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Executors;
+
 import org.neo4j.cluster.com.message.Message;
 import org.neo4j.cluster.com.message.MessageProcessor;
 import org.neo4j.cluster.com.message.MessageSource;
@@ -102,16 +101,17 @@ public interface NetworkChannelsListener
     private ServerBootstrap serverBootstrap;
     private Iterable<MessageProcessor> processors = Listeners.newListeners();
 
-    private Monitor monitor;
-    private Configuration config;
-    private Log msgLog;
+    private final Monitor monitor;
+    private final Configuration config;
+    private final Log msgLog;
 
-    private Map<URI, Channel> connections = new ConcurrentHashMap<URI, Channel>();
+    private final Map<URI, Channel> connections = new ConcurrentHashMap<>();
     private Iterable<NetworkChannelsListener> listeners = Listeners.newListeners();
 
     volatile boolean bindingDetected = false;
 
     private volatile boolean paused;
+    private int port;
 
     public NetworkReceiver( Monitor monitor, Configuration config, LogProvider logProvider )
     {
@@ -147,14 +147,16 @@ public void start()
         int maxPort = ports.length == 2 ? ports[1] : minPort;
 
         // Try all ports in the given range
-        listen( minPort, maxPort );
+        port = listen( minPort, maxPort );
+
+        msgLog.debug( "Started NetworkReceiver at " + config.clusterServer().getHost() + ":" + port );
     }
 
     @Override
     public void stop()
             throws Throwable
     {
-        msgLog.debug( "Shutting down NetworkReceiver" );
+        msgLog.debug( "Shutting down NetworkReceiver at " + config.clusterServer().getHost() + ":" + port );
 
         channels.close().awaitUninterruptibly();
         serverBootstrap.releaseExternalResources();
@@ -172,8 +174,8 @@ public void setPaused(boolean paused)
         this.paused = paused;
     }
 
-    private void listen( int minPort, int maxPort )
-            throws URISyntaxException, ChannelException, UnknownHostException
+    private int listen( int minPort, int maxPort )
+            throws URISyntaxException, ChannelException
     {
         ChannelException ex = null;
         for ( int checkPort = minPort; checkPort <= maxPort; checkPort++ )
@@ -197,7 +199,7 @@ private void listen( int minPort, int maxPort )
                 listeningAt( getURI( localAddress ) );
 
                 channels.add( listenChannel );
-                return;
+                return checkPort;
             }
             catch ( ChannelException e )
             {
@@ -210,6 +212,7 @@ private void listen( int minPort, int maxPort )
     }
 
     // MessageSource implementation
+    @Override
     public void addMessageProcessor( MessageProcessor processor )
     {
         processors = Listeners.addListener( processor, processors );
@@ -238,7 +241,7 @@ public void receive( Message message )
         }
     }
 
-    private URI getURI( InetSocketAddress address ) throws URISyntaxException
+    private URI getURI( InetSocketAddress address )
     {
         String uri;
 

diff --git a/enterprise/cluster/src/main/java/org/neo4j/cluster/com/NetworkSender.java b/enterprise/cluster/src/main/java/org/neo4j/cluster/com/NetworkSender.java
@@ -101,18 +101,18 @@ public interface NetworkChannelsListener
 
     // Sending
     // One executor for each receiving instance, so that one blocking instance cannot block others receiving messages
-    private Map<URI, ExecutorService> senderExecutors = new HashMap<URI, ExecutorService>();
-    private Set<URI> failedInstances = new HashSet<URI>(); // Keeps track of what instances we have failed to open
+    private final Map<URI, ExecutorService> senderExecutors = new HashMap<URI, ExecutorService>();
+    private final Set<URI> failedInstances = new HashSet<URI>(); // Keeps track of what instances we have failed to open
     // connections to
     private ClientBootstrap clientBootstrap;
 
     private final Monitor monitor;
-    private Configuration config;
+    private final Configuration config;
     private final NetworkReceiver receiver;
-    private Log msgLog;
+    private final Log msgLog;
     private URI me;
 
-    private Map<URI, Channel> connections = new ConcurrentHashMap<URI, Channel>();
+    private final Map<URI, Channel> connections = new ConcurrentHashMap<URI, Channel>();
     private Iterable<NetworkChannelsListener> listeners = Listeners.newListeners();
 
     private volatile boolean paused;
@@ -163,6 +163,13 @@ public void start()
                 Executors.newFixedThreadPool( 2, daemon( "Cluster client worker", monitor ) ), 2 ) );
         clientBootstrap.setOption( "tcpNoDelay", true );
         clientBootstrap.setPipelineFactory( new NetworkNodePipelineFactory() );
+
+        msgLog.debug( "Started NetworkSender for " + toString( config ) );
+    }
+
+    private String toString( Configuration config )
+    {
+        return "defaultPort:" + config.defaultPort() + ", port:" + config.port();
     }
 
     @Override
@@ -188,7 +195,7 @@ public void stop()
 
         channels.close().awaitUninterruptibly();
         clientBootstrap.releaseExternalResources();
-        msgLog.debug( "Shutting down NetworkSender complete" );
+        msgLog.debug( "Shutting down NetworkSender for " + toString( config ) + " complete" );
     }
 
     @Override

diff --git a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/member/ClusterMembers.java b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/member/ClusterMembers.java
@@ -27,6 +27,8 @@
 import org.neo4j.kernel.ha.cluster.HighAvailabilityMemberStateMachine;
 import org.neo4j.kernel.ha.cluster.modeswitch.HighAvailabilityModeSwitcher;
 
+import static java.lang.String.format;
+
 /**
  * Keeps a list of members, their roles and availability for display for example in JMX or REST.
  * <p>
@@ -125,4 +127,18 @@ private static ClusterMember updateRole( ClusterMember member, HighAvailabilityM
             return member.unavailable();
         }
     }
+
+    @Override
+    public String toString()
+    {
+        StringBuilder buf = new StringBuilder();
+        for ( ClusterMember clusterMember : getMembers() )
+        {
+            buf.append( "  " ).append( clusterMember.getInstanceId() ).append( ":" )
+               .append( clusterMember.getHARole() )
+               .append( " (is alive = " ).append( clusterMember.isAlive() ).append( ")" )
+               .append( format( "%n" ) );
+        }
+        return buf.toString();
+    }
 }
diff --git a/enterprise/ha/src/main/java/org/neo4j/kernel/impl/ha/ClusterManager.java b/enterprise/ha/src/main/java/org/neo4j/kernel/impl/ha/ClusterManager.java
@@ -40,6 +40,7 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
+
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
@@ -91,6 +92,7 @@
 import static java.lang.String.format;
 import static java.util.Arrays.asList;
 import static java.util.Collections.unmodifiableMap;
+
 import static org.neo4j.helpers.ArrayUtil.contains;
 import static org.neo4j.helpers.collection.Iterables.count;
 import static org.neo4j.helpers.collection.MapUtil.stringMap;
@@ -531,14 +533,7 @@ public static String stateToString( ManagedCluster cluster )
                .append( " (" ).append( client.getClusterServer() ).append( "):" ).append( "\n" );
 
             ClusterMembers members = database.getDependencyResolver().resolveDependency( ClusterMembers.class );
-
-            for ( ClusterMember clusterMember : members.getMembers() )
-            {
-                buf.append( "  " ).append( clusterMember.getInstanceId() ).append( ":" )
-                   .append( clusterMember.getHARole() )
-                   .append( " (is alive = " ).append( clusterMember.isAlive() ).append( ")" )
-                   .append( "\n" );
-            }
+            buf.append( members );
         }
 
         return buf.toString();