Author: robbie
Date: Wed Jun 27 15:49:08 2012
New Revision: 1354590
URL: http://svn.apache.org/viewvc?rev=1354590&view=rev
Log:
merge changes from trunk up to r1353860
Modified:
qpid/branches/java-config-and-management/qpid/java/ (props changed)
qpid/branches/java-config-and-management/qpid/java/amqp-1-0-client/
(props changed)
qpid/branches/java-config-and-management/qpid/java/amqp-1-0-client-jms/
(props changed)
qpid/branches/java-config-and-management/qpid/java/amqp-1-0-common/
(props changed)
qpid/branches/java-config-and-management/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HATestClusterCreator.java
qpid/branches/java-config-and-management/qpid/java/broker/ (props changed)
qpid/branches/java-config-and-management/qpid/java/broker/bin/ (props
changed)
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/
(props changed)
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/
(props changed)
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/
(props changed)
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc
(props changed)
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java
(props changed)
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/BrokerHolder.java
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
(contents, props changed)
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java
qpid/branches/java-config-and-management/qpid/java/test-profiles/ (props
changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/CPPExcludes
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/Excludes
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaBDBExcludes
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaExcludes
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaPre010Excludes
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaTransientExcludes
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/XAExcludes
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.async.testprofile
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.cluster.testprofile
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.noprefetch.testprofile
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.ssl.excludes
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.ssl.testprofile
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.testprofile
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-bdb.0-9-1.testprofile
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-dby.0-9-1.testprofile
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-mms.0-9-1.testprofile
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/log4j-test.xml
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/python_tests/Java010PythonExcludes
qpid/branches/java-config-and-management/qpid/java/test-profiles/test-provider.properties
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/test_resources/
(props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/testprofile.defaults
(props changed)
Propchange: qpid/branches/java-config-and-management/qpid/java/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java:r1350723-1353860
Propchange: qpid/branches/java-config-and-management/qpid/java/amqp-1-0-client/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/amqp-1-0-client:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/amqp-1-0-client-jms/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/amqp-1-0-client-jms:r1350723-1353860
Propchange: qpid/branches/java-config-and-management/qpid/java/amqp-1-0-common/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/amqp-1-0-common:r1350723-1353860
Modified:
qpid/branches/java-config-and-management/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HATestClusterCreator.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HATestClusterCreator.java?rev=1354590&r1=1354589&r2=1354590&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HATestClusterCreator.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HATestClusterCreator.java
Wed Jun 27 15:49:08 2012
@@ -60,7 +60,7 @@ public class HATestClusterCreator
private static final String SINGLE_BROKER_URL_WITH_RETRY_FORMAT =
"amqp://guest:guest@/%s?brokerlist='tcp://localhost:%d?connectdelay='%d',retries='%d''";
private static final String SINGLE_BROKER_URL_WITHOUT_RETRY_FORMAT =
"amqp://guest:guest@/%s?brokerlist='tcp://localhost:%d'";
- private static final int RETRIES = 30;
+ private static final int RETRIES = 60;
private static final int CONNECTDELAY = 75;
private final QpidBrokerTestCase _testcase;
Propchange: qpid/branches/java-config-and-management/qpid/java/broker/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker:r1350723-1353860
Propchange: qpid/branches/java-config-and-management/qpid/java/broker/bin/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker/bin:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/eclipse-plugin/src:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java:r1350723-1353860
Modified:
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/BrokerHolder.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/BrokerHolder.java?rev=1354590&r1=1354589&r2=1354590&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/BrokerHolder.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/BrokerHolder.java
Wed Jun 27 15:49:08 2012
@@ -25,4 +25,5 @@ public interface BrokerHolder
String getWorkingDirectory();
void shutdown();
void kill();
+ String dumpThreads();
}
Modified:
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java?rev=1354590&r1=1354589&r2=1354590&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java
Wed Jun 27 15:49:08 2012
@@ -20,6 +20,9 @@
*/
package org.apache.qpid.test.utils;
+import java.lang.management.ManagementFactory;
+import java.lang.management.ThreadInfo;
+import java.lang.management.ThreadMXBean;
import java.util.Set;
import org.apache.log4j.Logger;
@@ -69,12 +72,44 @@ public class InternalBrokerHolder implem
{
// Can't kill a internal broker as we would also kill ourselves as we
share the same JVM.
shutdown();
-
- waitUntilPortsAreFree();
}
private void waitUntilPortsAreFree()
{
new PortHelper().waitUntilPortsAreFree(_portsUsedByBroker);
}
+
+ @Override
+ public String dumpThreads()
+ {
+ ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
+ ThreadInfo[] threadInfos = threadMXBean.dumpAllThreads(true, true);
+ StringBuilder dump = new StringBuilder();
+ dump.append(String.format("%n"));
+ for (ThreadInfo threadInfo : threadInfos)
+ {
+ dump.append(threadInfo);
+ }
+
+ long[] deadLocks = threadMXBean.findDeadlockedThreads();
+ if (deadLocks != null && deadLocks.length > 0)
+ {
+ ThreadInfo[] deadlockedThreads =
threadMXBean.getThreadInfo(deadLocks);
+ dump.append(String.format("%n"));
+ dump.append("Deadlock is detected!");
+ dump.append(String.format("%n"));
+ for (ThreadInfo threadInfo : deadlockedThreads)
+ {
+ dump.append(threadInfo);
+ }
+ }
+ return dump.toString();
+ }
+
+ @Override
+ public String toString()
+ {
+ return "InternalBrokerHolder [_portsUsedByBroker=" +
_portsUsedByBroker + "]";
+ }
+
}
Modified:
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java?rev=1354590&r1=1354589&r2=1354590&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
Wed Jun 27 15:49:08 2012
@@ -717,11 +717,55 @@ public class QpidBrokerTestCase extends
public void stopAllBrokers()
{
+ boolean exceptionOccured = false;
Set<Integer> runningBrokerPorts = new
HashSet<Integer>(getBrokerPortNumbers());
for (int brokerPortNumber : runningBrokerPorts)
{
+ if (!stopBrokerSafely(brokerPortNumber))
+ {
+ exceptionOccured = true;
+ }
+ }
+ if (exceptionOccured)
+ {
+ throw new RuntimeException("Exception occured on stopping of test
broker. Please, examine logs for details");
+ }
+ }
+
+ protected boolean stopBrokerSafely(int brokerPortNumber)
+ {
+ boolean success = true;
+ BrokerHolder broker = _brokers.get(brokerPortNumber);
+ try
+ {
stopBroker(brokerPortNumber);
}
+ catch(Exception e)
+ {
+ success = false;
+ _logger.error("Failed to stop broker " + broker + " at port " +
brokerPortNumber, e);
+ if (broker != null)
+ {
+ // save the thread dump in case of dead locks
+ try
+ {
+ _logger.error("Broker " + broker + " thread dump:" +
broker.dumpThreads());
+ }
+ finally
+ {
+ // try to kill broker
+ try
+ {
+ broker.kill();
+ }
+ catch(Exception killException)
+ {
+ // ignore
+ }
+ }
+ }
+ }
+ return success;
}
public void stopBroker(int port)
Propchange:
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java:r1350723-1353860
Modified:
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java?rev=1354590&r1=1354589&r2=1354590&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java
Wed Jun 27 15:49:08 2012
@@ -20,7 +20,9 @@
*/
package org.apache.qpid.test.utils;
+import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.util.Set;
import org.apache.log4j.Logger;
@@ -158,4 +160,32 @@ public class SpawnedBrokerHolder impleme
new PortHelper().waitUntilPortsAreFree(_portsUsedByBroker);
}
+ @Override
+ public String dumpThreads()
+ {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ try
+ {
+ Process process = Runtime.getRuntime().exec("jstack " + _pid);
+ InputStream is = process.getInputStream();
+ byte[] buffer = new byte[1024];
+ int length = -1;
+ while ((length = is.read(buffer)) != -1)
+ {
+ baos.write(buffer, 0, length);
+ }
+ }
+ catch (Exception e)
+ {
+ LOGGER.error("Error whilst collecting thread dump for " + _pid, e);
+ }
+ return new String(baos.toByteArray());
+ }
+
+ @Override
+ public String toString()
+ {
+ return "SpawnedBrokerHolder [_pid=" + _pid + ", _portsUsedByBroker="
+ + _portsUsedByBroker + "]";
+ }
}
Propchange: qpid/branches/java-config-and-management/qpid/java/test-profiles/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/CPPExcludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/CPPExcludes:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/Excludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/Excludes:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaBDBExcludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/JavaBDBExcludes:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaExcludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/JavaExcludes:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaPre010Excludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/JavaPre010Excludes:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaTransientExcludes
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/XAExcludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/XAExcludes:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.async.testprofile
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.cluster.testprofile
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.noprefetch.testprofile
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.ssl.excludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/cpp.ssl.excludes:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.ssl.testprofile
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/cpp.testprofile:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-bdb.0-9-1.testprofile
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/java-bdb.0-9-1.testprofile:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-dby.0-9-1.testprofile
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-mms.0-9-1.testprofile
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/java-mms.0-9-1.testprofile:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/log4j-test.xml
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/log4j-test.xml:r1350723-1353860
Modified:
qpid/branches/java-config-and-management/qpid/java/test-profiles/python_tests/Java010PythonExcludes
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/test-profiles/python_tests/Java010PythonExcludes?rev=1354590&r1=1354589&r2=1354590&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/test-profiles/python_tests/Java010PythonExcludes
(original)
+++
qpid/branches/java-config-and-management/qpid/java/test-profiles/python_tests/Java010PythonExcludes
Wed Jun 27 15:49:08 2012
@@ -21,6 +21,7 @@
#The broker does not have the appropriate QMF support
qpid_tests.broker_0_10.management.*
+qpid_tests.broker_0_10.qmf_events.*
qpid_tests.broker_0_10.stats.BrokerStatsTests.*
qpid_tests.broker_0_10.msg_groups.MultiConsumerMsgGroupTests.test_default_group_id
qpid_tests.broker_0_10.msg_groups.MultiConsumerMsgGroupTests.test_move_*
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/test-provider.properties
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/test-provider.properties:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/test_resources/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/test_resources:r1350723-1353860
Propchange:
qpid/branches/java-config-and-management/qpid/java/test-profiles/testprofile.defaults
------------------------------------------------------------------------------
Merged
/qpid/trunk/qpid/java/test-profiles/testprofile.defaults:r1350723-1353860
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
