From 304e75a48b727f702a9ede8501af01cf9c0585d3 Mon Sep 17 00:00:00 2001
From: prabhujoseph <pjoseph@cloudera.com>
Date: Thu, 5 Dec 2019 12:31:13 +0530
Subject: [PATCH] Revert "MAPREDUCE-7250. FrameworkUploader skip replication
 check if timeout is 0."

This reverts commit 8d82c441029522f447df1ab2b6d770ca15653207.
---
 .../mapred/uploader/FrameworkUploader.java    | 32 ++++++++-----------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-uploader/src/main/java/org/apache/hadoop/mapred/uploader/FrameworkUploader.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-uploader/src/main/java/org/apache/hadoop/mapred/uploader/FrameworkUploader.java
index 3dea023ea7..6f914f742c 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-uploader/src/main/java/org/apache/hadoop/mapred/uploader/FrameworkUploader.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-uploader/src/main/java/org/apache/hadoop/mapred/uploader/FrameworkUploader.java
@@ -298,24 +298,20 @@ private void endUpload()
       fileSystem.setReplication(targetPath, finalReplication);
       LOG.info("Set replication to " +
           finalReplication + " for path: " + targetPath);
-      if (timeout == 0) {
-        LOG.info("Timeout is set to 0. Skipping replication check.");
-      } else {
-        long startTime = System.currentTimeMillis();
-        long endTime = startTime;
-        long currentReplication = 0;
-        while(endTime - startTime < timeout * 1000 &&
-             currentReplication < acceptableReplication) {
-          Thread.sleep(1000);
-          endTime = System.currentTimeMillis();
-          currentReplication = getSmallestReplicatedBlockCount();
-        }
-        if (endTime - startTime >= timeout * 1000) {
-          LOG.error(String.format(
-              "Timed out after %d seconds while waiting for acceptable" +
-                  " replication of %d (current replication is %d)",
-              timeout, acceptableReplication, currentReplication));
-        }
+      long startTime = System.currentTimeMillis();
+      long endTime = startTime;
+      long currentReplication = 0;
+      while(endTime - startTime < timeout * 1000 &&
+           currentReplication < acceptableReplication) {
+        Thread.sleep(1000);
+        endTime = System.currentTimeMillis();
+        currentReplication = getSmallestReplicatedBlockCount();
+      }
+      if (endTime - startTime >= timeout * 1000) {
+        LOG.error(String.format(
+            "Timed out after %d seconds while waiting for acceptable" +
+                " replication of %d (current replication is %d)",
+            timeout, acceptableReplication, currentReplication));
       }
     } else {
       LOG.info("Cannot set replication to " +