Fix test failures

Sital Kedia · Sital Kedia · commit 8787db1679c5 · 2017-03-16T19:37:44.000-07:00
diff --git a/core/src/main/scala/org/apache/spark/scheduler/DAGScheduler.scala b/core/src/main/scala/org/apache/spark/scheduler/DAGScheduler.scala
@@ -1371,8 +1371,7 @@ class DAGScheduler(
       execId: String,
       fileLost: Boolean) {
     removeExecutorAndUnregisterOutputOnExecutor(execId,
-      // There will not be any file loss if external shuffle service is enabled
-      fileLost && !env.blockManager.externalShuffleServiceEnabled, None)
+      fileLost || !env.blockManager.externalShuffleServiceEnabled, None)
   }
 
 

Original file line number	Diff line number	Diff line change
`@@ -1371,8 +1371,7 @@ class DAGScheduler(`
`1371`	`1371`	`execId: String,`
`1372`	`1372`	`fileLost: Boolean) {`
`1373`	`1373`	`removeExecutorAndUnregisterOutputOnExecutor(execId,`
`1374`		`- // There will not be any file loss if external shuffle service is enabled`
`1375`		`- fileLost && !env.blockManager.externalShuffleServiceEnabled, None)`
	`1374`	`+ fileLost \|\| !env.blockManager.externalShuffleServiceEnabled, None)`
`1376`	`1375`	`}`
`1377`	`1376`
`1378`	`1377`