From 5929c6b35340c031cd8ae424508e17f804a0e3a7 Mon Sep 17 00:00:00 2001
From: Laszlo Bodor <bodorlaszlo0202@gmail.com>
Date: Sun, 26 Dec 2021 22:58:24 +0100
Subject: [PATCH] TEZ-4364: TestFaultTolerance timeout on master

---
 .../runtime/api/events/InputReadErrorEvent.java   | 15 ++++++++++-----
 .../test/java/org/apache/tez/test/TestInput.java  |  7 ++++---
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/tez-api/src/main/java/org/apache/tez/runtime/api/events/InputReadErrorEvent.java b/tez-api/src/main/java/org/apache/tez/runtime/api/events/InputReadErrorEvent.java
index 1d0c44d6c1..6c9f1fbe6b 100644
--- a/tez-api/src/main/java/org/apache/tez/runtime/api/events/InputReadErrorEvent.java
+++ b/tez-api/src/main/java/org/apache/tez/runtime/api/events/InputReadErrorEvent.java
@@ -21,6 +21,8 @@
 import org.apache.hadoop.classification.InterfaceAudience.Public;
 import org.apache.tez.runtime.api.Event;
 
+import com.google.common.annotations.VisibleForTesting;
+
 import java.util.Objects;
 
 /**
@@ -79,11 +81,14 @@ private InputReadErrorEvent(final String diagnostics, final int index, final int
     this.destinationLocalhostName = destinationLocalhostName;
   }
 
-  public static InputReadErrorEvent create(String diagnostics, int index, int version,
-      boolean isLocalFetch, boolean isDiskErrorAtSource) {
-    return create(diagnostics, index, version, 1, isLocalFetch, isDiskErrorAtSource, null);
-  }
-
+  /**
+   * Creates an InputReadErrorEvent from less parameters, supposed to be used from tests only.
+   * @param diagnostics
+   * @param index
+   * @param version
+   * @return InputReadErrorEvent instance
+   */
+  @VisibleForTesting
   public static InputReadErrorEvent create(String diagnostics, int index, int version) {
     return create(diagnostics, index, version, 1, false, false, null);
   }
diff --git a/tez-tests/src/test/java/org/apache/tez/test/TestInput.java b/tez-tests/src/test/java/org/apache/tez/test/TestInput.java
index 811ca3cc17..56bfe49dc8 100644
--- a/tez-tests/src/test/java/org/apache/tez/test/TestInput.java
+++ b/tez-tests/src/test/java/org/apache/tez/test/TestInput.java
@@ -175,7 +175,7 @@ public int doRead() {
               for (int i=0; i<getNumPhysicalInputs(); ++i) {
                 String msg = ("FailingInput: " + getContext().getUniqueIdentifier() + 
                     " index: " + i + " version: " + lastInputReadyValue);
-                events.add(InputReadErrorEvent.create(msg, i, lastInputReadyValue));
+                events.add(InputReadErrorEvent.create(msg, i, lastInputReadyValue, 1, false, false, "localhost"));
                 LOG.info("Failing input: " + msg);
               }
             } else {
@@ -189,7 +189,8 @@ public int doRead() {
                 }
                 String msg = ("FailingInput: " + getContext().getUniqueIdentifier() + 
                     " index: " + index.intValue() + " version: " + lastInputReadyValue);
-                events.add(InputReadErrorEvent.create(msg, index.intValue(), lastInputReadyValue));
+                events.add(InputReadErrorEvent.create(msg, index.intValue(), lastInputReadyValue, 1, false, false,
+                    "localhost"));
                 LOG.info("Failing input: " + msg);
               }
             }
@@ -263,7 +264,7 @@ public int doRead() {
                             getContext().getUniqueIdentifier() + 
                             " index: " + index + " version: " + sourceInputVersion;
               LOG.info(msg);
-              events.add(InputReadErrorEvent.create(msg, index, sourceInputVersion));
+              events.add(InputReadErrorEvent.create(msg, index, sourceInputVersion, 1, false, false, "localhost"));
             }
           }
         }