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 2017/11/27 18:05:17 UTC
[1/2] activemq-artemis git commit: This closes #1669
Repository: activemq-artemis
Updated Branches:
refs/heads/master bce766c39 -> c4ba7af01
This closes #1669
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/c4ba7af0
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/c4ba7af0
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/c4ba7af0
Branch: refs/heads/master
Commit: c4ba7af01a743b8ee5db16a0e39bd0d91a41bb9e
Parents: bce766c 4edf679
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Nov 27 13:05:12 2017 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Nov 27 13:05:12 2017 -0500
----------------------------------------------------------------------
.../impl/view/ActiveMQAbstractView.java | 6 +-
.../core/management/impl/view/AddressView.java | 5 +
.../ActiveMQServerControlMultiThreadTest.java | 156 +++++++++++++++++++
3 files changed, 166 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[2/2] activemq-artemis git commit: ARTEMIS-1524 avoid null pointer
due to race condition in listAddresses(). If address is deleted,
ignore that address and continue
Posted by cl...@apache.org.
ARTEMIS-1524 avoid null pointer due to race condition in listAddresses(). If address is deleted, ignore that address and continue
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/4edf6793
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/4edf6793
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/4edf6793
Branch: refs/heads/master
Commit: 4edf6793bb0c863b77fee8c161fc1e72b021c9b5
Parents: bce766c
Author: Pat Fox <pa...@gmail.com>
Authored: Fri Nov 24 14:12:00 2017 +0100
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Nov 27 13:05:12 2017 -0500
----------------------------------------------------------------------
.../impl/view/ActiveMQAbstractView.java | 6 +-
.../core/management/impl/view/AddressView.java | 5 +
.../ActiveMQServerControlMultiThreadTest.java | 156 +++++++++++++++++++
3 files changed, 166 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4edf6793/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/ActiveMQAbstractView.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/ActiveMQAbstractView.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/ActiveMQAbstractView.java
index 4fb5afe..9608d86 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/ActiveMQAbstractView.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/ActiveMQAbstractView.java
@@ -65,7 +65,11 @@ public abstract class ActiveMQAbstractView<T> {
JsonArrayBuilder array = JsonLoader.createArrayBuilder();
collection = Collections2.filter(collection, getPredicate());
for (T element : getPagedResult(page, pageSize)) {
- array.add(toJson(element));
+ JsonObjectBuilder jsonObjectBuilder = toJson(element);
+ //toJson() may return a null
+ if (jsonObjectBuilder != null) {
+ array.add(jsonObjectBuilder);
+ }
}
obj.add("data", array);
obj.add("count", collection.size());
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4edf6793/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/AddressView.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/AddressView.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/AddressView.java
index fcc3464..3947c0c 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/AddressView.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/AddressView.java
@@ -45,6 +45,11 @@ public class AddressView extends ActiveMQAbstractView<SimpleString> {
public JsonObjectBuilder toJson(SimpleString addressName) {
AddressInfo address = server.getAddressInfo(addressName);
+ // the address could have been removed since the list was created
+ // if it is not there, just ignore.
+ if (address == null) {
+ return null;
+ }
JsonObjectBuilder obj = JsonLoader.createObjectBuilder().add("id", toString(address.getId())).add("name", toString(address.getName())).add("routingTypes", toString(address.getRoutingTypes()));
try {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4edf6793/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ActiveMQServerControlMultiThreadTest.java
----------------------------------------------------------------------
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ActiveMQServerControlMultiThreadTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ActiveMQServerControlMultiThreadTest.java
new file mode 100644
index 0000000..2735d04
--- /dev/null
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ActiveMQServerControlMultiThreadTest.java
@@ -0,0 +1,156 @@
+/**
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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.activemq.artemis.tests.extras.byteman;
+
+import javax.json.JsonArray;
+import javax.json.JsonObject;
+import java.util.HashMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.activemq.artemis.api.core.JsonUtil;
+import org.apache.activemq.artemis.api.core.RoutingType;
+import org.apache.activemq.artemis.api.core.management.ActiveMQServerControl;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.tests.integration.management.ManagementControlHelper;
+import org.apache.activemq.artemis.tests.integration.management.ManagementTestBase;
+import org.jboss.byteman.contrib.bmunit.BMRule;
+import org.jboss.byteman.contrib.bmunit.BMRules;
+import org.jboss.byteman.contrib.bmunit.BMUnitRunner;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(BMUnitRunner.class)
+public class ActiveMQServerControlMultiThreadTest extends ManagementTestBase {
+
+ private ActiveMQServer server;
+ private static volatile CountDownLatch delayCalled;
+
+ /**
+ * Aim: verify that no exceptions will occur if deleteAddress() is invoked when listAddress() is happening
+ *
+ * test delays the listAddress() operations; delay after the list of addresses are retrieved but before
+ * Json string (representing the addresses) is created.
+ *
+ * @throws Exception
+ */
+
+ @Test
+ @BMRules(rules = {@BMRule(
+ name = "Delay listAddress() by 2 secs ",
+ targetClass = "org.apache.activemq.artemis.core.management.impl.view.AddressView ",
+ targetMethod = "<init>(org.apache.activemq.artemis.core.server.ActiveMQServer)",
+ targetLocation = "ENTRY",
+ action = "org.apache.activemq.artemis.tests.extras.byteman.ActiveMQServerControlMultiThreadTest.delay(2)")})
+
+ public void listAddressDuringDeleteAddress() throws Exception {
+
+ ExecutorService executorService = Executors.newFixedThreadPool(1);
+ String addressName1 = "MyAddress_one";
+ String addressName2 = "MyAddress_two";
+
+ try {
+
+ //used to block thread, until the delay() has been called.
+ delayCalled = new CountDownLatch(1);
+
+ ActiveMQServerControl serverControl = createManagementControl();
+
+ serverControl.createAddress(addressName1, RoutingType.ANYCAST.toString());
+ serverControl.createAddress(addressName2, RoutingType.ANYCAST.toString());
+
+ executorService.submit(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ // wait until the listAddress has retrieved list of addresses BUT has not
+ // created JSon string.
+ delayCalled.await();
+ serverControl.deleteAddress(addressName1);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ }
+ });
+
+ String filter = createJsonFilter("", "", "");
+ String addressesAsJsonString = serverControl.listAddresses(filter, 1, 10);
+ JsonObject addressesAsJsonObject = JsonUtil.readJsonObject(addressesAsJsonString);
+ JsonArray addressesArray = (JsonArray) addressesAsJsonObject.get("data");
+
+ // the deleteAddress() should have happened before the Json String was created
+ Assert.assertEquals("number of Addresses returned from query", 1, addressesArray.size());
+ Assert.assertEquals("check addresses username", addressName2.toString(), addressesArray.getJsonObject(0).getString("name"));
+
+ } finally {
+ executorService.shutdown();
+ }
+ }
+
+ //notify delay has been called and wait for X seconds
+ public static void delay(int seconds) {
+ delayCalled.countDown();
+ try {
+ Thread.sleep(TimeUnit.SECONDS.toMillis(seconds));
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+
+ }
+
+ @Override
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+
+ Configuration config = createDefaultInVMConfig().setJMXManagementEnabled(true);
+ server = createServer(false, config);
+ server.setMBeanServer(mbeanServer);
+ server.start();
+
+ }
+
+ @Override
+ @After
+ public void tearDown() throws Exception {
+ super.tearDown();
+ server.stop();
+
+ }
+
+ protected ActiveMQServerControl createManagementControl() throws Exception {
+ return ManagementControlHelper.createActiveMQServerControl(mbeanServer);
+ }
+
+ private String createJsonFilter(String fieldName, String operationName, String value) {
+ HashMap<String, Object> filterMap = new HashMap<>();
+ filterMap.put("field", fieldName);
+ filterMap.put("operation", operationName);
+ filterMap.put("value", value);
+ JsonObject jsonFilterObject = JsonUtil.toJsonObject(filterMap);
+ return jsonFilterObject.toString();
+ }
+
+}
\ No newline at end of file