svn commit: r1225059 - in /zookeeper/trunk: CHANGES.txt src/java/main/org/apache/zookeeper/server/quorum/Leader.java src/java/main/org/apache/zookeeper/server/quorum/QuorumCnxManager.java

[ph...@apache.org]

Author: phunt
Date: Wed Dec 28 00:26:50 2011
New Revision: 1225059

URL: http://svn.apache.org/viewvc?rev=1225059&view=rev
Log:
ZOOKEEPER-1342. quorum Listener & LearnerCnxAcceptor are missing thread names (Rakesh R via phunt)

Modified:
    zookeeper/trunk/CHANGES.txt
    zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Leader.java
    zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumCnxManager.java

Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1225059&r1=1225058&r2=1225059&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Wed Dec 28 00:26:50 2011
@@ -155,6 +155,9 @@ IMPROVEMENTS:
   ZOOKEEPER-1326. The CLI commands "delete" and "rmr" are confusing.
   Can we have "rm" + "rmr" instead? (Harsh J via phunt)
 
+  ZOOKEEPER-1342. quorum Listener & LearnerCnxAcceptor are missing
+  thread names (Rakesh R via phunt)
+
 Release 3.4.0 - 
 
 Non-backward compatible changes:

Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Leader.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Leader.java?rev=1225059&r1=1225058&r2=1225059&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Leader.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Leader.java Wed Dec 28 00:26:50 2011
@@ -126,7 +126,7 @@ public class Leader {
         }
     }
 
-    ServerSocket ss;
+    private final ServerSocket ss;
 
     Leader(QuorumPeer self,LeaderZooKeeperServer zk) throws IOException {
         this.self = self;
@@ -137,7 +137,7 @@ public class Leader {
                     + self.getQuorumAddress().getPort(), e);
             throw e;
         }
-        this.zk=zk;
+        this.zk = zk;
     }
 
     /**
@@ -306,6 +306,7 @@ public class Leader {
             // Start thread that waits for connection requests from
             // new followers.
             cnxAcceptor = new LearnerCnxAcceptor();
+            cnxAcceptor.setName("LearnerCnxAcceptor-" + ss.getLocalSocketAddress());
             cnxAcceptor.start();
 
             readyToStart = true;

Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumCnxManager.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumCnxManager.java?rev=1225059&r1=1225058&r2=1225059&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumCnxManager.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumCnxManager.java Wed Dec 28 00:26:50 2011
@@ -149,6 +149,7 @@ public class QuorumCnxManager {
 
         // Starts listener thread that waits for connection requests 
         listener = new Listener();
+        listener.setName("QuorumPeerListener");
     }
 
     /**