You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2015/11/06 18:55:13 UTC
svn commit: r1712995 - in /qpid/java/trunk:
bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/
bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/
broker-core/src/main/java/org/apache/qpid/server/queue/ broker-c...
Author: kwall
Date: Fri Nov 6 17:55:12 2015
New Revision: 1712995
URL: http://svn.apache.org/viewvc?rev=1712995&view=rev
Log:
QPID-6831: Remove logging of CSRE in construction. Remove some inappropiate uses of CSRE
Added:
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/MapJsonSerializer.java
- copied, changed from r1712964, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/MapJsonSerializer.java
qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/MapJsonSerializerTest.java
- copied, changed from r1712964, qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/MapJsonSerializerTest.java
Removed:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/MapJsonSerializer.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/MapJsonSerializerTest.java
Modified:
qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java
qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java
qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom7To8Test.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/QueueRunner.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/ConnectionScopedRuntimeException.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/codec/ServerDecoder.java
Copied: qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/MapJsonSerializer.java (from r1712964, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/MapJsonSerializer.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/MapJsonSerializer.java?p2=qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/MapJsonSerializer.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/MapJsonSerializer.java&r1=1712964&r2=1712995&rev=1712995&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/MapJsonSerializer.java (original)
+++ qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/MapJsonSerializer.java Fri Nov 6 17:55:12 2015
@@ -18,8 +18,9 @@
* under the License.
*
*/
-package org.apache.qpid.server.util;
+package org.apache.qpid.server.store.berkeleydb.upgrade;
+import java.io.IOException;
import java.io.StringWriter;
import java.util.Map;
@@ -33,38 +34,23 @@ public class MapJsonSerializer
{
};
- private ObjectMapper _mapper;
+ private final ObjectMapper _mapper;
public MapJsonSerializer()
{
_mapper = new ObjectMapper();
}
- public String serialize(Map<String, Object> attributeMap)
+ public String serialize(Map<String, Object> attributeMap) throws IOException
{
StringWriter stringWriter = new StringWriter();
- try
- {
- _mapper.writeValue(stringWriter, attributeMap);
- }
- catch (Exception e)
- {
- throw new ConnectionScopedRuntimeException("Failure to serialize map:" + attributeMap, e);
- }
+ _mapper.writeValue(stringWriter, attributeMap);
return stringWriter.toString();
}
- public Map<String, Object> deserialize(String json)
+ public Map<String, Object> deserialize(String json) throws IOException
{
- Map<String, Object> attributesMap = null;
- try
- {
- attributesMap = _mapper.readValue(json, MAP_TYPE_REFERENCE);
- }
- catch (Exception e)
- {
- throw new ConnectionScopedRuntimeException("Failure to deserialize json:" + json, e);
- }
+ Map<String, Object> attributesMap = _mapper.readValue(json, MAP_TYPE_REFERENCE);
return attributesMap;
}
}
Modified: qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java?rev=1712995&r1=1712994&r2=1712995&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java (original)
+++ qpid/java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java Fri Nov 6 17:55:12 2015
@@ -24,6 +24,7 @@ import static org.apache.qpid.server.sto
import static org.apache.qpid.server.store.berkeleydb.upgrade.UpgradeInteractionResponse.NO;
import static org.apache.qpid.server.store.berkeleydb.upgrade.UpgradeInteractionResponse.YES;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -63,7 +64,6 @@ import org.apache.qpid.server.queue.Queu
import org.apache.qpid.server.store.StoreException;
import org.apache.qpid.server.store.berkeleydb.AMQShortStringEncoding;
import org.apache.qpid.server.store.berkeleydb.FieldTableEncoding;
-import org.apache.qpid.server.util.MapJsonSerializer;
public class UpgradeFrom5To6 extends AbstractStoreUpgrade
{
@@ -522,7 +522,7 @@ public class UpgradeFrom5To6 extends Abs
{
Map<String, Object> attributesMap = buildQueueArgumentMap(queueName,
owner, exclusive, arguments);
- String json = _serializer.serialize(attributesMap);
+ String json = serialiseMap(attributesMap);
UpgradeConfiguredObjectRecord configuredObject = new UpgradeConfiguredObjectRecord(Queue.class.getName(), json);
return configuredObject;
}
@@ -573,7 +573,7 @@ public class UpgradeFrom5To6 extends Abs
attributesMap.put(Exchange.TYPE, exchangeType);
attributesMap.put(Exchange.LIFETIME_POLICY, autoDelete ? "AUTO_DELETE"
: LifetimePolicy.PERMANENT.name());
- String json = _serializer.serialize(attributesMap);
+ String json = serialiseMap(attributesMap);
UpgradeConfiguredObjectRecord configuredObject = new UpgradeConfiguredObjectRecord(Exchange.class.getName(), json);
return configuredObject;
}
@@ -589,7 +589,7 @@ public class UpgradeFrom5To6 extends Abs
{
attributesMap.put(Binding.ARGUMENTS, FieldTable.convertToMap(arguments));
}
- String json = _serializer.serialize(attributesMap);
+ String json = serialiseMap(attributesMap);
UpgradeConfiguredObjectRecord configuredObject = new UpgradeConfiguredObjectRecord(Binding.class.getName(), json);
return configuredObject;
}
@@ -603,6 +603,18 @@ public class UpgradeFrom5To6 extends Abs
}
}
+ private String serialiseMap(final Map<String, Object> attributesMap)
+ {
+ try
+ {
+ return _serializer.serialize(attributesMap);
+ }
+ catch (IOException e)
+ {
+ throw new IllegalArgumentException("Failed to serialise map " + attributesMap + " as JSON", e);
+ }
+ }
+
static final class CompoundKey
{
public final long _messageId;
Copied: qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/MapJsonSerializerTest.java (from r1712964, qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/MapJsonSerializerTest.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/MapJsonSerializerTest.java?p2=qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/MapJsonSerializerTest.java&p1=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/MapJsonSerializerTest.java&r1=1712964&r2=1712995&rev=1712995&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/util/MapJsonSerializerTest.java (original)
+++ qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/MapJsonSerializerTest.java Fri Nov 6 17:55:12 2015
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.server.util;
+package org.apache.qpid.server.store.berkeleydb.upgrade;
import java.util.HashMap;
import java.util.Map;
@@ -36,9 +36,9 @@ public class MapJsonSerializerTest exten
}
- public void testSerializeDeserialize()
+ public void testSerializeDeserialize() throws Exception
{
- Map<String, Object> testMap = new HashMap<String, Object>();
+ Map<String, Object> testMap = new HashMap<>();
testMap.put("string", "Test String");
testMap.put("integer", new Integer(10));
testMap.put("long", new Long(Long.MAX_VALUE));
Modified: qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java?rev=1712995&r1=1712994&r2=1712995&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java (original)
+++ qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java Fri Nov 6 17:55:12 2015
@@ -72,7 +72,6 @@ import org.apache.qpid.server.store.berk
import org.apache.qpid.server.store.berkeleydb.upgrade.UpgradeFrom5To6.OldRecordImpl;
import org.apache.qpid.server.store.berkeleydb.upgrade.UpgradeFrom5To6.UpgradeConfiguredObjectRecord;
import org.apache.qpid.server.store.berkeleydb.upgrade.UpgradeFrom5To6.UpgradeUUIDBinding;
-import org.apache.qpid.server.util.MapJsonSerializer;
public class UpgradeFrom5To6Test extends AbstractUpgradeTestCase
{
@@ -276,7 +275,7 @@ public class UpgradeFrom5To6Test extends
assertDatabaseRecordCount(NEW_CONTENT_DB_NAME, 13);
}
- private void assertConfiguredObjects()
+ private void assertConfiguredObjects() throws Exception
{
Map<UUID, UpgradeConfiguredObjectRecord> configuredObjects = loadConfiguredObjects();
assertEquals("Unexpected number of configured objects", 21, configuredObjects.size());
Modified: qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom7To8Test.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom7To8Test.java?rev=1712995&r1=1712994&r2=1712995&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom7To8Test.java (original)
+++ qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom7To8Test.java Fri Nov 6 17:55:12 2015
@@ -35,7 +35,6 @@ import org.apache.qpid.server.model.Life
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.model.UUIDGenerator;
import org.apache.qpid.server.model.VirtualHost;
-import org.apache.qpid.server.util.MapJsonSerializer;
import com.sleepycat.bind.tuple.TupleBinding;
import com.sleepycat.bind.tuple.TupleInput;
@@ -123,7 +122,7 @@ public class UpgradeFrom7To8Test extends
}
- private void assertConfiguredObjects()
+ private void assertConfiguredObjects() throws Exception
{
Map<UUID, UpgradeConfiguredObjectRecord> configuredObjects = loadConfiguredObjects();
assertEquals("Unexpected number of configured objects", 11, configuredObjects.size());
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/QueueRunner.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/QueueRunner.java?rev=1712995&r1=1712994&r2=1712995&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/QueueRunner.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/queue/QueueRunner.java Fri Nov 6 17:55:12 2015
@@ -74,7 +74,7 @@ public class QueueRunner implements Runn
{
runAgain = _queue.processQueue(QueueRunner.this);
}
- catch (ConnectionScopedRuntimeException | TransportException e)
+ catch (ConnectionScopedRuntimeException e)
{
final String errorMessage = "Problem during asynchronous delivery by " + toString();
if(_logger.isDebugEnabled())
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java?rev=1712995&r1=1712994&r2=1712995&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java Fri Nov 6 17:55:12 2015
@@ -274,8 +274,17 @@ public class NonBlockingConnection imple
}
catch (IOException | ConnectionScopedRuntimeException e)
{
- LOGGER.info("Exception performing I/O for thread '" + _remoteSocketAddress + "': " + e);
- LOGGER.debug("Closing " + _remoteSocketAddress);
+ if (LOGGER.isDebugEnabled())
+ {
+ LOGGER.debug("Exception performing I/O for connection '{}'",
+ _remoteSocketAddress, e);
+ }
+ else
+ {
+ LOGGER.info("Exception performing I/O for connection '{}' : {}",
+ _remoteSocketAddress, e.getMessage());
+ }
+
if(_closed.compareAndSet(false,true))
{
_protocolEngine.notifyWork();
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/ConnectionScopedRuntimeException.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/ConnectionScopedRuntimeException.java?rev=1712995&r1=1712994&r2=1712995&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/ConnectionScopedRuntimeException.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/ConnectionScopedRuntimeException.java Fri Nov 6 17:55:12 2015
@@ -21,30 +21,21 @@
package org.apache.qpid.server.util;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
public class ConnectionScopedRuntimeException extends RuntimeException
{
- private static final Logger LOGGER = LoggerFactory.getLogger(ConnectionScopedRuntimeException.class);
-
-
public ConnectionScopedRuntimeException(final String message)
{
super(message);
- LOGGER.error(message);
}
public ConnectionScopedRuntimeException(final String message, final Throwable cause)
{
super(message, cause);
- LOGGER.error(message,cause);
}
public ConnectionScopedRuntimeException(final Throwable cause)
{
super(cause);
- LOGGER.error("Exception occurred", cause);
}
}
Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java?rev=1712995&r1=1712994&r2=1712995&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java Fri Nov 6 17:55:12 2015
@@ -261,14 +261,7 @@ public class AMQChannel
@Override
public void doTimeoutAction(String reason)
{
- try
- {
- closeConnection(reason);
- }
- catch (QpidException e)
- {
- throw new ConnectionScopedRuntimeException(e);
- }
+ _connection.sendConnectionCloseAsync(AMQConstant.RESOURCE_ERROR, reason);
}
}, getVirtualHost());
@@ -1775,15 +1768,6 @@ public class AMQChannel
_transactionTimeoutHelper.checkIdleOrOpenTimes(_transaction, openWarn, openClose, idleWarn, idleClose);
}
- /**
- * Typically called from the HouseKeepingThread instead of the main receiver thread,
- * therefore uses a lock to close the connection in a thread-safe manner.
- */
- private void closeConnection(String reason) throws QpidException
- {
- _connection.sendConnectionCloseAsync(AMQConstant.RESOURCE_ERROR, reason);
- }
-
public void deadLetter(long deliveryTag)
{
final UnacknowledgedMessageMap unackedMap = getUnacknowledgedMessageMap();
Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java?rev=1712995&r1=1712994&r2=1712995&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java Fri Nov 6 17:55:12 2015
@@ -282,7 +282,7 @@ public class AMQPConnection_0_8
_decoder.decodeBuffer(msg);
receivedCompleteAllChannels();
}
- catch (TransportException | AMQFrameDecodingException | IOException e)
+ catch (AMQFrameDecodingException | IOException e)
{
_logger.error("Unexpected exception", e);
throw new ConnectionScopedRuntimeException(e);
Modified: qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0.java?rev=1712995&r1=1712994&r2=1712995&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0.java Fri Nov 6 17:55:12 2015
@@ -73,6 +73,7 @@ import org.apache.qpid.server.transport.
import org.apache.qpid.server.transport.NonBlockingConnection;
import org.apache.qpid.server.transport.ServerNetworkConnection;
import org.apache.qpid.server.util.Action;
+import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
import org.apache.qpid.server.virtualhost.VirtualHostImpl;
import org.apache.qpid.transport.ByteBufferSender;
import org.apache.qpid.transport.network.AggregateTicker;
@@ -417,10 +418,14 @@ public class AMQPConnection_1_0 extends
}
}
}
+ catch(ConnectionScopedRuntimeException e)
+ {
+ throw e;
+ }
catch(RuntimeException e)
{
- LOGGER.error("Exception while processing incoming data", e);
- getNetwork().close();
+ LOGGER.error("Unexpected exception while processing incoming data", e);
+ throw new ConnectionScopedRuntimeException("Unexpected exception while processing incoming data", e);
}
finally
{
Modified: qpid/java/trunk/common/src/main/java/org/apache/qpid/codec/ServerDecoder.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/codec/ServerDecoder.java?rev=1712995&r1=1712994&r2=1712995&view=diff
==============================================================================
--- qpid/java/trunk/common/src/main/java/org/apache/qpid/codec/ServerDecoder.java (original)
+++ qpid/java/trunk/common/src/main/java/org/apache/qpid/codec/ServerDecoder.java Fri Nov 6 17:55:12 2015
@@ -21,7 +21,6 @@
package org.apache.qpid.codec;
import java.io.IOException;
-import java.nio.ByteBuffer;
import org.apache.qpid.bytebuffer.QpidByteBuffer;
import org.apache.qpid.framing.*;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org