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 jl...@apache.org on 2014/08/18 18:35:11 UTC
svn commit: r1618661 - in
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common:
CHANGES.txt src/main/java/org/apache/hadoop/ipc/metrics/RpcMetrics.java
src/test/java/org/apache/hadoop/ipc/TestRPC.java
Author: jlowe
Date: Mon Aug 18 16:35:11 2014
New Revision: 1618661
URL: http://svn.apache.org/r1618661
Log:
svn merge -c 1618659 FIXES: HADOOP-10059. RPC authentication and authorization metrics overflow to negative values on busy clusters. Contributed by Tsuyoshi OZAWA and Akira AJISAKA
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RpcMetrics.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1618661&r1=1618660&r2=1618661&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Mon Aug 18 16:35:11 2014
@@ -160,6 +160,10 @@ Release 2.6.0 - UNRELEASED
HADOOP-10964. Small fix for NetworkTopologyWithNodeGroup#sortByDistance.
(Yi Liu via wang)
+ HADOOP-10059. RPC authentication and authorization metrics overflow to
+ negative values on busy clusters (Tsuyoshi OZAWA and Akira AJISAKA
+ via jlowe)
+
Release 2.5.0 - UNRELEASED
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RpcMetrics.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RpcMetrics.java?rev=1618661&r1=1618660&r2=1618661&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RpcMetrics.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/metrics/RpcMetrics.java Mon Aug 18 16:35:11 2014
@@ -88,13 +88,13 @@ public class RpcMetrics {
@Metric("Processsing time") MutableRate rpcProcessingTime;
MutableQuantiles[] rpcProcessingTimeMillisQuantiles;
@Metric("Number of authentication failures")
- MutableCounterInt rpcAuthenticationFailures;
+ MutableCounterLong rpcAuthenticationFailures;
@Metric("Number of authentication successes")
- MutableCounterInt rpcAuthenticationSuccesses;
+ MutableCounterLong rpcAuthenticationSuccesses;
@Metric("Number of authorization failures")
- MutableCounterInt rpcAuthorizationFailures;
+ MutableCounterLong rpcAuthorizationFailures;
@Metric("Number of authorization sucesses")
- MutableCounterInt rpcAuthorizationSuccesses;
+ MutableCounterLong rpcAuthorizationSuccesses;
@Metric("Number of open connections") public int numOpenConnections() {
return server.getNumOpenConnections();
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java?rev=1618661&r1=1618660&r2=1618661&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestRPC.java Mon Aug 18 16:35:11 2014
@@ -583,14 +583,14 @@ public class TestRPC {
}
MetricsRecordBuilder rb = getMetrics(server.rpcMetrics.name());
if (expectFailure) {
- assertCounter("RpcAuthorizationFailures", 1, rb);
+ assertCounter("RpcAuthorizationFailures", 1L, rb);
} else {
- assertCounter("RpcAuthorizationSuccesses", 1, rb);
+ assertCounter("RpcAuthorizationSuccesses", 1L, rb);
}
//since we don't have authentication turned ON, we should see
// 0 for the authentication successes and 0 for failure
- assertCounter("RpcAuthenticationFailures", 0, rb);
- assertCounter("RpcAuthenticationSuccesses", 0, rb);
+ assertCounter("RpcAuthenticationFailures", 0L, rb);
+ assertCounter("RpcAuthenticationSuccesses", 0L, rb);
}
}