Skip to content
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

[SPARK-49502][CORE] Avoid NPE in SparkEnv.get.shuffleManager.unregisterShuffle #47977

Closed
wants to merge 2 commits into from
Closed

[SPARK-49502][CORE] Avoid NPE in SparkEnv.get.shuffleManager.unregisterShuffle #47977

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9d3117
null
cxzl25 Sep 3, 2024
f33efb7
log
cxzl25 Sep 5, 2024
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
2 changes: 1 addition & 1 deletion 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 @@ -73,7 +73,7 @@ class SparkEnv (

// We initialize the ShuffleManager later in SparkContext and Executor to allow
// user jars to define custom ShuffleManagers.
private var _shuffleManager: ShuffleManager = _
@volatile private var _shuffleManager: ShuffleManager = _

def shuffleManager: ShuffleManager = _shuffleManager

Expand Down
7 changes: 6 additions & 1 deletion core/src/main/scala/org/apache/spark/storage/BlockManagerStorageEndpoint.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,12 @@ class BlockManagerStorageEndpoint(
if (mapOutputTracker != null) {
mapOutputTracker.unregisterShuffle(shuffleId)
}
SparkEnv.get.shuffleManager.unregisterShuffle(shuffleId)
val shuffleManager = SparkEnv.get.shuffleManager
if (shuffleManager != null) {
shuffleManager.unregisterShuffle(shuffleId)
} else {
true
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shall we add a debug-level log here?

}
}

case DecommissionBlockManager =>
Expand Down