gemmellr commented on code in PR #4656:
URL: https://github.com/apache/activemq-artemis/pull/4656#discussion_r1386730159
##########
artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/ActiveMQProtonRemotingConnection.java:
##########
@@ -73,17 +78,54 @@ public void fail(final ActiveMQException me, String
scaleDownTargetNodeID) {
destroyed = true;
- //filter it like the other protocols
- if (!(me instanceof ActiveMQRemoteDisconnectException)) {
-
ActiveMQClientLogger.LOGGER.connectionFailureDetected(amqpConnection.getConnectionCallback().getTransportConnection().getRemoteAddress(),
me.getMessage(), me.getType());
+ if (logger.isInfoEnabled()) {
+ try {
+ logger.debug("Connection failure detected.
amqpConnection.getHandler().getConnection().getRemoteState() = {},
remoteIP={}", amqpConnection.getHandler().getConnection().getRemoteState(),
amqpConnection.getConnectionCallback().getTransportConnection().getRemoteAddress());
Review Comment:
gate doesnt match the actual logging
##########
artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/ActiveMQProtonRemotingConnection.java:
##########
@@ -73,17 +78,54 @@ public void fail(final ActiveMQException me, String
scaleDownTargetNodeID) {
destroyed = true;
- //filter it like the other protocols
- if (!(me instanceof ActiveMQRemoteDisconnectException)) {
-
ActiveMQClientLogger.LOGGER.connectionFailureDetected(amqpConnection.getConnectionCallback().getTransportConnection().getRemoteAddress(),
me.getMessage(), me.getType());
+ if (logger.isInfoEnabled()) {
+ try {
+ logger.debug("Connection failure detected.
amqpConnection.getHandler().getConnection().getRemoteState() = {},
remoteIP={}", amqpConnection.getHandler().getConnection().getRemoteState(),
amqpConnection.getConnectionCallback().getTransportConnection().getRemoteAddress());
+ } catch (Throwable e) { // just to avoid a possible NPE from the
debug statement itself
+ logger.debug(e.getMessage(), e);
+ logger.warn(e.getMessage(), e);
+ }
}
- // Then call the listeners
- callFailureListeners(me, scaleDownTargetNodeID);
+ try {
+ if (amqpConnection.getHandler().getConnection().getRemoteState() !=
EndpointState.CLOSED) {
+ // A remote close was received on the client, on that case it's
just a normal operation and we don't need to log this.
+
ActiveMQClientLogger.LOGGER.connectionFailureDetected(amqpConnection.getConnectionCallback().getTransportConnection().getRemoteAddress(),
me.getMessage(), me.getType());
+ }
+ } catch (Throwable e) { // avoiding NPEs from te logging statement. I
don't think this would happen, but just in case
+ logger.warn(e.getMessage(), e);
+ }
- callClosingListeners();
+ amqpConnection.runNow(() -> {
+ // Then call the listeners
+ callFailureListeners(me, scaleDownTargetNodeID);
- internalClose();
+ callClosingListeners();
+
+ internalClose();
+ });
+ }
+
+ @Override
+ public void close() {
+ if (destroyed) {
+ return;
+ }
+
+ destroyed = true;
+
+ if (logger.isInfoEnabled()) {
+ try {
+ logger.debug("Connection regular close.
amqpConnection.getHandler().getConnection().getRemoteState() = {},
remoteIP={}", amqpConnection.getHandler().getConnection().getRemoteState(),
amqpConnection.getConnectionCallback().getTransportConnection().getRemoteAddress());
+ } catch (Throwable e) { // just to avoid a possible NPE from the
debug statement itself
Review Comment:
gate doesnt match the actual logging
##########
artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ExecutorNettyAdapter.java:
##########
@@ -0,0 +1,229 @@
+/*
+ * 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.core.remoting.impl;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelPromise;
+import io.netty.channel.EventLoop;
+import io.netty.channel.EventLoopGroup;
+import io.netty.util.concurrent.EventExecutor;
+import io.netty.util.concurrent.Future;
+import io.netty.util.concurrent.ProgressivePromise;
+import io.netty.util.concurrent.Promise;
+import io.netty.util.concurrent.ScheduledFuture;
+import org.apache.activemq.artemis.utils.actors.ArtemisExecutor;
+
+/** Test cases may supply a simple executor instead of the real Netty Executor
+ * On that case this is a simple adapter for what's needed from these tests.
+ * Not intended to be used in production.
+ *
+ * TODO: This could be refactored out of the main codebase but at a high cost.
+ * We may do it some day if we find an easy way that won't clutter the
code too much.
+ * */
Review Comment:
This is in the main code, shouldnt be if only used for tests? I feel like we
deleted something like this recently.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
