From 4abb51e26f9c1e5bd917115f3b08755c715ab354 Mon Sep 17 00:00:00 2001
From: David Mollitor <dmollitor@apache.org>
Date: Mon, 17 May 2021 11:01:24 -0400
Subject: [PATCH] TEZ-4308: Add Whitespace in ShuffleScheduler Error Message

---
 .../shuffle/orderedgrouped/ShuffleScheduler.java      | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/ShuffleScheduler.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/ShuffleScheduler.java
index 67681cedc7..540d44f409 100644
--- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/ShuffleScheduler.java
+++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/orderedgrouped/ShuffleScheduler.java
@@ -1044,12 +1044,13 @@ boolean isShuffleHealthy(InputAttemptIdentifier srcAttempt) {
         && !fetcherHealthy
         && (!reducerProgressedEnough || reducerStalled)) {
       String errorMsg = (srcNameTrimmed + ": "
-          + "Shuffle failed with too many fetch failures and insufficient progress!"
-          + "failureCounts=" + failureCounts.size()
+          + "Shuffle failed with too many fetch failures and insufficient progress: "
+          + "[failureCounts=" + failureCounts.size()
           + ", pendingInputs=" + (numInputs - doneMaps)
           + ", fetcherHealthy=" + fetcherHealthy
           + ", reducerProgressedEnough=" + reducerProgressedEnough
-          + ", reducerStalled=" + reducerStalled);
+          + ", reducerStalled=" + reducerStalled)
+          + "]";
       LOG.error(errorMsg);
       if (LOG.isDebugEnabled()) {
         LOG.debug("Host failures=" + hostFailures.keySet());
@@ -1109,7 +1110,7 @@ public void obsoleteInput(InputAttemptIdentifier srcAttempt) {
       }
       IOException exception = new IOException(srcAttempt + " is marked as obsoleteInput, but it "
           + "exists in shuffleInfoEventMap. Some data could have been already merged "
-          + "to memory/disk outputs.  Failing the fetch early. eventInfo:" + eventInfo.toString());
+          + "to memory/disk outputs. Failing the fetch early. eventInfo: " + eventInfo);
       String message = "Got obsolete event. Killing self as attempt's data could have been consumed";
       killSelf(exception, message);
       return;
@@ -1379,7 +1380,7 @@ protected Void callInternal() throws InterruptedException {
             } catch (InterruptedException e) {
               if (isShutdown.get()) {
                 LOG.info(srcNameTrimmed + ": " +
-                    "Interrupted while waiting for fetchers to complete" +
+                    "Interrupted while waiting for fetchers to complete " +
                     "and hasBeenShutdown. Breaking out of ShuffleSchedulerCallable loop");
                 Thread.currentThread().interrupt();
                 break;