You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2015/08/04 17:46:06 UTC
[1/3] activemq-artemis git commit: fixing tests
Repository: activemq-artemis
Updated Branches:
refs/heads/master 39b9fd1ce -> bff0886b0
fixing tests
The refactoring on native left a few name changes and a small twek that I needed to make on buffers
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/517e0766
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/517e0766
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/517e0766
Branch: refs/heads/master
Commit: 517e0766207d93d5b00671fadd04fde0bbff548c
Parents: 7cfc337
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Aug 3 19:26:33 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Aug 3 23:39:35 2015 -0400
----------------------------------------------------------------------
.../tests/extras/byteman/ClosingConnectionTest.java | 2 +-
.../artemis/tests/extras/byteman/PagingLeakTest.java | 10 +++++-----
.../tests/integration/cluster/bridge/BridgeTest.java | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/517e0766/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ClosingConnectionTest.java
----------------------------------------------------------------------
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ClosingConnectionTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ClosingConnectionTest.java
index 8515d11..249505d 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ClosingConnectionTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ClosingConnectionTest.java
@@ -125,7 +125,7 @@ public class ClosingConnectionTest extends ActiveMQTestBase
@BMRule
(
name = "rule to kill connection",
- targetClass = "org.apache.activemq.artemis.core.journal.impl.NIOSequentialFile",
+ targetClass = "org.apache.activemq.artemis.core.io.nio.NIOSequentialFile",
targetMethod = "open(int, boolean)",
targetLocation = "AT INVOKE java.nio.channels.FileChannel.size()",
action = "org.apache.activemq.artemis.tests.extras.byteman.ClosingConnectionTest.killConnection();"
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/517e0766/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/PagingLeakTest.java
----------------------------------------------------------------------
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/PagingLeakTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/PagingLeakTest.java
index 0bbebc8..c5d7a13 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/PagingLeakTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/PagingLeakTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.activemq.artemis.tests.extras.byteman;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.api.core.client.ClientConsumer;
import org.apache.activemq.artemis.api.core.client.ClientMessage;
@@ -38,10 +42,6 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-
@RunWith(BMUnitRunner.class)
public class PagingLeakTest extends ActiveMQTestBase
{
@@ -122,7 +122,7 @@ public class PagingLeakTest extends ActiveMQTestBase
// A backup that will be waiting to be activated
Configuration config = createDefaultNettyConfig();
- config.setJournalBufferTimeout_AIO(0).setJournalBufferTimeout_NIO(0);
+ config.setJournalBufferTimeout_AIO(10).setJournalBufferTimeout_NIO(10);
final ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(config, true));
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/517e0766/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java
index 151e2b4..470ae07 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java
@@ -1345,7 +1345,7 @@ public class BridgeTest extends ActiveMQTestBase
Map<String, Object> server1Params = new HashMap<String, Object>();
addTargetParameters(server1Params);
server1 = createClusteredServerWithParams(isNetty(), 1, true, PAGE_SIZE, PAGE_MAX, server1Params);
- server1.getConfiguration().setJournalBufferTimeout_AIO(0).setJournalBufferTimeout_NIO(0);
+ server1.getConfiguration().setJournalBufferTimeout_AIO(10).setJournalBufferTimeout_NIO(10);
final String testAddress = "testAddress";
final String queueName0 = "queue0";
@@ -1360,7 +1360,7 @@ public class BridgeTest extends ActiveMQTestBase
server0.getConfiguration().setConnectorConfigurations(connectors);
- server0.getConfiguration().setIDCacheSize(20000).setJournalBufferTimeout_NIO(0).setJournalBufferTimeout_AIO(0);
+ server0.getConfiguration().setIDCacheSize(20000).setJournalBufferTimeout_NIO(10).setJournalBufferTimeout_AIO(10);
ArrayList<String> staticConnectors = new ArrayList<String>();
staticConnectors.add(server1tc.getName());
[2/3] activemq-artemis git commit: ARTEMIS-162 Fix non serializable
JGroups on Configuration clone used on Colocated support
Posted by cl...@apache.org.
ARTEMIS-162 Fix non serializable JGroups on Configuration clone used on Colocated support
https://issues.apache.org/jira/browse/ARTEMIS-162
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/7cfc3379
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/7cfc3379
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/7cfc3379
Branch: refs/heads/master
Commit: 7cfc33790d710436fe1de9aea844f0350cc60e16
Parents: 39b9fd1
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Aug 3 16:49:40 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Aug 3 23:39:35 2015 -0400
----------------------------------------------------------------------
.../core/config/impl/ConfigurationImpl.java | 34 ++++++++++++++++----
.../core/config/impl/ConfigurationImplTest.java | 16 ++-------
...tionFactoryWithJGroupsSerializationTest.java | 13 ++++++--
3 files changed, 41 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7cfc3379/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
index 0f0616b..c6dab0e 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
@@ -23,6 +23,8 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.net.URI;
+import java.security.AccessController;
+import java.security.PrivilegedExceptionAction;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -50,6 +52,7 @@ import org.apache.activemq.artemis.core.server.JournalType;
import org.apache.activemq.artemis.core.server.group.impl.GroupingHandlerConfiguration;
import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
import org.apache.activemq.artemis.core.settings.impl.ResourceLimitSettings;
+import org.apache.activemq.artemis.utils.ObjectInputStreamWithClassLoader;
public class ConfigurationImpl implements Configuration, Serializable
{
@@ -114,9 +117,9 @@ public class ConfigurationImpl implements Configuration, Serializable
private List<CoreQueueConfiguration> queueConfigurations = new ArrayList<CoreQueueConfiguration>();
- protected List<BroadcastGroupConfiguration> broadcastGroupConfigurations = new ArrayList<BroadcastGroupConfiguration>();
+ protected transient List<BroadcastGroupConfiguration> broadcastGroupConfigurations = new ArrayList<BroadcastGroupConfiguration>();
- protected Map<String, DiscoveryGroupConfiguration> discoveryGroupConfigurations = new LinkedHashMap<String, DiscoveryGroupConfiguration>();
+ protected transient Map<String, DiscoveryGroupConfiguration> discoveryGroupConfigurations = new LinkedHashMap<String, DiscoveryGroupConfiguration>();
// Paging related attributes ------------------------------------------------------------
@@ -1586,11 +1589,28 @@ public class ConfigurationImpl implements Configuration, Serializable
@Override
public Configuration copy() throws Exception
{
- ByteArrayOutputStream bos = new ByteArrayOutputStream();
- ObjectOutputStream os = new ObjectOutputStream(bos);
- os.writeObject(this);
- ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(bos.toByteArray()));
- return (Configuration) ois.readObject();
+
+ return AccessController.doPrivileged(new PrivilegedExceptionAction<Configuration>()
+ {
+ @Override
+ public Configuration run() throws Exception
+ {
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ ObjectOutputStream os = new ObjectOutputStream(bos);
+ os.writeObject(ConfigurationImpl.this);
+ ObjectInputStream ois = new ObjectInputStreamWithClassLoader(new ByteArrayInputStream(bos.toByteArray()));
+ Configuration config = (Configuration) ois.readObject();
+
+ // this is transient because of possible jgroups integration, we need to copy it manually
+ config.setBroadcastGroupConfigurations(ConfigurationImpl.this.getBroadcastGroupConfigurations());
+
+ // this is transient because of possible jgroups integration, we need to copy it manually
+ config.setDiscoveryGroupConfigurations(ConfigurationImpl.this.getDiscoveryGroupConfigurations());
+
+ return config;
+ }
+ });
+
}
@Override
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7cfc3379/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImplTest.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImplTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImplTest.java
index dd9f584..b6d036f 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImplTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImplTest.java
@@ -22,17 +22,12 @@ import org.apache.activemq.artemis.core.config.Configuration;
import org.apache.activemq.artemis.core.config.ha.LiveOnlyPolicyConfiguration;
import org.apache.activemq.artemis.core.journal.impl.JournalConstants;
import org.apache.activemq.artemis.core.server.JournalType;
-import org.apache.activemq.artemis.tests.util.RandomUtil;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
+import org.apache.activemq.artemis.tests.util.RandomUtil;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
public class ConfigurationImplTest extends ActiveMQTestBase
{
protected Configuration conf;
@@ -497,14 +492,9 @@ public class ConfigurationImplTest extends ActiveMQTestBase
conf.setClusterPassword(s);
Assert.assertEquals(s, conf.getClusterPassword());
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- ObjectOutputStream oos = new ObjectOutputStream(baos);
- oos.writeObject(conf);
- oos.flush();
+ // This will use serialization to perform a deep copy of the object
+ Configuration conf2 = conf.copy();
- ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
- ObjectInputStream ois = new ObjectInputStream(bais);
- Configuration conf2 = (Configuration)ois.readObject();
Assert.assertTrue(conf.equals(conf2));
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7cfc3379/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ConnectionFactoryWithJGroupsSerializationTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ConnectionFactoryWithJGroupsSerializationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ConnectionFactoryWithJGroupsSerializationTest.java
index 4b58ee1..bf50760 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ConnectionFactoryWithJGroupsSerializationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ConnectionFactoryWithJGroupsSerializationTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.activemq.artemis.tests.integration.jms.connection;
+import javax.jms.Queue;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -23,19 +24,19 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
-import javax.jms.Queue;
-
import org.apache.activemq.artemis.api.core.BroadcastEndpoint;
import org.apache.activemq.artemis.api.core.BroadcastEndpointFactory;
import org.apache.activemq.artemis.api.core.ChannelBroadcastEndpointFactory;
import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration;
import org.apache.activemq.artemis.api.core.JGroupsFileBroadcastEndpointFactory;
import org.apache.activemq.artemis.api.jms.JMSFactoryType;
+import org.apache.activemq.artemis.core.config.Configuration;
import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
import org.apache.activemq.artemis.tests.util.JMSTestBase;
import org.jgroups.JChannel;
import org.jgroups.conf.PlainConfigurator;
import org.junit.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -168,6 +169,14 @@ public class ConnectionFactoryWithJGroupsSerializationTest extends JMSTestBase
assertTrue(broadcastEndpoint instanceof JGroupsFileBroadcastEndpointFactory);
}
+ @Test
+ public void testCopyConfiguration() throws Exception
+ {
+ Assert.assertEquals(2, jmsServer.getActiveMQServer().getConfiguration().getDiscoveryGroupConfigurations().size());
+ Configuration copiedconfig = jmsServer.getActiveMQServer().getConfiguration().copy();
+ Assert.assertEquals(2, copiedconfig.getDiscoveryGroupConfigurations().size());
+ }
+
@Override
@After
public void tearDown() throws Exception
[3/3] activemq-artemis git commit: This closes #106 fixes
Posted by cl...@apache.org.
This closes #106 fixes
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/bff0886b
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/bff0886b
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/bff0886b
Branch: refs/heads/master
Commit: bff0886b0c1d9353c0cad70ad7cec625033affb8
Parents: 39b9fd1 517e076
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue Aug 4 11:45:38 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Aug 4 11:45:38 2015 -0400
----------------------------------------------------------------------
.../core/config/impl/ConfigurationImpl.java | 34 ++++++++++++++++----
.../core/config/impl/ConfigurationImplTest.java | 16 ++-------
.../extras/byteman/ClosingConnectionTest.java | 2 +-
.../tests/extras/byteman/PagingLeakTest.java | 10 +++---
.../integration/cluster/bridge/BridgeTest.java | 4 +--
...tionFactoryWithJGroupsSerializationTest.java | 13 ++++++--
6 files changed, 49 insertions(+), 30 deletions(-)
----------------------------------------------------------------------