diff options
author | Sandy Ryza <sandy@cloudera.com> | 2015-02-02 00:54:06 -0800 |
---|---|---|
committer | Patrick Wendell <patrick@databricks.com> | 2015-02-02 00:54:06 -0800 |
commit | 6f341310bf1fa59a28c96d123fa59e12b9366b68 (patch) | |
tree | 7f475b17175a11f1c0fe32aab37bd2e1fc59ae12 /core | |
parent | 63dfe21dc7743e6ebb431157eb2410a39a6c64e3 (diff) | |
download | spark-6f341310bf1fa59a28c96d123fa59e12b9366b68.tar.gz spark-6f341310bf1fa59a28c96d123fa59e12b9366b68.tar.bz2 spark-6f341310bf1fa59a28c96d123fa59e12b9366b68.zip |
SPARK-5492. Thread statistics can break with older Hadoop versions
Author: Sandy Ryza <sandy@cloudera.com>
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
Diffstat (limited to 'core')
-rw-r--r-- | core/src/main/scala/org/apache/spark/deploy/SparkHadoopUtil.scala | 4 |
1 files changed, 2 insertions, 2 deletions
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 211e3ede53..d68854214e 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 } |