Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAPREDUCE-6587. Remove unused params in connection-related methods of Fetcher. Contributed by Yiqun Lin. 

(cherry picked from commit 8cc4a67059)
(cherry picked from commit 41fe85f868)
This commit is contained in:
Akira Ajisaka 2016-08-23 17:04:55 +09:00
parent 0f9bed050d
commit 854af9cee1
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/reduce/Fetcher.java
View File

@ -263,7 +263,7 @@ private DataInputStream openShuffleUrl(MapHost host,
DataInputStream input = null; DataInputStream input = null;
try { try {
setupConnectionsWithRetry(host, remaining, url); setupConnectionsWithRetry(url);
if (stopped) { if (stopped) {
abortConnect(host, remaining); abortConnect(host, remaining);
} else { } else {
@ -374,9 +374,8 @@ protected void copyFromHost(MapHost host) throws IOException {
} }
} }
private void setupConnectionsWithRetry(MapHost host, private void setupConnectionsWithRetry(URL url) throws IOException {
Set<TaskAttemptID> remaining, URL url) throws IOException { openConnectionWithRetry(url);
openConnectionWithRetry(host, remaining, url);
if (stopped) { if (stopped) {
return; return;
} }
@ -396,8 +395,7 @@ private void setupConnectionsWithRetry(MapHost host,
verifyConnection(url, msgToEncode, encHash); verifyConnection(url, msgToEncode, encHash);
} }
private void openConnectionWithRetry(MapHost host, private void openConnectionWithRetry(URL url) throws IOException {
Set<TaskAttemptID> remaining, URL url) throws IOException {
long startTime = Time.monotonicNow(); long startTime = Time.monotonicNow();
boolean shouldWait = true; boolean shouldWait = true;
while (shouldWait) { while (shouldWait) {