From e9c32d2ad17def9bb7a4037bebe22d4c42c91b49 Mon Sep 17 00:00:00 2001 From: Robert Joseph Evans Date: Wed, 8 Feb 2012 17:36:57 +0000 Subject: [PATCH] svn merge -c 1241999 fixes MAPREDUCE-3840 JobEndNotifier doesn't use the proxyToUse during connecting git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1242002 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 2 ++ .../org/apache/hadoop/mapreduce/v2/app/JobEndNotifier.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index b12056dc27d..fbf1a69ea76 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -35,6 +35,8 @@ Release 0.23.1 - 2012-02-08 MAPREDUCE-3375. [Gridmix] Memory Emulation system tests. (Vinay Thota via amarrk) + MAPREDUCE-3840. JobEndNotifier doesn't use the proxyToUse during connecting + (Ravi Prakash via bobby) MAPREDUCE-2733. [Gridmix] Gridmix3 cpu emulation system tests. (Vinay Thota via amarrk) diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/JobEndNotifier.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/JobEndNotifier.java index 9ffe2181c99..ca7f625c279 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/JobEndNotifier.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/JobEndNotifier.java @@ -119,7 +119,8 @@ public class JobEndNotifier implements Configurable { boolean success = false; try { Log.info("Job end notification trying " + urlToNotify); - HttpURLConnection conn = (HttpURLConnection) urlToNotify.openConnection(); + HttpURLConnection conn = + (HttpURLConnection) urlToNotify.openConnection(proxyToUse); conn.setConnectTimeout(5*1000); conn.setReadTimeout(5*1000); conn.setAllowUserInteraction(false);