You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by di...@apache.org on 2022/07/01 02:04:08 UTC
[rocketmq] branch 5.0.0-beta updated: Remove useless doAfterRpcFailure method in RPCHook (#4538)
This is an automated email from the ASF dual-hosted git repository.
dinglei pushed a commit to branch 5.0.0-beta
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
The following commit(s) were added to refs/heads/5.0.0-beta by this push:
new 940d8d825 Remove useless doAfterRpcFailure method in RPCHook (#4538)
940d8d825 is described below
commit 940d8d8255f2057701130b3523677100dd7e8ef4
Author: rongtong <ji...@163.com>
AuthorDate: Fri Jul 1 10:03:57 2022 +0800
Remove useless doAfterRpcFailure method in RPCHook (#4538)
---
.../org/apache/rocketmq/acl/common/AclClientRPCHook.java | 4 ----
.../java/org/apache/rocketmq/broker/BrokerController.java | 4 ----
.../org/apache/rocketmq/client/impl/MQClientAPIImpl.java | 15 +++++----------
.../main/java/org/apache/rocketmq/remoting/RPCHook.java | 2 --
.../rocketmq/remoting/netty/NettyRemotingAbstract.java | 12 ------------
.../rocketmq/remoting/netty/NettyRemotingClient.java | 3 ---
.../apache/rocketmq/test/container/BrokerFailoverIT.java | 5 -----
7 files changed, 5 insertions(+), 40 deletions(-)
diff --git a/acl/src/main/java/org/apache/rocketmq/acl/common/AclClientRPCHook.java b/acl/src/main/java/org/apache/rocketmq/acl/common/AclClientRPCHook.java
index 50c73ca73..9e5bf1fb5 100644
--- a/acl/src/main/java/org/apache/rocketmq/acl/common/AclClientRPCHook.java
+++ b/acl/src/main/java/org/apache/rocketmq/acl/common/AclClientRPCHook.java
@@ -56,10 +56,6 @@ public class AclClientRPCHook implements RPCHook {
}
- @Override public void doAfterRpcFailure(String remoteAddr, RemotingCommand request, Boolean remoteTimeout) {
-
- }
-
protected SortedMap<String, String> parseRequestContent(RemotingCommand request, String ak, String securityToken) {
CommandCustomHeader header = request.readCustomHeader();
// Sort property
diff --git a/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java b/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
index 7814c4feb..2fdb6f83d 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
@@ -882,10 +882,6 @@ public class BrokerController {
public void doAfterResponse(String remoteAddr, RemotingCommand request, RemotingCommand response) {
}
- @Override
- public void doAfterRpcFailure(String remoteAddr, RemotingCommand request, Boolean remoteTimeout) {
-
- }
});
}
}
diff --git a/client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIImpl.java b/client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIImpl.java
index 614ce9fb8..adf8fa083 100644
--- a/client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIImpl.java
+++ b/client/src/main/java/org/apache/rocketmq/client/impl/MQClientAPIImpl.java
@@ -381,7 +381,7 @@ public class MQClientAPIImpl implements NameServerUpdateCallback {
public void createPlainAccessConfig(final String addr, final PlainAccessConfig plainAccessConfig,
final long timeoutMillis)
- throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
+ throws RemotingException, InterruptedException, MQClientException {
CreateAccessConfigRequestHeader requestHeader = new CreateAccessConfigRequestHeader();
requestHeader.setAccessKey(plainAccessConfig.getAccessKey());
requestHeader.setSecretKey(plainAccessConfig.getSecretKey());
@@ -409,7 +409,7 @@ public class MQClientAPIImpl implements NameServerUpdateCallback {
}
public void deleteAccessConfig(final String addr, final String accessKey, final long timeoutMillis)
- throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
+ throws RemotingException, InterruptedException, MQClientException {
DeleteAccessConfigRequestHeader requestHeader = new DeleteAccessConfigRequestHeader();
requestHeader.setAccessKey(accessKey);
@@ -430,7 +430,7 @@ public class MQClientAPIImpl implements NameServerUpdateCallback {
}
public void updateGlobalWhiteAddrsConfig(final String addr, final String globalWhiteAddrs, final long timeoutMillis)
- throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
+ throws RemotingException, InterruptedException, MQClientException {
UpdateGlobalWhiteAddrsConfigRequestHeader requestHeader = new UpdateGlobalWhiteAddrsConfigRequestHeader();
requestHeader.setGlobalWhiteAddrs(globalWhiteAddrs);
@@ -485,7 +485,7 @@ public class MQClientAPIImpl implements NameServerUpdateCallback {
}
public AclConfig getBrokerClusterConfig(final String addr,
- final long timeoutMillis) throws RemotingCommandException, InterruptedException, RemotingTimeoutException,
+ final long timeoutMillis) throws InterruptedException, RemotingTimeoutException,
RemotingSendRequestException, RemotingConnectException, MQBrokerException {
RemotingCommand request = RemotingCommand.createRequestCommand(RequestCode.GET_BROKER_CLUSTER_ACL_CONFIG, null);
@@ -600,12 +600,7 @@ public class MQClientAPIImpl implements NameServerUpdateCallback {
if (this.remotingClient instanceof NettyRemotingClient) {
NettyRemotingClient remotingClient = (NettyRemotingClient) this.remotingClient;
RemotingCommand response = responseFuture.getResponseCommand();
- if (response == null) {
- remotingClient.doAfterRpcFailure(RemotingHelper.parseChannelRemoteAddr(responseFuture.getChannel()), responseFuture.getRequestCommand(),
- responseFuture.isTimeout());
- } else {
- remotingClient.doAfterRpcHooks(RemotingHelper.parseChannelRemoteAddr(responseFuture.getChannel()), responseFuture.getRequestCommand(), response);
- }
+ remotingClient.doAfterRpcHooks(RemotingHelper.parseChannelRemoteAddr(responseFuture.getChannel()), responseFuture.getRequestCommand(), response);
}
}
diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/RPCHook.java b/remoting/src/main/java/org/apache/rocketmq/remoting/RPCHook.java
index 0f17858c3..ebaeea40a 100644
--- a/remoting/src/main/java/org/apache/rocketmq/remoting/RPCHook.java
+++ b/remoting/src/main/java/org/apache/rocketmq/remoting/RPCHook.java
@@ -24,6 +24,4 @@ public interface RPCHook {
void doAfterResponse(final String remoteAddr, final RemotingCommand request,
final RemotingCommand response);
-
- void doAfterRpcFailure(final String remoteAddr, RemotingCommand request, Boolean remoteTimeout);
}
diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingAbstract.java b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingAbstract.java
index c6c9178e9..ab7461658 100644
--- a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingAbstract.java
+++ b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingAbstract.java
@@ -182,14 +182,6 @@ public abstract class NettyRemotingAbstract {
}
}
- public void doAfterRpcFailure(String addr, RemotingCommand request, Boolean remoteTimeout) {
- if (rpcHooks.size() > 0) {
- for (RPCHook rpcHook : rpcHooks) {
- rpcHook.doAfterRpcFailure(addr, request, remoteTimeout);
- }
- }
- }
-
/**
* Process incoming request command issued by remote peer.
*
@@ -495,10 +487,6 @@ public abstract class NettyRemotingAbstract {
throw new RemotingSendRequestException(RemotingHelper.parseChannelRemoteAddr(channel), e);
}
} else {
- if (this instanceof NettyRemotingClient) {
- NettyRemotingClient nettyRemotingClient = (NettyRemotingClient) this;
- nettyRemotingClient.doAfterRpcFailure(RemotingHelper.parseChannelRemoteAddr(channel), request, false);
- }
if (timeoutMillis <= 0) {
throw new RemotingTooMuchRequestException("invokeAsyncImpl invoke too fast");
} else {
diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingClient.java b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingClient.java
index 455d5b4bb..0cd220215 100644
--- a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingClient.java
+++ b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/NettyRemotingClient.java
@@ -468,7 +468,6 @@ public class NettyRemotingClient extends NettyRemotingAbstract implements Remoti
return response;
} catch (RemotingSendRequestException e) {
LOGGER.warn("invokeSync: send request exception, so close the channel[{}]", addr);
- doAfterRpcFailure(addr, request, false);
this.closeChannel(addr, channel);
throw e;
} catch (RemotingTimeoutException e) {
@@ -476,7 +475,6 @@ public class NettyRemotingClient extends NettyRemotingAbstract implements Remoti
this.closeChannel(addr, channel);
LOGGER.warn("invokeSync: close socket because of timeout, {}ms, {}", timeoutMillis, addr);
}
- doAfterRpcFailure(addr, request, true);
LOGGER.warn("invokeSync: wait response timeout exception, the channel[{}]", addr);
throw e;
}
@@ -686,7 +684,6 @@ public class NettyRemotingClient extends NettyRemotingAbstract implements Remoti
this.invokeOnewayImpl(channel, request, timeoutMillis);
} catch (RemotingSendRequestException e) {
LOGGER.warn("invokeOneway: send request exception, so close the channel[{}]", addr);
- doAfterRpcFailure(addr, request, false);
this.closeChannel(addr, channel);
throw e;
}
diff --git a/test/src/test/java/org/apache/rocketmq/test/container/BrokerFailoverIT.java b/test/src/test/java/org/apache/rocketmq/test/container/BrokerFailoverIT.java
index 4c0674e43..0a2360181 100644
--- a/test/src/test/java/org/apache/rocketmq/test/container/BrokerFailoverIT.java
+++ b/test/src/test/java/org/apache/rocketmq/test/container/BrokerFailoverIT.java
@@ -68,11 +68,6 @@ public class BrokerFailoverIT extends ContainerIntegrationTestBase {
RemotingCommand response) {
}
-
- @Override
- public void doAfterRpcFailure(String remoteAddr, RemotingCommand request, Boolean remoteTimeout) {
-
- }
});
InnerSalveBrokerController finalTargetSlave = targetSlave;