Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[SPARK-5376][Mesos] MesosExecutor should have correct resources
- changed term from `cpus` to `cores`
- Reworded docs
  • Loading branch information
jongyoul committed Jan 23, 2015
commit 90545351ac53e054fc64c8229f97c19d82cb60aa
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ private[spark] class MesosSchedulerBackend(
// The listener bus to publish executor added/removed events.
val listenerBus = sc.listenerBus

val executorCpus = sc.conf.getInt("spark.mesos.executor.cpus", 1)
val executorCpus = sc.conf.getInt("spark.mesos.executor.cores", 1)

@volatile var appId: String = _

Expand Down
4 changes: 2 additions & 2 deletions docs/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -342,10 +342,10 @@ Apart from these, the following properties are also available, and may be useful
</td>
</tr>
<tr>
<td><code>spark.mesos.executor.cpus</code></td>
<td><code>spark.mesos.executor.cores</code></td>
<td>1</td>
<td>
This value is the amount of cores so that executor is running itself.
The amount of cores to request for running the mesos executor.
</td>
</tr>
</table>
Expand Down
4 changes: 2 additions & 2 deletions docs/running-on-mesos.md
Original file line number Diff line number Diff line change
Expand Up @@ -227,10 +227,10 @@ See the [configuration page](configuration.html) for information on Spark config
</td>
</tr>
<tr>
<td><code>spark.mesos.executor.cpus</code></td>
<td><code>spark.mesos.executor.cores</code></td>
<td>1</td>
<td>
The amount of cores that Mesos executor will request additionally for running executor itself.
The amount of cores to request for running the mesos executor.
</td>
</tr>
</table>
Expand Down