Author: kfujino
Date: Tue Apr 19 09:28:50 2016
New Revision: 1739880
URL: http://svn.apache.org/viewvc?rev=1739880&view=rev
Log:
Add the channel name to the thread which is invoked by channel services in
order to identify the associated channel.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java?rev=1739880&r1=1739879&r2=1739880&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/GroupChannel.java
Tue Apr 19 09:28:50 2016
@@ -688,7 +688,9 @@ public class GroupChannel extends Channe
public HeartbeatThread(GroupChannel channel, long sleepTime) {
super();
this.setPriority(MIN_PRIORITY);
- setName("GroupChannel-Heartbeat-"+inc());
+ String channelName = "";
+ if (channel.getName() != null) channelName = "[" +
channel.getName() + "]";
+ setName("GroupChannel-Heartbeat" + channelName + "-" +inc());
setDaemon(true);
this.channel = channel;
this.sleepTime = sleepTime;
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java?rev=1739880&r1=1739879&r2=1739880&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatch15Interceptor.java
Tue Apr 19 09:28:50 2016
@@ -22,6 +22,7 @@ import java.util.concurrent.atomic.Atomi
import org.apache.catalina.tribes.ChannelMessage;
import org.apache.catalina.tribes.Member;
+import org.apache.catalina.tribes.group.GroupChannel;
import org.apache.catalina.tribes.group.InterceptorPayload;
import org.apache.catalina.tribes.transport.bio.util.LinkObject;
import org.apache.catalina.tribes.util.ExecutorFactory;
@@ -82,9 +83,13 @@ public class MessageDispatch15Intercepto
@Override
public void startQueue() {
if ( run ) return;
+ String channelName = "";
+ if (getChannel() instanceof GroupChannel &&
((GroupChannel)getChannel()).getName() != null) {
+ channelName = "[" + ((GroupChannel)getChannel()).getName() + "]";
+ }
executor = ExecutorFactory.newThreadPool(maxSpareThreads, maxThreads,
keepAliveTime, TimeUnit.MILLISECONDS,
- new
TcclThreadFactory("MessageDispatch15Interceptor.MessageDispatchThread"));
+ new
TcclThreadFactory("MessageDispatch15Interceptor.MessageDispatchThread" +
channelName));
run = true;
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java?rev=1739880&r1=1739879&r2=1739880&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
Tue Apr 19 09:28:50 2016
@@ -23,6 +23,7 @@ import org.apache.catalina.tribes.Channe
import org.apache.catalina.tribes.Member;
import org.apache.catalina.tribes.UniqueId;
import org.apache.catalina.tribes.group.ChannelInterceptorBase;
+import org.apache.catalina.tribes.group.GroupChannel;
import org.apache.catalina.tribes.group.InterceptorPayload;
import org.apache.catalina.tribes.transport.bio.util.FastQueue;
import org.apache.catalina.tribes.transport.bio.util.LinkObject;
@@ -88,7 +89,11 @@ public class MessageDispatchInterceptor
public void startQueue() {
msgDispatchThread = new Thread(this);
-
msgDispatchThread.setName("MessageDispatchInterceptor.MessageDispatchThread");
+ String channelName = "";
+ if (getChannel() instanceof GroupChannel &&
((GroupChannel)getChannel()).getName() != null) {
+ channelName = "[" + ((GroupChannel)getChannel()).getName() + "]";
+ }
+
msgDispatchThread.setName("MessageDispatchInterceptor.MessageDispatchThread" +
channelName);
msgDispatchThread.setDaemon(true);
msgDispatchThread.setPriority(Thread.MAX_PRIORITY);
queue.setEnabled(true);
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java?rev=1739880&r1=1739879&r2=1739880&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpPingInterceptor.java
Tue Apr 19 09:28:50 2016
@@ -26,6 +26,7 @@ import org.apache.catalina.tribes.Channe
import org.apache.catalina.tribes.ChannelMessage;
import org.apache.catalina.tribes.Member;
import org.apache.catalina.tribes.group.ChannelInterceptorBase;
+import org.apache.catalina.tribes.group.GroupChannel;
import org.apache.catalina.tribes.io.ChannelData;
import org.apache.catalina.tribes.io.XByteBuffer;
import org.apache.juli.logging.Log;
@@ -68,7 +69,12 @@ public class TcpPingInterceptor extends
if ( thread == null && useThread) {
thread = new PingThread();
thread.setDaemon(true);
- thread.setName("TcpPingInterceptor.PingThread-"+cnt.addAndGet(1));
+ String channelName = "";
+ if (getChannel() instanceof GroupChannel
+ && ((GroupChannel)getChannel()).getName() != null) {
+ channelName = "[" + ((GroupChannel)getChannel()).getName() +
"]";
+ }
+ thread.setName("TcpPingInterceptor.PingThread" + channelName
+"-"+cnt.addAndGet(1));
thread.start();
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java?rev=1739880&r1=1739879&r2=1739880&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
Tue Apr 19 09:28:50 2016
@@ -33,6 +33,7 @@ import org.apache.catalina.tribes.Channe
import org.apache.catalina.tribes.Member;
import org.apache.catalina.tribes.MembershipListener;
import org.apache.catalina.tribes.MessageListener;
+import org.apache.catalina.tribes.group.GroupChannel;
import org.apache.catalina.tribes.io.ChannelData;
import org.apache.catalina.tribes.io.XByteBuffer;
import org.apache.catalina.tribes.util.ExecutorFactory;
@@ -534,7 +535,11 @@ public class McastServiceImpl
int errorCounter = 0;
public ReceiverThread() {
super();
- setName("Tribes-MembershipReceiver");
+ String channelName = "";
+ if (channel instanceof GroupChannel &&
((GroupChannel)channel).getName() != null) {
+ channelName = "[" + ((GroupChannel)channel).getName() + "]";
+ }
+ setName("Tribes-MembershipReceiver" + channelName);
}
@Override
public void run() {
@@ -570,7 +575,11 @@ public class McastServiceImpl
int errorCounter=0;
public SenderThread(long time) {
this.time = time;
- setName("Tribes-MembershipSender");
+ String channelName = "";
+ if (channel instanceof GroupChannel &&
((GroupChannel)channel).getName() != null) {
+ channelName = "[" + ((GroupChannel)channel).getName() + "]";
+ }
+ setName("Tribes-MembershipSender" + channelName);
}
@Override
@@ -603,8 +612,12 @@ public class McastServiceImpl
running = true;
Thread t = new RecoveryThread(parent);
-
- t.setName("Tribes-MembershipRecovery");
+ String channelName = "";
+ if (parent.getChannel() instanceof GroupChannel
+ && ((GroupChannel)parent.getChannel()).getName() != null) {
+ channelName = "[" +
((GroupChannel)parent.getChannel()).getName() + "]";
+ }
+ t.setName("Tribes-MembershipRecovery" + channelName);
t.setDaemon(true);
t.start();
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java?rev=1739880&r1=1739879&r2=1739880&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/ReceiverBase.java
Tue Apr 19 09:28:50 2016
@@ -30,6 +30,7 @@ import org.apache.catalina.tribes.Channe
import org.apache.catalina.tribes.ChannelMessage;
import org.apache.catalina.tribes.ChannelReceiver;
import org.apache.catalina.tribes.MessageListener;
+import org.apache.catalina.tribes.group.GroupChannel;
import org.apache.catalina.tribes.io.ListenCallback;
import org.apache.catalina.tribes.util.ExecutorFactory;
import org.apache.juli.logging.Log;
@@ -97,7 +98,11 @@ public abstract class ReceiverBase imple
public void start() throws IOException {
if ( executor == null ) {
//executor = new
ThreadPoolExecutor(minThreads,maxThreads,60,TimeUnit.SECONDS,new
LinkedBlockingQueue<Runnable>());
- TaskThreadFactory tf = new
TaskThreadFactory("Tribes-Task-Receiver-");
+ String channelName = "";
+ if (channel instanceof GroupChannel &&
((GroupChannel)channel).getName() != null) {
+ channelName = "[" + ((GroupChannel)channel).getName() + "]";
+ }
+ TaskThreadFactory tf = new
TaskThreadFactory("Tribes-Task-Receiver" + channelName + "-");
executor = ExecutorFactory.newThreadPool(minThreads, maxThreads,
maxIdleTime, TimeUnit.MILLISECONDS, tf);
}
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java?rev=1739880&r1=1739879&r2=1739880&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java
Tue Apr 19 09:28:50 2016
@@ -20,6 +20,7 @@ import java.io.IOException;
import java.net.ServerSocket;
import java.net.Socket;
+import org.apache.catalina.tribes.group.GroupChannel;
import org.apache.catalina.tribes.io.ObjectReader;
import org.apache.catalina.tribes.transport.AbstractRxTask;
import org.apache.catalina.tribes.transport.ReceiverBase;
@@ -54,7 +55,12 @@ public class BioReceiver extends Receive
try {
getBind();
bind();
- Thread t = new Thread(this, "BioReceiver");
+ String channelName = "";
+ if (getChannel() instanceof GroupChannel
+ && ((GroupChannel)getChannel()).getName() != null) {
+ channelName = "[" + ((GroupChannel)getChannel()).getName() +
"]";
+ }
+ Thread t = new Thread(this, "BioReceiver" + channelName);
t.setDaemon(true);
t.start();
} catch (Exception x) {
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java?rev=1739880&r1=1739879&r2=1739880&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
Tue Apr 19 09:28:50 2016
@@ -32,6 +32,7 @@ import java.util.LinkedList;
import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
+import org.apache.catalina.tribes.group.GroupChannel;
import org.apache.catalina.tribes.io.ObjectReader;
import org.apache.catalina.tribes.transport.AbstractRxTask;
import org.apache.catalina.tribes.transport.Constants;
@@ -108,7 +109,12 @@ public class NioReceiver extends Receive
try {
getBind();
bind();
- Thread t = new Thread(this, "NioReceiver");
+ String channelName = "";
+ if (getChannel() instanceof GroupChannel
+ && ((GroupChannel)getChannel()).getName() != null) {
+ channelName = "[" + ((GroupChannel)getChannel()).getName() +
"]";
+ }
+ Thread t = new Thread(this, "NioReceiver" + channelName);
t.setDaemon(true);
t.start();
} catch (Exception x) {
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1739880&r1=1739879&r2=1739880&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Apr 19 09:28:50 2016
@@ -122,6 +122,10 @@
environment, it is set the cluster name + "-Channel" as default value.
(kfujino)
</add>
+ <add>
+ Add the channel name to the thread which is invoked by channel services
+ in order to identify the associated channel. (kfujino)
+ </add>
</changelog>
</subsection>
<subsection name="Other">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
