diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-07-31 18:36:43 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-07-31 18:36:43 -0700 |
| commit | 3097d75d6f5b93cac851dd6f43faed5a492b2676 (patch) | |
| tree | 44f6fcff360748385c76072c0feb4d83ba07997e /core | |
| parent | ecab635ae1115efb1fcc5b4a4b934ac10eea5d08 (diff) | |
| parent | 0862494d442199402e37dc968dadf9a5bec9ae78 (diff) | |
| download | spark-3097d75d6f5b93cac851dd6f43faed5a492b2676.tar.gz spark-3097d75d6f5b93cac851dd6f43faed5a492b2676.tar.bz2 spark-3097d75d6f5b93cac851dd6f43faed5a492b2676.zip | |
Merge remote-tracking branch 'dlyubimov/SPARK-827'
Conflicts:
docs/configuration.md
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/spark/scheduler/cluster/ClusterTaskSetManager.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/main/scala/spark/scheduler/cluster/ClusterTaskSetManager.scala b/core/src/main/scala/spark/scheduler/cluster/ClusterTaskSetManager.scala index bbf234febd..ffb5890ec2 100644 --- a/core/src/main/scala/spark/scheduler/cluster/ClusterTaskSetManager.scala +++ b/core/src/main/scala/spark/scheduler/cluster/ClusterTaskSetManager.scala @@ -85,7 +85,7 @@ private[spark] class ClusterTaskSetManager(sched: ClusterScheduler, val taskSet: val CPUS_PER_TASK = System.getProperty("spark.task.cpus", "1").toDouble // Maximum times a task is allowed to fail before failing the job - val MAX_TASK_FAILURES = 4 + val MAX_TASK_FAILURES = System.getProperty("spark.task.maxFailures", "4").toInt // Quantile of tasks at which to start speculation val SPECULATION_QUANTILE = System.getProperty("spark.speculation.quantile", "0.75").toDouble |