You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by xg...@apache.org on 2017/06/05 21:04:50 UTC
[41/50] [abbrv] hadoop git commit: HADOOP-14440. Add metrics for
connections dropped. Contributed by Eric Badger.
HADOOP-14440. Add metrics for connections dropped. Contributed by Eric Badger.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/abdd609e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/abdd609e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/abdd609e
Branch: refs/heads/YARN-5734
Commit: abdd609e51a80388493417126c3bc9b1badc0ac1
Parents: 46f7e91
Author: Brahma Reddy Battula <br...@apache.org>
Authored: Tue Jun 6 00:21:03 2017 +0800
Committer: Brahma Reddy Battula <br...@apache.org>
Committed: Tue Jun 6 00:21:03 2017 +0800
----------------------------------------------------------------------
.../main/java/org/apache/hadoop/ipc/Server.java | 20 +++++++++++++++++++-
.../apache/hadoop/ipc/metrics/RpcMetrics.java | 4 ++++
.../hadoop-common/src/site/markdown/Metrics.md | 1 +
.../java/org/apache/hadoop/ipc/TestIPC.java | 8 +++++---
4 files changed, 29 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/abdd609e/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
index 3ea5a24..f3b9a82 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
@@ -64,6 +64,7 @@ import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
import javax.security.sasl.Sasl;
import javax.security.sasl.SaslException;
@@ -1220,6 +1221,7 @@ public abstract class Server {
if (channel.isOpen()) {
IOUtils.cleanup(null, channel);
}
+ connectionManager.droppedConnections.getAndIncrement();
continue;
}
key.attach(c); // so closeCurrentConnection can get the object
@@ -3161,6 +3163,16 @@ public abstract class Server {
}
/**
+ * The number of RPC connections dropped due to
+ * too many connections.
+ * @return the number of dropped rpc connections
+ */
+ public long getNumDroppedConnections() {
+ return connectionManager.getDroppedConnections();
+
+ }
+
+ /**
* The number of rpc calls in the queue.
* @return The number of rpc calls in the queue.
*/
@@ -3277,7 +3289,8 @@ public abstract class Server {
}
private class ConnectionManager {
- final private AtomicInteger count = new AtomicInteger();
+ final private AtomicInteger count = new AtomicInteger();
+ final private AtomicLong droppedConnections = new AtomicLong();
final private Set<Connection> connections;
/* Map to maintain the statistics per User */
final private Map<String, Integer> userToConnectionsMap;
@@ -3364,6 +3377,11 @@ public abstract class Server {
return userToConnectionsMap;
}
+
+ long getDroppedConnections() {
+ return droppedConnections.get();
+ }
+
int size() {
return count.get();
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/abdd609e/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RpcMetrics.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RpcMetrics.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RpcMetrics.java
index e5dde10..8ce1379 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RpcMetrics.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RpcMetrics.java
@@ -121,6 +121,10 @@ public class RpcMetrics {
return server.getCallQueueLen();
}
+ @Metric("Number of dropped connections") public long numDroppedConnections() {
+ return server.getNumDroppedConnections();
+ }
+
// Public instrumentation methods that could be extracted to an
// abstract class if we decide to do custom instrumentation classes a la
// JobTrackerInstrumentation. The methods with //@Override comment are
http://git-wip-us.apache.org/repos/asf/hadoop/blob/abdd609e/hadoop-common-project/hadoop-common/src/site/markdown/Metrics.md
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/site/markdown/Metrics.md b/hadoop-common-project/hadoop-common/src/site/markdown/Metrics.md
index a14c86d..4b89bc2 100644
--- a/hadoop-common-project/hadoop-common/src/site/markdown/Metrics.md
+++ b/hadoop-common-project/hadoop-common/src/site/markdown/Metrics.md
@@ -79,6 +79,7 @@ Each metrics record contains tags such as Hostname and port (number to which ser
| `RpcAuthorizationSuccesses` | Total number of authorization successes |
| `NumOpenConnections` | Current number of open connections |
| `CallQueueLength` | Current length of the call queue |
+| `numDroppedConnections` | Total number of dropped connections |
| `rpcQueueTime`*num*`sNumOps` | Shows total number of RPC calls (*num* seconds granularity) if `rpc.metrics.quantile.enable` is set to true. *num* is specified by `rpc.metrics.percentiles.intervals`. |
| `rpcQueueTime`*num*`s50thPercentileLatency` | Shows the 50th percentile of RPC queue time in milliseconds (*num* seconds granularity) if `rpc.metrics.quantile.enable` is set to true. *num* is specified by `rpc.metrics.percentiles.intervals`. |
| `rpcQueueTime`*num*`s75thPercentileLatency` | Shows the 75th percentile of RPC queue time in milliseconds (*num* seconds granularity) if `rpc.metrics.quantile.enable` is set to true. *num* is specified by `rpc.metrics.percentiles.intervals`. |
http://git-wip-us.apache.org/repos/asf/hadoop/blob/abdd609e/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestIPC.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestIPC.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestIPC.java
index 4198e40..611000d 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestIPC.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestIPC.java
@@ -1339,7 +1339,7 @@ public class TestIPC {
@Test
public void testMaxConnections() throws Exception {
- conf.setInt("ipc.server.max.connections", 5);
+ conf.setInt("ipc.server.max.connections", 6);
Server server = null;
Thread connectors[] = new Thread[10];
@@ -1374,8 +1374,10 @@ public class TestIPC {
}
Thread.sleep(1000);
- // server should only accept up to 5 connections
- assertEquals(5, server.getNumOpenConnections());
+ // server should only accept up to 6 connections
+ assertEquals(6, server.getNumOpenConnections());
+ // server should drop the other 4 connections
+ assertEquals(4, server.getNumDroppedConnections());
for (int i = 0; i < 10; i++) {
connectors[i].join();
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org