Repository: spark Updated Branches: refs/heads/master 63dfe21dc -> 6f341310b
SPARK-5492. Thread statistics can break with older Hadoop versions Author: Sandy Ryza <[email protected]> Closes #4305 from sryza/sandy-spark-5492 and squashes the following commits: b7d4497 [Sandy Ryza] SPARK-5492. Thread statistics can break with older Hadoop versions Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/6f341310 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/6f341310 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/6f341310 Branch: refs/heads/master Commit: 6f341310bf1fa59a28c96d123fa59e12b9366b68 Parents: 63dfe21 Author: Sandy Ryza <[email protected]> Authored: Mon Feb 2 00:54:06 2015 -0800 Committer: Patrick Wendell <[email protected]> Committed: Mon Feb 2 00:54:06 2015 -0800 ---------------------------------------------------------------------- .../src/main/scala/org/apache/spark/deploy/SparkHadoopUtil.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/6f341310/core/src/main/scala/org/apache/spark/deploy/SparkHadoopUtil.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/deploy/SparkHadoopUtil.scala b/core/src/main/scala/org/apache/spark/deploy/SparkHadoopUtil.scala index 211e3ed..d688542 100644 --- a/core/src/main/scala/org/apache/spark/deploy/SparkHadoopUtil.scala +++ b/core/src/main/scala/org/apache/spark/deploy/SparkHadoopUtil.scala @@ -141,7 +141,7 @@ class SparkHadoopUtil extends Logging { val baselineBytesRead = f() Some(() => f() - baselineBytesRead) } catch { - case e: NoSuchMethodException => { + case e @ (_: NoSuchMethodException | _: ClassNotFoundException) => { logDebug("Couldn't find method for retrieving thread-level FileSystem input data", e) None } @@ -163,7 +163,7 @@ class SparkHadoopUtil extends Logging { val baselineBytesWritten = f() Some(() => f() - baselineBytesWritten) } catch { - case e: NoSuchMethodException => { + case e @ (_: NoSuchMethodException | _: ClassNotFoundException) => { logDebug("Couldn't find method for retrieving thread-level FileSystem output data", e) None } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
