You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by be...@apache.org on 2012/07/10 16:15:33 UTC

svn commit: r1359692 - in /mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp: delivery/ delivery/inbound/ server/ server/resources/

Author: berndf
Date: Tue Jul 10 14:15:33 2012
New Revision: 1359692

URL: http://svn.apache.org/viewvc?rev=1359692&view=rev
Log:
VYSPER-14: make relay thread pools customizable and provide reporting methods

Added:
    mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/resources/
    mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/resources/ManagedThreadPool.java
    mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/resources/ManagedThreadPoolUtil.java
Modified:
    mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/delivery/StanzaRelayBroker.java
    mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/delivery/inbound/DeliveringExternalInboundStanzaRelay.java
    mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/delivery/inbound/DeliveringInternalInboundStanzaRelay.java
    mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/XMPPServer.java

Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/delivery/StanzaRelayBroker.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/delivery/StanzaRelayBroker.java?rev=1359692&r1=1359691&r2=1359692&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/delivery/StanzaRelayBroker.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/delivery/StanzaRelayBroker.java Tue Jul 10 14:15:33 2012
@@ -25,8 +25,11 @@ import org.apache.vysper.xmpp.delivery.f
 import org.apache.vysper.xmpp.delivery.failure.DeliveryFailureStrategy;
 import org.apache.vysper.xmpp.delivery.failure.ServiceNotAvailableException;
 import org.apache.vysper.xmpp.server.ServerRuntimeContext;
+import org.apache.vysper.xmpp.server.resources.ManagedThreadPool;
 import org.apache.vysper.xmpp.stanza.Stanza;
 
+import java.io.IOException;
+import java.io.Writer;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
@@ -107,4 +110,21 @@ public class StanzaRelayBroker implement
             this.externalRelay.stop();
         }
     }
+
+    /**
+     * writes statistics about internal and external relays to the given writer, 
+     * if the relays implement ManagedThreadPool (which is the common case). 
+     * @param writer
+     * @throws IOException
+     */
+    public void dumpRelayStatistics(Writer writer) throws IOException {
+        if (internalRelay != null && internalRelay instanceof ManagedThreadPool) {
+            final ManagedThreadPool relay = (ManagedThreadPool)internalRelay;
+            relay.dumpThreadPoolInfo(writer);
+        }
+        if (externalRelay != null && externalRelay instanceof ManagedThreadPool) {
+            final ManagedThreadPool relay = (ManagedThreadPool)externalRelay;
+            relay.dumpThreadPoolInfo(writer);
+        }
+    }
 }

Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/delivery/inbound/DeliveringExternalInboundStanzaRelay.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/delivery/inbound/DeliveringExternalInboundStanzaRelay.java?rev=1359692&r1=1359691&r2=1359692&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/delivery/inbound/DeliveringExternalInboundStanzaRelay.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/delivery/inbound/DeliveringExternalInboundStanzaRelay.java Tue Jul 10 14:15:33 2012
@@ -19,10 +19,13 @@
  */
 package org.apache.vysper.xmpp.delivery.inbound;
 
+import java.io.IOException;
+import java.io.Writer;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.RejectedExecutionHandler;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
@@ -36,6 +39,8 @@ import org.apache.vysper.xmpp.delivery.f
 import org.apache.vysper.xmpp.delivery.failure.ServiceNotAvailableException;
 import org.apache.vysper.xmpp.protocol.NamespaceURIs;
 import org.apache.vysper.xmpp.server.ServerRuntimeContext;
+import org.apache.vysper.xmpp.server.resources.ManagedThreadPool;
+import org.apache.vysper.xmpp.server.resources.ManagedThreadPoolUtil;
 import org.apache.vysper.xmpp.server.s2s.XMPPServerConnector;
 import org.apache.vysper.xmpp.stanza.Stanza;
 import org.apache.vysper.xmpp.stanza.StanzaBuilder;
@@ -51,22 +56,41 @@ import org.slf4j.LoggerFactory;
  *  
  * @author The Apache MINA Project (dev@mina.apache.org)
  */
