You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2016/02/09 13:19:03 UTC

svn commit: r1729368 - in /qpid/java/branches/6.0.x: ./ broker-core/src/main/java/org/apache/qpid/server/logging/messages/ broker-core/src/main/java/org/apache/qpid/server/model/ broker-core/src/main/java/org/apache/qpid/server/model/adapter/

Author: orudyy
Date: Tue Feb  9 12:19:02 2016
New Revision: 1729368

URL: http://svn.apache.org/viewvc?rev=1729368&view=rev
Log:
QPID-6932: Enhance model object to expose key JVM statistics such as heap memory, garbage collection, etc. Add security checks and operational logs for broker operations

            merged from trunk
            svn merge -c 1728772,1729356 https://svn.apache.org/repos/asf/qpid/java/trunk
            merge conflict resolved manually

Added:
    qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/model/BrokerAttributeInjector.java
      - copied, changed from r1728772, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerAttributeInjector.java
Modified:
    qpid/java/branches/6.0.x/   (props changed)
    qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java
    qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Broker_logmessages.properties
    qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
    qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
    qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java
    qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java

Propchange: qpid/java/branches/6.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  9 12:19:02 2016
@@ -9,5 +9,5 @@
 /qpid/branches/java-broker-vhost-refactor/java:1493674-1494547
 /qpid/branches/java-network-refactor/qpid/java:805429-821809
 /qpid/branches/qpid-2935/qpid/java:1061302-1072333
-/qpid/java/trunk:1715445-1715447,1715586,1715940,1716086-1716087,1716127-1716128,1716141,1716153,1716155,1716194,1716204,1716209,1716227,1716277,1716357,1716368,1716370,1716374,1716432,1716444-1716445,1716455,1716461,1716474,1716489,1716497,1716515,1716555,1716602,1716606-1716610,1716619,1716636,1717269,1717299,1717401,1717446,1717449,1717626,1717691,1717735,1717780,1718744,1718889,1718893,1718918,1718922,1719026,1719028,1719033,1719037,1719047,1719051,1720340,1720664,1721151,1721198,1722019-1722020,1722246,1722339,1722416,1722674,1722678,1722683,1722711,1723064,1723194,1723563,1724216,1724251,1724257,1724292,1724375,1724397,1724432,1724582,1724603,1724780,1724843-1724844,1725295,1725569,1725760,1726176,1726244-1726246,1726249,1726358,1726436,1726449,1726456,1726646,1726653,1726755,1726778,1727532,1727555,1727608,1727951,1728089,1728167,1728302,1728497,1728524,1728639
+/qpid/java/trunk:1715445-1715447,1715586,1715940,1716086-1716087,1716127-1716128,1716141,1716153,1716155,1716194,1716204,1716209,1716227,1716277,1716357,1716368,1716370,1716374,1716432,1716444-1716445,1716455,1716461,1716474,1716489,1716497,1716515,1716555,1716602,1716606-1716610,1716619,1716636,1717269,1717299,1717401,1717446,1717449,1717626,1717691,1717735,1717780,1718744,1718889,1718893,1718918,1718922,1719026,1719028,1719033,1719037,1719047,1719051,1720340,1720664,1721151,1721198,1722019-1722020,1722246,1722339,1722416,1722674,1722678,1722683,1722711,1723064,1723194,1723563,1724216,1724251,1724257,1724292,1724375,1724397,1724432,1724582,1724603,1724780,1724843-1724844,1725295,1725569,1725760,1726176,1726244-1726246,1726249,1726358,1726436,1726449,1726456,1726646,1726653,1726755,1726778,1727532,1727555,1727608,1727951,1728089,1728167,1728302,1728497,1728524,1728639,1728772,1729356
 /qpid/trunk/qpid:796646-796653

Modified: qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java?rev=1729368&r1=1729367&r2=1729368&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java (original)
+++ qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java Tue Feb  9 12:19:02 2016
@@ -54,6 +54,7 @@ public class BrokerMessages
     public static final String FLOW_TO_DISK_ACTIVE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.flow_to_disk_active";
     public static final String MAX_MEMORY_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.max_memory";
     public static final String PLATFORM_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.platform";
