Browse Source

svn merge -c 1242002 from branch 0.23 to 0.23.1 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.1@1242444 13f79535-47bb-0310-9956-ffa450edef68
Robert Joseph Evans 13 years ago
parent
commit
30b9e356a6

+ 2 - 0
hadoop-mapreduce-project/CHANGES.txt

@@ -25,6 +25,8 @@ Release 0.23.1 - 2012-02-08
 
 
     MAPREDUCE-3375. [Gridmix] Memory Emulation system tests. 
     MAPREDUCE-3375. [Gridmix] Memory Emulation system tests. 
                     (Vinay Thota via amarrk)
                     (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. 
     MAPREDUCE-2733. [Gridmix] Gridmix3 cpu emulation system tests. 
                     (Vinay Thota via amarrk)
                     (Vinay Thota via amarrk)

+ 2 - 1
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;
     boolean success = false;
     try {
     try {
       Log.info("Job end notification trying " + urlToNotify);
       Log.info("Job end notification trying " + urlToNotify);
-      HttpURLConnection conn = (HttpURLConnection) urlToNotify.openConnection();
+      HttpURLConnection conn =
+        (HttpURLConnection) urlToNotify.openConnection(proxyToUse);
       conn.setConnectTimeout(5*1000);
       conn.setConnectTimeout(5*1000);
       conn.setReadTimeout(5*1000);
       conn.setReadTimeout(5*1000);
       conn.setAllowUserInteraction(false);
       conn.setAllowUserInteraction(false);