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:43 -0800 |
| commit | 23d64cf083297f9539db7cc2ffe9d5db9d4a9bac (patch) | |
| tree | 9729137d6411b89601b0b21a59b8b073558d3af4 /core | |
| parent | 3c4acac43f8910e9ff46392491e64803f7b1ae5f (diff) | |
| download | spark-23d64cf083297f9539db7cc2ffe9d5db9d4a9bac.tar.gz spark-23d64cf083297f9539db7cc2ffe9d5db9d4a9bac.tar.bz2 spark-23d64cf083297f9539db7cc2ffe9d5db9d4a9bac.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
(cherry picked from commit 080ceb771a1e6b9f844cfd4f1baa01133c106888)
Signed-off-by: Patrick Wendell <pwendell@gmail.com>
Diffstat (limited to 'core')
| -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 f4215f268a..c04e23dd31 100644 --- a/core/src/main/scala/org/apache/spark/SparkEnv.scala +++ b/core/src/main/scala/org/apache/spark/SparkEnv.scala @@ -399,7 +399,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 |