Use triple quoted string

apache · Sep 27, 2017 · 4d906b7 · 4d906b7
1 parent 2147450
commit 4d906b7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/core/src/main/scala/org/apache/spark/scheduler/TaskSetManager.scala b/core/src/main/scala/org/apache/spark/scheduler/TaskSetManager.scala
@@ -670,11 +670,12 @@ private[spark] class TaskSetManager(
           }
           if (blacklistedEverywhere) {
             val partition = tasks(indexInTaskSet).partitionId
-            abort(s"Aborting $taskSet because task $indexInTaskSet (partition $partition) " +
-              s"cannot run anywhere due to node and executor blacklist.\n" +
-              s" Most recent failure:\n" +
-              s" ${taskSetBlacklist.getLatestFailureReason}\n\n" +
-              s" Blacklisting behavior can be configured via spark.blacklist.*.\n\n")
+            abort(s"""
+              |Aborting $taskSet because task $indexInTaskSet (partition $partition)
+              |cannot run anywhere due to node and executor blacklist.
+              |Most recent failure:
+              |${taskSetBlacklist.getLatestFailureReason}\n
+              |Blacklisting behavior can be configured via spark.blacklist.*.\n""".stripMargin)
           }
         }
       }

diff --git a/core/src/test/scala/org/apache/spark/scheduler/TaskSchedulerImplSuite.scala b/core/src/test/scala/org/apache/spark/scheduler/TaskSchedulerImplSuite.scala
@@ -660,11 +660,13 @@ class TaskSchedulerImplSuite extends SparkFunSuite with LocalSparkContext with B
     assert(tsm.isZombie)
     assert(failedTaskSet)
     val idx = failedTask.index
-    assert(failedTaskSetReason === s"Aborting TaskSet 0.0 because task $idx (partition $idx) " +
-      s"cannot run anywhere due to node and executor blacklist.\n" +
-      s" Most recent failure:\n" +
-      s" ${tsm.taskSetBlacklistHelperOpt.get.getLatestFailureReason}\n\n" +
-      s" Blacklisting behavior can be configured via spark.blacklist.*.\n\n")
+    assert(failedTaskSetReason === s"""
+      |Aborting $taskSet because task $idx (partition $idx)
+      |cannot run anywhere due to node and executor blacklist.
+      |Most recent failure:
+      |${tsm.taskSetBlacklistHelperOpt.get.getLatestFailureReason}\n
+      |Blacklisting behavior can be configured via spark.blacklist.*.\n""".stripMargin)
+
   }
 
   test("don't abort if there is an executor available, though it hasn't had scheduled tasks yet") {