+    public static final String OPERATION_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.operation";
     public static final String PROCESS_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.process";
     public static final String SHUTTING_DOWN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.shutting_down";
     public static final String MANAGEMENT_MODE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.management_mode";
@@ -73,6 +74,7 @@ public class BrokerMessages
         LoggerFactory.getLogger(FLOW_TO_DISK_ACTIVE_LOG_HIERARCHY);
         LoggerFactory.getLogger(MAX_MEMORY_LOG_HIERARCHY);
         LoggerFactory.getLogger(PLATFORM_LOG_HIERARCHY);
+        LoggerFactory.getLogger(OPERATION_LOG_HIERARCHY);
         LoggerFactory.getLogger(PROCESS_LOG_HIERARCHY);
         LoggerFactory.getLogger(SHUTTING_DOWN_LOG_HIERARCHY);
         LoggerFactory.getLogger(MANAGEMENT_MODE_LOG_HIERARCHY);
@@ -573,6 +575,64 @@ public class BrokerMessages
             }
 
             @Override
+            public boolean equals(final Object o)
+            {
+                if (this == o)
+                {
+                    return true;
+                }
+                if (o == null || getClass() != o.getClass())
+                {
+                    return false;
+                }
+
+                final LogMessage that = (LogMessage) o;
+
+                return getLogHierarchy().equals(that.getLogHierarchy()) && toString().equals(that.toString());
+
+            }
+
+            @Override
+            public int hashCode()
+            {
+                int result = toString().hashCode();
+                result = 31 * result + getLogHierarchy().hashCode();
+                return result;
+            }
+        };
+    }
+
+    /**
+     * Log a Broker message of the Format:
+     * <pre>BRK-1018 : Operation : {0}</pre>
+     * Optional values are contained in [square brackets] and are numbered
+     * sequentially in the method call.
+     *
+     */
+    public static LogMessage OPERATION(String param1)
+    {
+        String rawMessage = _messages.getString("OPERATION");
+
+        final Object[] messageArguments = {param1};
+        // Create a new MessageFormat to ensure thread safety.
+        // Sharing a MessageFormat and using applyPattern is not thread safe
+        MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale);
+
+        final String message = formatter.format(messageArguments);
+
+        return new LogMessage()
+        {
+            public String toString()
+            {
+                return message;
+            }
+
+            public String getLogHierarchy()
+            {
+                return OPERATION_LOG_HIERARCHY;
+            }
+
+            @Override
             public boolean equals(final Object o)
             {
                 if (this == o)

Modified: qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Broker_logmessages.properties
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Broker_logmessages.properties?rev=1729368&r1=1729367&r2=1729368&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Broker_logmessages.properties (original)
+++ qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Broker_logmessages.properties Tue Feb  9 12:19:02 2016
@@ -58,3 +58,6 @@ FATAL_ERROR = BRK-1016 : Fatal error : {
 
 # 0 - pid
 PROCESS = BRK-1017 : Process : PID : {0}
+
+# 0 - operation name
+OPERATION = BRK-1018 : Operation : {0}

Modified: qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java?rev=1729368&r1=1729367&r2=1729368&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java (original)
+++ qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java Tue Feb  9 12:19:02 2016
@@ -177,6 +177,7 @@ public abstract class AbstractConfigured
     private boolean _openComplete;
     private boolean _openFailed;
     private volatile State _state = State.UNINITIALIZED;
+    private volatile long _lastOpenedTime;
 
     protected static Map<Class<? extends ConfiguredObject>, ConfiguredObject<?>> parentsMap(ConfiguredObject<?>... parents)
     {
@@ -946,6 +947,7 @@ public abstract class AbstractConfigured
                 }
             });
             _openComplete = true;
+            _lastOpenedTime = System.currentTimeMillis();
         }
     }
 
@@ -2730,6 +2732,11 @@ public abstract class AbstractConfigured
         }
     }
 
