aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/configuration.md24
-rw-r--r--docs/job-scheduling.md3
-rw-r--r--docs/programming-guide.md22
3 files changed, 3 insertions, 46 deletions
diff --git a/docs/configuration.md b/docs/configuration.md
index 4b1b00720b..e9b66238bd 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -929,30 +929,6 @@ Apart from these, the following properties are also available, and may be useful
mapping has high overhead for blocks close to or below the page size of the operating system.
</td>
</tr>
-<tr>
- <td><code>spark.externalBlockStore.blockManager</code></td>
- <td>org.apache.spark.storage.TachyonBlockManager</td>
- <td>
- Implementation of external block manager (file system) that store RDDs. The file system's URL is set by
- <code>spark.externalBlockStore.url</code>.
- </td>
-</tr>
-<tr>
- <td><code>spark.externalBlockStore.baseDir</code></td>
- <td>System.getProperty("java.io.tmpdir")</td>
- <td>
- Directories of the external block store that store RDDs. The file system's URL is set by
- <code>spark.externalBlockStore.url</code> It can also be a comma-separated list of multiple
- directories on Tachyon file system.
- </td>
-</tr>
-<tr>
- <td><code>spark.externalBlockStore.url</code></td>
- <td>tachyon://localhost:19998 for Tachyon</td>
- <td>
- The URL of the underlying external blocker file system in the external block store.
- </td>
-</tr>
</table>
#### Networking
diff --git a/docs/job-scheduling.md b/docs/job-scheduling.md
index 95d47794ea..00b6a18836 100644
--- a/docs/job-scheduling.md
+++ b/docs/job-scheduling.md
@@ -54,8 +54,7 @@ an application to gain back cores on one node when it has work to do. To use thi
Note that none of the modes currently provide memory sharing across applications. If you would like to share
data this way, we recommend running a single server application that can serve multiple requests by querying
-the same RDDs. In future releases, in-memory storage systems such as [Tachyon](http://tachyon-project.org) will
-provide another approach to share RDDs.
+the same RDDs.
## Dynamic Resource Allocation
diff --git a/docs/programming-guide.md b/docs/programming-guide.md
index 5ebafa40b0..2f0ed5eca2 100644
--- a/docs/programming-guide.md
+++ b/docs/programming-guide.md
@@ -1177,7 +1177,7 @@ that originally created it.
In addition, each persisted RDD can be stored using a different *storage level*, allowing you, for example,
to persist the dataset on disk, persist it in memory but as serialized Java objects (to save space),
-replicate it across nodes, or store it off-heap in [Tachyon](http://tachyon-project.org/).
+replicate it across nodes.
These levels are set by passing a
`StorageLevel` object ([Scala](api/scala/index.html#org.apache.spark.storage.StorageLevel),
[Java](api/java/index.html?org/apache/spark/storage/StorageLevel.html),
@@ -1218,24 +1218,11 @@ storage levels is:
<td> MEMORY_ONLY_2, MEMORY_AND_DISK_2, etc. </td>
<td> Same as the levels above, but replicate each partition on two cluster nodes. </td>
</tr>
-<tr>
- <td> OFF_HEAP (experimental) </td>
- <td> Store RDD in serialized format in <a href="http://tachyon-project.org">Tachyon</a>.
- Compared to MEMORY_ONLY_SER, OFF_HEAP reduces garbage collection overhead and allows executors
- to be smaller and to share a pool of memory, making it attractive in environments with
- large heaps or multiple concurrent applications. Furthermore, as the RDDs reside in Tachyon,
- the crash of an executor does not lead to losing the in-memory cache. In this mode, the memory
- in Tachyon is discardable. Thus, Tachyon does not attempt to reconstruct a block that it evicts
- from memory. If you plan to use Tachyon as the off heap store, Spark is compatible with Tachyon
- out-of-the-box. Please refer to this <a href="http://tachyon-project.org/master/Running-Spark-on-Tachyon.html">page</a>
- for the suggested version pairings.
- </td>
-</tr>
</table>
**Note:** *In Python, stored objects will always be serialized with the [Pickle](https://docs.python.org/2/library/pickle.html) library,
so it does not matter whether you choose a serialized level. The available storage levels in Python include `MEMORY_ONLY`, `MEMORY_ONLY_2`,
-`MEMORY_AND_DISK`, `MEMORY_AND_DISK_2`, `DISK_ONLY`, `DISK_ONLY_2` and `OFF_HEAP`.*
+`MEMORY_AND_DISK`, `MEMORY_AND_DISK_2`, `DISK_ONLY`, and `DISK_ONLY_2`.*
Spark also automatically persists some intermediate data in shuffle operations (e.g. `reduceByKey`), even without users calling `persist`. This is done to avoid recomputing the entire input if a node fails during the shuffle. We still recommend users call `persist` on the resulting RDD if they plan to reuse it.
@@ -1259,11 +1246,6 @@ requests from a web application). *All* the storage levels provide full fault to
recomputing lost data, but the replicated ones let you continue running tasks on the RDD without
waiting to recompute a lost partition.
-* In environments with high amounts of memory or multiple applications, the experimental `OFF_HEAP`
-mode has several advantages:
- * It allows multiple executors to share the same pool of memory in Tachyon.
- * It significantly reduces garbage collection costs.
- * Cached data is not lost if individual executors crash.
### Removing Data