Skip to content

[AURON #2107] Fix driver spill NPE error #2108

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

Merged
cxzl25 merged 1 commit into from
Mar 23, 2026
Merged

[AURON #2107] Fix driver spill NPE error #2108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 native-engine/auron-jni-bridge/src/jni_bridge.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1535,7 +1535,7 @@ pub struct AuronOnHeapSpillManager<'a> {
pub method_releaseSpill_ret: ReturnType,
}
impl<'a> AuronOnHeapSpillManager<'a> {
pub const SIG_TYPE: &'static str = "org/apache/spark/sql/auron/memory/SparkOnHeapSpillManager";
pub const SIG_TYPE: &'static str = "org/apache/auron/memory/OnHeapSpillManager";

pub fn new(env: &JNIEnv<'a>) -> JniResult<AuronOnHeapSpillManager<'a>> {
let class = get_global_jclass(env, Self::SIG_TYPE)?;
Expand Down
6 changes: 5 additions & 1 deletion ...-extension/src/main/scala/org/apache/spark/sql/auron/memory/SparkOnHeapSpillManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,10 @@ object SparkOnHeapSpillManager extends Logging {

def current: OnHeapSpillManager = {
val tc = TaskContext.get
all.getOrElseUpdate(tc.taskAttemptId(), new SparkOnHeapSpillManager(tc))
if (tc != null) {
all.getOrElseUpdate(tc.taskAttemptId(), new SparkOnHeapSpillManager(tc))
} else {
OnHeapSpillManager.getDisabledOnHeapSpillManager
}
Comment on lines +198 to +202
Copy link

Copilot AI Mar 20, 2026

Choose a reason for hiding this comment

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

OnHeapSpillManager.getDisabledOnHeapSpillManager() creates a new anonymous instance on each call (see auron-core/.../OnHeapSpillManager.java). Since current may be called repeatedly on the driver (where TaskContext.get == null), consider caching a single disabled manager instance in SparkOnHeapSpillManager (e.g., a private val) and returning that to avoid unnecessary allocations/GC churn.

Copilot uses AI. Check for mistakes.
}
}
Loading