+    @Override
+    public final long getLastOpenedTime()
+    {
+        return _lastOpenedTime;
+    }
     //=========================================================================================
 
     static String interpolate(ConfiguredObject<?> object, String value)

Modified: qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java?rev=1729368&r1=1729367&r2=1729368&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java (original)
+++ qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java Tue Feb  9 12:19:02 2016
@@ -21,6 +21,7 @@
 package org.apache.qpid.server.model;
 
 import java.util.Collection;
+import java.util.List;
 
 import org.apache.qpid.server.logging.EventLogger;
 import org.apache.qpid.server.logging.EventLoggerProvider;
@@ -166,6 +167,61 @@ public interface Broker<X extends Broker
     @ManagedOperation(nonModifying = true, description = "Initiates an orderly shutdown of the Broker.")
     void initiateShutdown();
 
+    @DerivedAttribute(description = "Maximum heap memory size")
+    long getMaximumHeapMemorySize();
+
+    @DerivedAttribute(description = "Maximum direct memory size which can be consumed by broker")
+    long getMaximumDirectMemorySize();
+
+    @DerivedAttribute(description = "JVM arguments specified on startup")
+    List<String> getJvmArguments();
+
+    @ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME,
+                      units = StatisticUnit.COUNT,
+                      label = "Live threads",
+                      description = "Number of live threads")
+    int getNumberOfLiveThreads();
+
+    @ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME,
+                      units = StatisticUnit.BYTES,
+                      label = "Used Heap Memory Size",
+                      description = "Size of used heap memory")
+    long getUsedHeapMemorySize();
+
+    @ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME,
+                      units = StatisticUnit.BYTES,
+                      label = "Used Direct Memory Size",
+                      description = "Size of used direct memory")
+    long getUsedDirectMemorySize();
+
+    @ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME,
+                      units = StatisticUnit.BYTES,
+                      label = "Direct Memory Total Capacity",
+                      description = "Total capacity of direct memory allocated for the Broker process")
+    long getDirectMemoryTotalCapacity();
+
+    @ManagedStatistic(statisticType = StatisticType.POINT_IN_TIME,
+                      units = StatisticUnit.COUNT,
+                      label = "Number Of Object Pending Finalization",
+                      description = "Number of objects pending finalization")
+    int getNumberOfObjectsPendingFinalization();
+
+    @ManagedOperation(nonModifying = true, description = "Initiates garbage collection")
+    void performGC();
+
+    @ManagedOperation(nonModifying = true,
+                      description = "Collects thread stack traces and dead locks. Dumps stack traces into logs if requested")
+    Content getThreadStackTraces(@Param(name="appendToLog",
+                                        defaultValue = "false",
+                                        description = "If true, appends stack traces into logs")
+                                 boolean appendToLog);
+
+    @ManagedOperation(nonModifying = true,
+            description = "Collects thread stack traces for the threads with names containing matching characters for given regular expression")
+    Content findThreadStackTraces(@Param(name="threadNameFindExpression",
+                                        description = "Regular expression to find threads with names containing matching characters")
+                                 String threadNameFindExpression);
+
     //children
     Collection<VirtualHostNode<?>> getVirtualHostNodes();
 

Copied: qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/model/BrokerAttributeInjector.java (from r1728772, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerAttributeInjector.java)
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/model/BrokerAttributeInjector.java?p2=qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/model/BrokerAttributeInjector.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerAttributeInjector.java&r1=1728772&r2=1729368&rev=1729368&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerAttributeInjector.java (original)
+++ qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/model/BrokerAttributeInjector.java Tue Feb  9 12:19:02 2016
@@ -82,7 +82,7 @@ public class BrokerAttributeInjector imp
                                                                  "",
                                                                  false,
                                                                  "",
-                                                                 "Maximum size of memory pool",
+                                                                 "Maximum size of memory pool " + memoryPoolMXBean.getName(),
                                                                  _typeValidator);
                 attributes.add(injectedStatistic);
             }
