You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bb...@apache.org on 2022/12/15 17:04:00 UTC
[hbase] 20/91: HubSpot Backport: HBASE-26727 Fix CallDroppedException reporting
This is an automated email from the ASF dual-hosted git repository.
bbeaudreault pushed a commit to branch hubspot-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit cf6efffc77a6e50870ea404ba0dfc32879683428
Author: Bryan Beaudreault <bb...@hubspot.com>
AuthorDate: Mon Jan 31 19:55:11 2022 -0500
HubSpot Backport: HBASE-26727 Fix CallDroppedException reporting
---
.../org/apache/hadoop/hbase/ipc/CallRunner.java | 1 +
.../org/apache/hadoop/hbase/ipc/TestCallRunner.java | 21 ++++++++++++++++++++-
2 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/CallRunner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/CallRunner.java
index 586f23e6749..386958f5178 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/CallRunner.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/CallRunner.java
@@ -216,6 +216,7 @@ public class CallRunner {
call.setResponse(null, null, CALL_DROPPED_EXCEPTION, "Call dropped, server "
+ (address != null ? address : "(channel closed)") + " is overloaded, please retry.");
call.sendResponseIfReady();
+ this.rpcServer.getMetrics().exception(CALL_DROPPED_EXCEPTION);
} catch (ClosedChannelException cce) {
InetSocketAddress address = rpcServer.getListenerAddress();
RpcServer.LOG.warn(Thread.currentThread().getName() + ": caught a ClosedChannelException, " +
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestCallRunner.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestCallRunner.java
index 75997afde09..49b7caa29ba 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestCallRunner.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestCallRunner.java
@@ -17,6 +17,8 @@
*/
package org.apache.hadoop.hbase.ipc;
+import java.net.InetSocketAddress;
+import org.apache.hadoop.hbase.CallDroppedException;
import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.monitoring.MonitoredRPCHandlerImpl;
import org.apache.hadoop.hbase.testclassification.RPCTests;
@@ -60,7 +62,7 @@ public class TestCallRunner {
}
@Test
- public void testCallRunnerDrop() {
+ public void testCallRunnerDropDisconnected() {
RpcServerInterface mockRpcServer = Mockito.mock(RpcServerInterface.class);
Mockito.when(mockRpcServer.isStarted()).thenReturn(true);
ServerCall mockCall = Mockito.mock(ServerCall.class);
@@ -71,4 +73,21 @@ public class TestCallRunner {
cr.drop();
Mockito.verify(mockCall, Mockito.times(1)).cleanup();
}
+
+ @Test
+ public void testCallRunnerDropConnected() {
+ RpcServerInterface mockRpcServer = Mockito.mock(RpcServerInterface.class);
+ MetricsHBaseServer mockMetrics = Mockito.mock(MetricsHBaseServer.class);
+ Mockito.when(mockRpcServer.getMetrics()).thenReturn(mockMetrics);
+ Mockito.when(mockRpcServer.isStarted()).thenReturn(true);
+ Mockito.when(mockRpcServer.getListenerAddress()).thenReturn(InetSocketAddress.createUnresolved("foo", 60020));
+ ServerCall mockCall = Mockito.mock(ServerCall.class);
+ Mockito.when(mockCall.disconnectSince()).thenReturn(-1L);
+
+ CallRunner cr = new CallRunner(mockRpcServer, mockCall);
+ cr.setStatus(new MonitoredRPCHandlerImpl());
+ cr.drop();
+ Mockito.verify(mockCall, Mockito.times(1)).cleanup();
+ Mockito.verify(mockMetrics).exception(Mockito.any(CallDroppedException.class));
+ }
}