Skip to content

[SPARK-10956] Common MemoryManager interface for storage and execution #9000

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
andrewor14 wants to merge 16 commits into from
Closed

[SPARK-10956] Common MemoryManager interface for storage and execution #9000

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
9e73981
Introduce MemoryManager + StaticMemoryManager
Sep 30, 2015
b5df241
Derive max memory from MemoryManager
Oct 1, 2015
700e5d1
Route ShuffleMemoryManager through new interface
Oct 1, 2015
933de61
Route MemoryStore through new interface
Oct 5, 2015
e73e463
Limit scope of synchronized blocks to avoid deadlocks
Oct 5, 2015
52e2014
Remove ResultWithDroppedBlocks
Oct 6, 2015
88faede
Add unit test for StaticMemoryManager
Oct 6, 2015
5c74063
Minor style
Oct 6, 2015
0bf0d94
Add comment to pending unroll.
JoshRosen Oct 8, 2015
b1e8fd1
Pending unroll transfer.
JoshRosen Oct 8, 2015
adb1764
Merge pull request #2 from JoshRosen/pending-unroll-comment
Oct 8, 2015
6e2e870
Merge branch 'memory-manager' of github.com:andrewor14/spark into mem…
Oct 9, 2015
b0af4d2
Merge branch 'master' of github.com:apache/spark into memory-manager
Oct 9, 2015
1ef313c
Move MemoryManager to new package
Oct 9, 2015
9de2e20
Change acquire[Unroll/Storage]Memory to return boolean
Oct 9, 2015
fc7f9f5
Address comments
Oct 9, 2015
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
Move MemoryManager to new package
  • Loading branch information
Andrew Or committed Oct 9, 2015
commit 1ef313c640f969a8cd51a16489d38c4698e29d9c
1 change: 1 addition & 0 deletions core/src/main/scala/org/apache/spark/SparkEnv.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import org.apache.spark.annotation.DeveloperApi
import org.apache.spark.api.python.PythonWorkerFactory
import org.apache.spark.broadcast.BroadcastManager
import org.apache.spark.metrics.MetricsSystem
import org.apache.spark.memory.{MemoryManager, StaticMemoryManager}
import org.apache.spark.network.BlockTransferService
import org.apache.spark.network.netty.NettyBlockTransferService
import org.apache.spark.rpc.{RpcEndpointRef, RpcEndpoint, RpcEnv}
Expand Down
2 changes: 1 addition & 1 deletion ...cala/org/apache/spark/MemoryManager.scala → ...g/apache/spark/memory/MemoryManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.spark
package org.apache.spark.memory

import scala.collection.mutable

Expand Down
3 changes: 2 additions & 1 deletion ...rg/apache/spark/StaticMemoryManager.scala → ...he/spark/memory/StaticMemoryManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@
* limitations under the License.
*/

package org.apache.spark
package org.apache.spark.memory

import scala.collection.mutable

import org.apache.spark.{Logging, SparkConf, SparkEnv}
import org.apache.spark.storage.{BlockId, BlockStatus, MemoryStore}


Expand Down
3 changes: 2 additions & 1 deletion core/src/main/scala/org/apache/spark/shuffle/ShuffleMemoryManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ import scala.collection.mutable

import com.google.common.annotations.VisibleForTesting

import org.apache.spark.unsafe.array.ByteArrayMethods
import org.apache.spark._
import org.apache.spark.memory.{StaticMemoryManager, MemoryManager}
import org.apache.spark.unsafe.array.ByteArrayMethods

/**
* Allocates a pool of memory to tasks for use in shuffle operations. Each disk-spilling
Expand Down
1 change: 1 addition & 0 deletions core/src/main/scala/org/apache/spark/storage/BlockManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import sun.nio.ch.DirectBuffer
import org.apache.spark._
import org.apache.spark.executor.{DataReadMethod, ShuffleWriteMetrics}
import org.apache.spark.io.CompressionCodec
import org.apache.spark.memory.MemoryManager
import org.apache.spark.network._
import org.apache.spark.network.buffer.{ManagedBuffer, NioManagedBuffer}
import org.apache.spark.network.netty.SparkTransportConf
Expand Down
3 changes: 2 additions & 1 deletion core/src/main/scala/org/apache/spark/storage/MemoryStore.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ import java.util.LinkedHashMap
import scala.collection.mutable
import scala.collection.mutable.ArrayBuffer

import org.apache.spark.{MemoryManager, TaskContext}
import org.apache.spark.TaskContext
import org.apache.spark.memory.MemoryManager
import org.apache.spark.util.{SizeEstimator, Utils}
import org.apache.spark.util.collection.SizeTrackingVector

Expand Down
3 changes: 2 additions & 1 deletion ...ache/spark/StaticMemoryManagerSuite.scala → ...ark/memory/StaticMemoryManagerSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,15 @@
* limitations under the License.
*/

package org.apache.spark
package org.apache.spark.memory

import scala.collection.mutable.ArrayBuffer

import org.mockito.Mockito.{mock, reset, verify, when}
import org.mockito.Matchers.{any, eq => meq}

import org.apache.spark.storage.{BlockId, BlockStatus, MemoryStore, TestBlockId}
import org.apache.spark.{SparkConf, SparkFunSuite}


class StaticMemoryManagerSuite extends SparkFunSuite {
Expand Down
1 change: 1 addition & 0 deletions core/src/test/scala/org/apache/spark/storage/BlockManagerReplicationSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import org.scalatest.concurrent.Eventually._
import org.apache.spark.network.netty.NettyBlockTransferService
import org.apache.spark.rpc.RpcEnv
import org.apache.spark._
import org.apache.spark.memory.StaticMemoryManager
import org.apache.spark.network.BlockTransferService
import org.apache.spark.scheduler.LiveListenerBus
import org.apache.spark.serializer.KryoSerializer
Expand Down
1 change: 1 addition & 0 deletions core/src/test/scala/org/apache/spark/storage/BlockManagerSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import org.apache.spark.network.netty.NettyBlockTransferService
import org.apache.spark.rpc.RpcEnv
import org.apache.spark._
import org.apache.spark.executor.DataReadMethod
import org.apache.spark.memory.StaticMemoryManager
import org.apache.spark.scheduler.LiveListenerBus
import org.apache.spark.serializer.{JavaSerializer, KryoSerializer}
import org.apache.spark.shuffle.hash.HashShuffleManager
Expand Down
2 changes: 1 addition & 1 deletion sql/core/src/test/scala/org/apache/spark/sql/execution/TestShuffleMemoryManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package org.apache.spark.sql.execution

import scala.collection.mutable

import org.apache.spark.MemoryManager
import org.apache.spark.memory.MemoryManager
import org.apache.spark.shuffle.ShuffleMemoryManager
import org.apache.spark.storage.{BlockId, BlockStatus}

Expand Down
1 change: 1 addition & 0 deletions streaming/src/test/scala/org/apache/spark/streaming/ReceivedBlockHandlerSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import org.scalatest.{BeforeAndAfter, Matchers}
import org.scalatest.concurrent.Eventually._

import org.apache.spark._
import org.apache.spark.memory.StaticMemoryManager
import org.apache.spark.network.netty.NettyBlockTransferService
import org.apache.spark.rpc.RpcEnv
import org.apache.spark.scheduler.LiveListenerBus
Expand Down