diff options
| author | GuoQiang Li <witgo@qq.com> | 2014-12-26 23:31:29 -0800 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-12-26 23:31:29 -0800 |
| commit | 080ceb771a1e6b9f844cfd4f1baa01133c106888 (patch) | |
| tree | a45f002b220d732d02edf7a3432c6a5da864ea56 | |
| parent | 786808abfd6ca8c8d3a2331d1be49c1466006a46 (diff) | |
| download | spark-080ceb771a1e6b9f844cfd4f1baa01133c106888.tar.gz spark-080ceb771a1e6b9f844cfd4f1baa01133c106888.tar.bz2 spark-080ceb771a1e6b9f844cfd4f1baa01133c106888.zip | |
[SPARK-4952][Core]Handle ConcurrentModificationExceptions in SparkEnv.environmentDetails
Author: GuoQiang Li <witgo@qq.com>
Closes #3788 from witgo/SPARK-4952 and squashes the following commits:
d903529 [GuoQiang Li] Handle ConcurrentModificationExceptions in SparkEnv.environmentDetails
| -rw-r--r-- | core/src/main/scala/org/apache/spark/SparkEnv.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/main/scala/org/apache/spark/SparkEnv.scala b/core/src/main/scala/org/apache/spark/SparkEnv.scala index 6656df44d3..43436a1697 100644 --- a/core/src/main/scala/org/apache/spark/SparkEnv.scala +++ b/core/src/main/scala/org/apache/spark/SparkEnv.scala @@ -395,7 +395,7 @@ object SparkEnv extends Logging { val sparkProperties = (conf.getAll ++ schedulerMode).sorted // System properties that are not java classpaths - val systemProperties = System.getProperties.iterator.toSeq + val systemProperties = Utils.getSystemProperties.toSeq val otherProperties = systemProperties.filter { case (k, _) => k != "java.class.path" && !k.startsWith("spark.") }.sorted |