From 5480faa160bb704f9eb85d51e3fa64d15305268e Mon Sep 17 00:00:00 2001 From: Alessandro Bellina Date: Thu, 16 Nov 2023 09:49:08 -0600 Subject: [PATCH] Improve comment in block manager and the master endpoint --- .../main/scala/org/apache/spark/storage/BlockManager.scala | 4 ++-- .../org/apache/spark/storage/BlockManagerMasterEndpoint.scala | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core/src/main/scala/org/apache/spark/storage/BlockManager.scala b/core/src/main/scala/org/apache/spark/storage/BlockManager.scala index 261f90faaf454..d3adb04fb28c6 100644 --- a/core/src/main/scala/org/apache/spark/storage/BlockManager.scala +++ b/core/src/main/scala/org/apache/spark/storage/BlockManager.scala @@ -193,8 +193,8 @@ private[spark] class BlockManager( extends BlockDataManager with BlockEvictionHandler with Logging { // We initialize the ShuffleManager later in SparkContext and Executor, to allow - // user jars to define custom ShuffleManagers, as such `_shuffleManager` will be null for the - // executor, and we ask for the instance from the SparkEnv. + // user jars to define custom ShuffleManagers, as such `_shuffleManager` will be null here + // (except for tests) and we ask for the instance from the SparkEnv. private lazy val shuffleManager = Option(_shuffleManager).getOrElse(SparkEnv.get.shuffleManager) // same as `conf.get(config.SHUFFLE_SERVICE_ENABLED)` diff --git a/core/src/main/scala/org/apache/spark/storage/BlockManagerMasterEndpoint.scala b/core/src/main/scala/org/apache/spark/storage/BlockManagerMasterEndpoint.scala index f2dd3c26e88e5..bf33b6d8a0e9e 100644 --- a/core/src/main/scala/org/apache/spark/storage/BlockManagerMasterEndpoint.scala +++ b/core/src/main/scala/org/apache/spark/storage/BlockManagerMasterEndpoint.scala @@ -58,6 +58,9 @@ class BlockManagerMasterEndpoint( isDriver: Boolean) extends IsolatedThreadSafeRpcEndpoint with Logging { + // We initialize the ShuffleManager later in SparkContext and Executor, to allow + // user jars to define custom ShuffleManagers, as such `_shuffleManager` will be null here + // (except for tests) and we ask for the instance from the SparkEnv. private lazy val shuffleManager = Option(_shuffleManager).getOrElse(SparkEnv.get.shuffleManager) // Mapping from executor id to the block manager's local disk directories.