-public class DeliveringExternalInboundStanzaRelay implements StanzaRelay {
+public class DeliveringExternalInboundStanzaRelay implements StanzaRelay, ManagedThreadPool {
 
     final Logger logger = LoggerFactory.getLogger(DeliveringExternalInboundStanzaRelay.class);
 
+    private static class RejectedDeliveryHandler implements RejectedExecutionHandler {
+        
+        DeliveringExternalInboundStanzaRelay relay;
+        Logger logger;
+
+        private RejectedDeliveryHandler(DeliveringExternalInboundStanzaRelay relay, Logger logger) {
+            this.relay = relay;
+            this.logger = logger;
+        }
+
+        public void rejectedExecution(Runnable runnable, ThreadPoolExecutor threadPoolExecutor) {
+            logger.info("relaying of external inbound stanza has been rejected");
+        }
+    }
+    
+    
     protected ExecutorService executor;
 
     protected OfflineStanzaReceiver offlineStanzaReceiver = null;
 
     protected ServerRuntimeContext serverRuntimeContext = null;
+    
+    protected long lastCompleted = 0;
+    protected long lastDumpTimestamp = 0;
 
     public DeliveringExternalInboundStanzaRelay() {
         int coreThreadCount = 10;
         int maxThreadCount = 20;
-        int threadTimeoutSeconds = 2 * 60 * 1000;
+        int threadTimeoutSeconds = 2 * 60;
         this.executor = new ThreadPoolExecutor(coreThreadCount, maxThreadCount, threadTimeoutSeconds, TimeUnit.SECONDS,
-                new LinkedBlockingQueue<Runnable>());
+                new LinkedBlockingQueue<Runnable>(), new RejectedDeliveryHandler(this, logger));
     }
 
     /*package*/ DeliveringExternalInboundStanzaRelay(ExecutorService executor) {
@@ -77,6 +101,41 @@ public class DeliveringExternalInboundSt
         this.serverRuntimeContext = serverRuntimeContext;
     }
 
+    public void setMaxThreadCount(int maxThreadPoolCount) {
+        if (!(executor instanceof ThreadPoolExecutor)) {
+            throw new IllegalStateException("cannot set max thread count for " + executor.getClass());
+        }
+        ThreadPoolExecutor threadPoolExecutor = (ThreadPoolExecutor)executor;
+        threadPoolExecutor.setCorePoolSize(maxThreadPoolCount);
+        threadPoolExecutor.setMaximumPoolSize(2*maxThreadPoolCount);
+    }
+    
+    public void setThreadTimeoutSeconds(int threadTimeoutSeconds) {
+        if (!(executor instanceof ThreadPoolExecutor)) {
+            throw new IllegalStateException("cannot set thread timeout for " + executor.getClass());
+        }
+        ThreadPoolExecutor threadPoolExecutor = (ThreadPoolExecutor)executor;
+        threadPoolExecutor.setKeepAliveTime(threadTimeoutSeconds, TimeUnit.SECONDS);
+    }
+    
+    public void dumpThreadPoolInfo(Writer writer) throws IOException {
+        if (!(executor instanceof ThreadPoolExecutor)) {
+            throw new IllegalStateException("cannot dump info for " + executor.getClass());
+        }
+        ThreadPoolExecutor pool = (ThreadPoolExecutor)executor;
+
+        final long now = System.currentTimeMillis();
+        writer.append("==== externalRelay:").append("\n");
+        ManagedThreadPoolUtil.writeThreadPoolInfo(writer, pool);
+        final long completedTaskCount = pool.getCompletedTaskCount();
+        if (lastDumpTimestamp > 0) {
+            writer.append("throughput=\t").append(Long.toString(completedTaskCount - lastCompleted))
+                                          .append(" per ").append(Long.toString(now - lastDumpTimestamp)).append("\n");
+        }
+        lastDumpTimestamp = now;
+        lastCompleted = completedTaskCount;
+    }
+
     public void relay(Entity receiver, Stanza stanza, DeliveryFailureStrategy deliveryFailureStrategy)
             throws DeliveryException {
         

Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/delivery/inbound/DeliveringInternalInboundStanzaRelay.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/delivery/inbound/DeliveringInternalInboundStanzaRelay.java?rev=1359692&r1=1359691&r2=1359692&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/delivery/inbound/DeliveringInternalInboundStanzaRelay.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/delivery/inbound/DeliveringInternalInboundStanzaRelay.java Tue Jul 10 14:15:33 2012
@@ -19,11 +19,14 @@
  */
 package org.apache.vysper.xmpp.delivery.inbound;
 
+import java.io.IOException;
+import java.io.Writer;
 import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.RejectedExecutionHandler;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
@@ -49,6 +52,8 @@ import org.apache.vysper.xmpp.protocol.w
 import org.apache.vysper.xmpp.server.ServerRuntimeContext;
 import org.apache.vysper.xmpp.server.SessionContext;
 import org.apache.vysper.xmpp.server.SessionState;
+import org.apache.vysper.xmpp.server.resources.ManagedThreadPool;
+import org.apache.vysper.xmpp.server.resources.ManagedThreadPoolUtil;
 import org.apache.vysper.xmpp.stanza.IQStanza;
 import org.apache.vysper.xmpp.stanza.MessageStanza;
 import org.apache.vysper.xmpp.stanza.MessageStanzaType;
@@ -67,10 +72,25 @@ import org.slf4j.LoggerFactory;
  *  
  * @author The Apache MINA Project (dev@mina.apache.org)
  */
-public class DeliveringInternalInboundStanzaRelay implements StanzaRelay {
+public class DeliveringInternalInboundStanzaRelay implements StanzaRelay, ManagedThreadPool {
 
     final Logger logger = LoggerFactory.getLogger(DeliveringInternalInboundStanzaRelay.class);
 
+    private static class RejectedDeliveryHandler implements RejectedExecutionHandler {
+        
+        DeliveringInternalInboundStanzaRelay relay;
+        Logger logger;
+
+        private RejectedDeliveryHandler(DeliveringInternalInboundStanzaRelay relay, Logger logger) {
+            this.relay = relay;
+            this.logger = logger;
+        }
+
+        public void rejectedExecution(Runnable runnable, ThreadPoolExecutor threadPoolExecutor) {
+            logger.info("relaying of internal inbound stanza has been rejected");
+        }
+    }
+    
     private static final InboundStanzaProtocolWorker INBOUND_STANZA_PROTOCOL_WORKER = new InboundStanzaProtocolWorker();
 
     private static final Integer PRIO_THRESHOLD = 0;
@@ -88,6 +108,9 @@ public class DeliveringInternalInboundSt
     protected ServerRuntimeContext serverRuntimeContext = null;
     
     protected LogStorageProvider logStorageProvider = null;
+    
+    protected long lastCompleted = 0;
+    protected long lastDumpTimestamp = 0;
 
     public DeliveringInternalInboundStanzaRelay(Entity serverEntity, ResourceRegistry resourceRegistry,
             StorageProviderRegistry storageProviderRegistry) {
@@ -103,9 +126,9 @@ public class DeliveringInternalInboundSt
         this.offlineStanzaReceiver =offlineStanzaReceiver;
         int coreThreadCount = 10;
         int maxThreadCount = 20;
-        int threadTimeoutSeconds = 2 * 60 * 1000;
+        int threadTimeoutSeconds = 2 * 60;
         this.executor = new ThreadPoolExecutor(coreThreadCount, maxThreadCount, threadTimeoutSeconds, TimeUnit.SECONDS,
-                new LinkedBlockingQueue<Runnable>());
+                new LinkedBlockingQueue<Runnable>(), new RejectedDeliveryHandler(this, logger));
     }
 
     /*package*/ DeliveringInternalInboundStanzaRelay(ExecutorService executor) {
@@ -120,6 +143,41 @@ public class DeliveringInternalInboundSt
         this.logStorageProvider = logStorageProvider;
     }
 
+    public void setMaxThreadCount(int maxThreadPoolCount) {
+        if (!(executor instanceof ThreadPoolExecutor)) {
+            throw new IllegalStateException("cannot set max thread count for " + executor.getClass());
+        }
+        ThreadPoolExecutor threadPoolExecutor = (ThreadPoolExecutor)executor;
+        threadPoolExecutor.setCorePoolSize(maxThreadPoolCount);
+        threadPoolExecutor.setMaximumPoolSize(2*maxThreadPoolCount);
+    }
+    
+    public void setThreadTimeoutSeconds(int threadTimeoutSeconds) {
+        if (!(executor instanceof ThreadPoolExecutor)) {
+            throw new IllegalStateException("cannot set thread timeout for " + executor.getClass());
+        }
+        ThreadPoolExecutor threadPoolExecutor = (ThreadPoolExecutor)executor;
+        threadPoolExecutor.setKeepAliveTime(threadTimeoutSeconds, TimeUnit.SECONDS);
+    }
+    
+    public void dumpThreadPoolInfo(Writer writer) throws IOException {
+        if (!(executor instanceof ThreadPoolExecutor)) {
+            throw new IllegalStateException("cannot dump info for " + executor.getClass());
+        }
+        ThreadPoolExecutor pool = (ThreadPoolExecutor)executor;
+
+        final long now = System.currentTimeMillis();
+        writer.append("==== internalRelay:").append("\n");
+        ManagedThreadPoolUtil.writeThreadPoolInfo(writer, pool);
+        final long completedTaskCount = pool.getCompletedTaskCount();
+        if (lastDumpTimestamp > 0) {
+            writer.append("throughput=\t").append(Long.toString(completedTaskCount - lastCompleted))
+                                          .append(" per ").append(Long.toString(now - lastDumpTimestamp)).append("\n");
+        }
+        lastDumpTimestamp = now;
+        lastCompleted = completedTaskCount;
+    }
+    
     public void relay(Entity receiver, Stanza stanza, DeliveryFailureStrategy deliveryFailureStrategy)
             throws DeliveryException {
         if (!isRelaying()) {

Modified: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/XMPPServer.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/XMPPServer.java?rev=1359692&r1=1359691&r2=1359692&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/XMPPServer.java (original)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/XMPPServer.java Tue Jul 10 14:15:33 2012
@@ -80,7 +80,10 @@ public class XMPPServer {
     private final List<Endpoint> endpoints = new ArrayList<Endpoint>();
 
     private final List<Module> initialModules = new ArrayList<Module>();
+ 
+    private int maxInternalRelayThreads = -1;
     
+    private int maxExternalRelayThreads = -1;
 
     public XMPPServer(String domain) {
         this.serverDomain = domain;
@@ -115,7 +118,15 @@ public class XMPPServer {
     	tlsCertificatePassword = password;
     	tlsKeyStoreType = keyStoreType;
     }
-    
+
+    public void setMaxInternalRelayThreads(int maxInternalRelayThreads) {
+        this.maxInternalRelayThreads = maxInternalRelayThreads;
+    }
+
+    public void setMaxExternalRelayThreads(int maxExternalRelayThreads) {
+        this.maxExternalRelayThreads = maxExternalRelayThreads;
+    }
+
     public void addEndpoint(Endpoint endpoint) {
         endpoints.add(endpoint);
     }
@@ -143,6 +154,9 @@ public class XMPPServer {
         DeliveringInternalInboundStanzaRelay internalStanzaRelay = new DeliveringInternalInboundStanzaRelay(serverEntity,
                 resourceRegistry, accountManagement,offlineReceiver);
         DeliveringExternalInboundStanzaRelay externalStanzaRelay = new DeliveringExternalInboundStanzaRelay();
+        
+        if (maxInternalRelayThreads >= 0) internalStanzaRelay.setMaxThreadCount(maxInternalRelayThreads);
+        if (maxExternalRelayThreads >= 0) externalStanzaRelay.setMaxThreadCount(maxExternalRelayThreads);
 
         stanzaRelayBroker = new StanzaRelayBroker();
         stanzaRelayBroker.setInternalRelay(internalStanzaRelay);

Added: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/resources/ManagedThreadPool.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/resources/ManagedThreadPool.java?rev=1359692&view=auto
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/resources/ManagedThreadPool.java (added)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/resources/ManagedThreadPool.java Tue Jul 10 14:15:33 2012
@@ -0,0 +1,34 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ *
+ */
+package org.apache.vysper.xmpp.server.resources;
+
+import java.io.IOException;
+import java.io.Writer;
+
+/**
+ * customizes and reports info about a thread pool
+ */
+public interface ManagedThreadPool {
+    void setMaxThreadCount(int maxThreadPoolCount);
+
+    void setThreadTimeoutSeconds(int threadTimeoutSeconds);
+
+    void dumpThreadPoolInfo(Writer writer) throws IOException;
+}

Added: mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/resources/ManagedThreadPoolUtil.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/resources/ManagedThreadPoolUtil.java?rev=1359692&view=auto
==============================================================================
--- mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/resources/ManagedThreadPoolUtil.java (added)
+++ mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/server/resources/ManagedThreadPoolUtil.java Tue Jul 10 14:15:33 2012
@@ -0,0 +1,41 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ *
+ */
+package org.apache.vysper.xmpp.server.resources;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.util.concurrent.ThreadPoolExecutor;
+
+/**
+ * customizes and reports info about a thread pool
+ */
+public class ManagedThreadPoolUtil {
+
+    public static void writeThreadPoolInfo(Writer writer, ThreadPoolExecutor pool) throws IOException {
+        writer.append("corePool=\t").append(Integer.toString(pool.getCorePoolSize())).append("\n");
+        writer.append("pool=\t\t").append(Integer.toString(pool.getPoolSize())).append("\n");
+        writer.append("largestPool=\t").append(Integer.toString(pool.getLargestPoolSize())).append("\n");
+        writer.append("maxPool=\t").append(Integer.toString(pool.getMaximumPoolSize())).append("\n");
+        writer.append("tasks=\t\t").append(Long.toString(pool.getTaskCount())).append("\n");
+        writer.append("active=\t\t").append(Integer.toString(pool.getActiveCount())).append("\n");
+        writer.append("queued=\t\t").append(Integer.toString(pool.getQueue().size())).append("\n");
+        writer.append("completed=\t").append(Long.toString(pool.getCompletedTaskCount())).append("\n");
+    }
+}