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 zh...@apache.org on 2015/01/05 23:50:09 UTC
[17/18] hadoop git commit: HADOOP-11390 Metrics 2 ganglia provider to
include hostname in unresolved address problems. (Varun Saxena via stevel)
HADOOP-11390 Metrics 2 ganglia provider to include hostname in unresolved address problems. (Varun Saxena via stevel)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f3aced27
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f3aced27
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f3aced27
Branch: refs/heads/HDFS-EC
Commit: f3aced275867384cf18be5c1e1b520e88c6aee5d
Parents: e9e00ac
Author: Steve Loughran <st...@apache.org>
Authored: Mon Jan 5 16:09:25 2015 +0000
Committer: Zhe Zhang <zh...@apache.org>
Committed: Mon Jan 5 14:48:38 2015 -0800
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
.../hadoop/metrics2/sink/ganglia/AbstractGangliaSink.java | 7 +++++++
2 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f3aced27/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index baf68d6..0c76894 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -455,6 +455,9 @@ Release 2.7.0 - UNRELEASED
HADOOP-11455. KMS and Credential CLI should request confirmation for
deletion by default. (Charles Lamb via yliu)
+ HADOOP-11390 Metrics 2 ganglia provider to include hostname in
+ unresolved address problems. (Varun Saxena via stevel)
+
OPTIMIZATIONS
HADOOP-11323. WritableComparator#compare keeps reference to byte array.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f3aced27/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/ganglia/AbstractGangliaSink.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/ganglia/AbstractGangliaSink.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/ganglia/AbstractGangliaSink.java
index 164ea08..88ad647 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/ganglia/AbstractGangliaSink.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/ganglia/AbstractGangliaSink.java
@@ -21,6 +21,7 @@ package org.apache.hadoop.metrics2.sink.ganglia;
import java.io.IOException;
import java.net.DatagramPacket;
import java.net.DatagramSocket;
+import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.net.SocketException;
import java.net.UnknownHostException;
@@ -257,6 +258,12 @@ public abstract class AbstractGangliaSink implements MetricsSink {
protected void emitToGangliaHosts() throws IOException {
try {
for (SocketAddress socketAddress : metricsServers) {
+ if (socketAddress == null || !(socketAddress instanceof InetSocketAddress))
+ throw new IllegalArgumentException("Unsupported Address type");
+ InetSocketAddress inetAddress = (InetSocketAddress)socketAddress;
+ if(inetAddress.isUnresolved()) {
+ throw new UnknownHostException("Unresolved host: " + inetAddress);
+ }
DatagramPacket packet =
new DatagramPacket(buffer, offset, socketAddress);
datagramSocket.send(packet);