Re-name test and reapply fix

JoshRosen · JoshRosen · commit 652fa3c54ecc · 2015-06-03T14:15:32.000-07:00
diff --git a/core/src/main/scala/org/apache/spark/deploy/SparkHadoopUtil.scala b/core/src/main/scala/org/apache/spark/deploy/SparkHadoopUtil.scala
@@ -179,7 +179,7 @@ class SparkHadoopUtil extends Logging {
       Seq.empty
     } else {
       FileSystem.getAllStatistics
-        .filter { stats => stats.getScheme.equals(scheme) }
+        .filter { stats => scheme.equals(stats.getScheme()) }
         .map(Utils.invoke(classOf[Statistics], _, "getThreadStatistics"))
     }
   }
diff --git a/core/src/test/scala/org/apache/spark/metrics/InputOutputMetricsSuite.scala b/core/src/test/scala/org/apache/spark/metrics/InputOutputMetricsSuite.scala
@@ -108,7 +108,7 @@ class InputOutputMetricsSuite extends FunSuite with SharedSparkContext with Shou
     }
   }
 
-  test("exceptions while getting IO thread statistics should not fail tasks / jobs (SPARK-8062)") {
+  test("getFileSystemThreadStatistics should guard against null schemes (SPARK-8062)") {
     val tempDir = Utils.createTempDir()
     val outPath = new File(tempDir, "outfile")
 

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ class SparkHadoopUtil extends Logging {`
`179`	`179`	`Seq.empty`
`180`	`180`	`} else {`
`181`	`181`	`FileSystem.getAllStatistics`
`182`		`- .filter { stats => stats.getScheme.equals(scheme) }`
	`182`	`+ .filter { stats => scheme.equals(stats.getScheme()) }`
`183`	`183`	`.map(Utils.invoke(classOf[Statistics], _, "getThreadStatistics"))`
`184`	`184`	`}`
`185`	`185`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ class InputOutputMetricsSuite extends FunSuite with SharedSparkContext with Shou`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`
`111`		`- test("exceptions while getting IO thread statistics should not fail tasks / jobs (SPARK-8062)") {`
	`111`	`+ test("getFileSystemThreadStatistics should guard against null schemes (SPARK-8062)") {`
`112`	`112`	`val tempDir = Utils.createTempDir()`
`113`	`113`	`val outPath = new File(tempDir, "outfile")`
`114`	`114`