@@ -113,7 +113,7 @@ public class BrokerAttributeInjector imp
                         new ConfiguredObjectInjectedStatistic<>(statisticName,
                                                                 getMemoryPoolUsed,
                                                                 new Object[]{memoryPoolMXBean},
-                                                                "Usage of memory in pool",
+                                                                "Usage of memory in pool " + memoryPoolMXBean.getName(),
                                                                 _typeValidator,
                                                                 StatisticUnit.BYTES,
                                                                 StatisticType.POINT_IN_TIME,
@@ -139,7 +139,7 @@ public class BrokerAttributeInjector imp
                         new ConfiguredObjectInjectedStatistic<>(jvmGCCollectionTimeStatisticName,
                                                                 getGCCollectionTime,
                                                                 new Object[]{garbageCollectorMXBean},
-                                                                "Cumulative time in ms taken by GC to perform collections",
+                                                                "Cumulative time in ms taken to perform collections for GC " + garbageCollectorMXBean.getName(),
                                                                 _typeValidator,
                                                                 StatisticUnit.COUNT,
                                                                 StatisticType.CUMULATIVE,
@@ -161,7 +161,7 @@ public class BrokerAttributeInjector imp
                         new ConfiguredObjectInjectedStatistic<>(jvmGCCollectionCountStatisticName,
                                                                 getGCCollectionCount,
                                                                 new Object[]{garbageCollectorMXBean},
-                                                                "Cumulative number of GC collections",
+                                                                "Cumulative number of collections for GC " + garbageCollectorMXBean.getName(),
                                                                 _typeValidator,
                                                                 StatisticUnit.COUNT,
                                                                 StatisticType.CUMULATIVE,

Modified: qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java?rev=1729368&r1=1729367&r2=1729368&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java (original)
+++ qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java Tue Feb  9 12:19:02 2016
@@ -125,6 +125,8 @@ public interface ConfiguredObject<X exte
     @DerivedAttribute
     State getState();
 
+    @DerivedAttribute
+    long getLastOpenedTime();
 
     /**
      * Add a listener which will be informed of all changes to this configuration object

Modified: qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java?rev=1729368&r1=1729367&r2=1729368&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java (original)
+++ qpid/java/branches/6.0.x/broker-core/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java Tue Feb  9 12:19:02 2016
@@ -20,11 +20,19 @@
  */
 package org.apache.qpid.server.model.adapter;
 
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.management.BufferPoolMXBean;
+import java.lang.management.LockInfo;
 import java.lang.management.ManagementFactory;
+import java.lang.management.MonitorInfo;
 import java.lang.management.PlatformManagedObject;
 import java.lang.management.RuntimeMXBean;
+import java.lang.management.ThreadInfo;
+import java.lang.management.ThreadMXBean;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.nio.charset.Charset;
 import java.security.AccessControlException;
 import java.security.PrivilegedAction;
 import java.util.ArrayList;
@@ -118,6 +126,10 @@ public class BrokerAdapter extends Abstr
     private final boolean _virtualHostPropertiesNodeEnabled;
     private Collection<BrokerLogger> _brokerLoggersToClose;
     private int _networkBufferSize = DEFAULT_NETWORK_BUFFER_SIZE;
+    private final long _maximumHeapHize = Runtime.getRuntime().maxMemory();
+    private final long _maximumDirectMemorySize = getMaxDirectMemorySize();
+    private final BufferPoolMXBean _bufferPoolMXBean;
+    private final List<String> _jvmArguments;
 
     @ManagedObjectFactoryConstructor
     public BrokerAdapter(Map<String, Object> attributes,
@@ -150,6 +162,19 @@ public class BrokerAdapter extends Abstr
         _dataDelivered = new StatisticsCounter("bytes-delivered");
         _messagesReceived = new StatisticsCounter("messages-received");
         _dataReceived = new StatisticsCounter("bytes-received");
+
+        BufferPoolMXBean bufferPoolMXBean = null;
+        List<BufferPoolMXBean> bufferPoolMXBeans = ManagementFactory.getPlatformMXBeans(BufferPoolMXBean.class);
+        for(BufferPoolMXBean mBean : bufferPoolMXBeans)
+        {
+            if (mBean.getName().equals("direct"))
+            {
+                bufferPoolMXBean = mBean;
+                break;
+            }
+        }
+        _bufferPoolMXBean = bufferPoolMXBean;
+        _jvmArguments = ManagementFactory.getRuntimeMXBean().getInputArguments();
     }
 
     private void updateEncrypter(final String encryptionProviderType)
@@ -308,6 +333,7 @@ public class BrokerAdapter extends Abstr
     public void initiateShutdown()
     {
         _securityManager.authorise(Operation.SHUTDOWN, this);
+        getEventLogger().message(BrokerMessages.OPERATION("initiateShutdown"));
         _parent.closeAsync();
     }
 
@@ -984,4 +1010,222 @@ public class BrokerAdapter extends Abstr
     {
         return _networkBufferSize;
     }
+
+    @Override
+    public int getNumberOfLiveThreads()
+    {
+        return ManagementFactory.getThreadMXBean().getThreadCount();
+    }
+
+    @Override
+    public long getMaximumHeapMemorySize()
+    {
+        return _maximumHeapHize;
+    }
+
+    @Override
+    public long getUsedHeapMemorySize()
+    {
+        return Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory();
+    }
+
+    @Override
+    public long getMaximumDirectMemorySize()
+    {
+        return _maximumDirectMemorySize;
+    }
+
+    @Override
+    public long getUsedDirectMemorySize()
+    {
+        if (_bufferPoolMXBean == null)
+        {
+            return -1;
+        }
+        return _bufferPoolMXBean.getMemoryUsed();
+    }
+
+    @Override
+    public long getDirectMemoryTotalCapacity()
+    {
+        if (_bufferPoolMXBean == null)
+        {
+            return -1;
+        }
+        return _bufferPoolMXBean.getTotalCapacity();
+    }
+
+    @Override
+    public int getNumberOfObjectsPendingFinalization()
+    {
+        return ManagementFactory.getMemoryMXBean().getObjectPendingFinalizationCount();
+    }
+
+    @Override
+    public List<String> getJvmArguments()
+    {
+        return _jvmArguments;
+    }
+
+    @Override
+    public void performGC()
+    {
+        _securityManager.authorise(Operation.CONFIGURE, this);
+        getEventLogger().message(BrokerMessages.OPERATION("performGC"));
+        System.gc();
+    }
+
+    @Override
+    public Content getThreadStackTraces(boolean appendToLog)
+    {
+        _securityManager.authorise(Operation.CONFIGURE, this);
+        getEventLogger().message(BrokerMessages.OPERATION("getThreadStackTraces"));
+        ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
+        ThreadInfo[] threadInfos = threadMXBean.dumpAllThreads(true, true);
+        StringBuilder threadDump = new StringBuilder();
+        for (ThreadInfo threadInfo : threadInfos)
+        {
+            threadDump.append(getThreadStackTraces(threadInfo));
+        }
+        long[] deadLocks = threadMXBean.findDeadlockedThreads();
+        if (deadLocks != null && deadLocks.length > 0)
+        {
+            ThreadInfo[] deadlockedThreads = threadMXBean.getThreadInfo(deadLocks);
+            threadDump.append(System.lineSeparator()).append("Deadlock is detected!").append(System.lineSeparator());
+            for (ThreadInfo threadInfo : deadlockedThreads)
+            {
+                threadDump.append(getThreadStackTraces(threadInfo));
+            }
+        }
+        String threadStackTraces = threadDump.toString();
+        if (appendToLog)
+        {
+            LOGGER.warn("Thread dump:{} {}", System.lineSeparator(), threadStackTraces);
+        }
+        return new ThreadStackContent(threadStackTraces);
+    }
+
+    @Override
+    public Content findThreadStackTraces(String threadNameFindExpression)
+    {
+        _securityManager.authorise(Operation.CONFIGURE, this);
+        getEventLogger().message(BrokerMessages.OPERATION("findThreadStackTraces"));
+        ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
+        ThreadInfo[] threadInfos = threadMXBean.dumpAllThreads(true, true);
+        StringBuilder threadDump = new StringBuilder();
+        Pattern pattern = threadNameFindExpression == null || threadNameFindExpression.equals("") ? null : Pattern.compile(
+                threadNameFindExpression);
+        for (ThreadInfo threadInfo : threadInfos)
+        {
+            if (pattern== null || pattern.matcher(threadInfo.getThreadName()).find())
+            {
+                threadDump.append(getThreadStackTraces(threadInfo));
+            }
+        }
+        return new ThreadStackContent(threadDump.toString());
+    }
+
+    private String getThreadStackTraces(final ThreadInfo threadInfo)
+    {
+        String lineSeparator = System.lineSeparator();
+        StringBuilder dump = new StringBuilder();
+        dump.append("\"").append(threadInfo.getThreadName()).append("\"").append(" Id=")
+            .append(threadInfo.getThreadId()).append( " ").append(threadInfo.getThreadState());
+        if (threadInfo.getLockName() != null)
+        {
+            dump.append(" on ").append(threadInfo.getLockName());
+        }
+        if (threadInfo.getLockOwnerName() != null)
+        {
+            dump.append(" owned by \"").append(threadInfo.getLockOwnerName())
+                .append("\" Id=").append(threadInfo.getLockOwnerId());
+        }
+        if (threadInfo.isSuspended())
+        {
+            dump.append(" (suspended)");
+        }
+        if (threadInfo.isInNative())
+        {
+            dump.append(" (in native)");
+        }
+        dump.append(lineSeparator);
+        StackTraceElement[] stackTrace = threadInfo.getStackTrace();
+        for (int i = 0; i < stackTrace.length; i++)
+        {
+            StackTraceElement stackTraceElement = stackTrace[i];
+            dump.append("    at ").append(stackTraceElement.toString()).append(lineSeparator);
+
+            LockInfo lockInfo = threadInfo.getLockInfo();
+            if (i == 0 && lockInfo != null)
+            {
+                Thread.State threadState = threadInfo.getThreadState();
+                switch (threadState)
+                {
+                    case BLOCKED:
+                        dump.append("    -  blocked on ").append(lockInfo).append(lineSeparator);
+                        break;
+                    case WAITING:
+                        dump.append("    -  waiting on ").append(lockInfo).append(lineSeparator);
+                        break;
+                    case TIMED_WAITING:
+                        dump.append("    -  waiting on ").append(lockInfo).append(lineSeparator);
+                        break;
+                    default:
+                }
+            }
+
+            for (MonitorInfo mi : threadInfo.getLockedMonitors())
+            {
+                if (mi.getLockedStackDepth() == i)
+                {
+                    dump.append("    -  locked ").append(mi).append(lineSeparator);
+                }
+            }
+        }
+
+        LockInfo[] locks = threadInfo.getLockedSynchronizers();
+        if (locks.length > 0)
+        {
+            dump.append(lineSeparator).append("    Number of locked synchronizers = ").append(locks.length);
+            dump.append(lineSeparator);
+            for (LockInfo li : locks)
+            {
+                dump.append("    - " + li);
+                dump.append(lineSeparator);
+            }
+        }
+        dump.append(lineSeparator);
+        return dump.toString();
+    }
+
+    public static class ThreadStackContent implements Content, CustomRestHeaders
+    {
+        private final String _threadStackTraces;
+
+        public ThreadStackContent(final String threadStackTraces)
+        {
+            _threadStackTraces = threadStackTraces;
+        }
+
+        @Override
+        public void write(final OutputStream outputStream) throws IOException
+        {
+            if (_threadStackTraces != null)
+            {
+                outputStream.write(_threadStackTraces.getBytes(Charset.forName("UTF-8")));
+            }
+        }
+
+        @RestContentHeader("Content-Type")
+        public String getContentType()
+        {
+            return "text/plain;charset=utf-8";
+        }
+
+        @RestContentHeader("Content-Length")
+        public long getSize()
+        {
+            return _threadStackTraces == null ? 0 : _threadStackTraces.length();
+        }
+    }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org