-
Notifications
You must be signed in to change notification settings - Fork 29k
[SPARK-3543] Write TaskContext in Java and expose it through a static accessor. #2425
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.
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
Changes from 2 commits
333c7d6
f716fd1
edf945e
a7d5e23
ddb8cbe
ee8bd00
8ae414c
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,176 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.spark; | ||
|
|
||
| import java.io.Serializable; | ||
| import java.util.ArrayList; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
|
|
||
| import scala.Function0; | ||
| import scala.Function1; | ||
| import scala.Unit; | ||
| import scala.collection.JavaConversions; | ||
|
|
||
| import org.apache.spark.annotation.DeveloperApi; | ||
| import org.apache.spark.executor.TaskMetrics; | ||
| import org.apache.spark.util.TaskCompletionListener; | ||
| import org.apache.spark.util.TaskCompletionListenerException; | ||
|
|
||
| @DeveloperApi | ||
| public class TaskContext implements Serializable { | ||
|
|
||
| public Integer stageId; | ||
| public Integer partitionId; | ||
| public Long attemptId; | ||
| public Boolean runningLocally; | ||
| public TaskMetrics taskMetrics; | ||
|
|
||
| public TaskContext(Integer stageId, Integer partitionId, Long attemptId, Boolean runningLocally, | ||
| TaskMetrics taskMetrics) { | ||
| this.attemptId = attemptId; | ||
| this.partitionId = partitionId; | ||
| this.runningLocally = runningLocally; | ||
| this.stageId = stageId; | ||
| this.taskMetrics = taskMetrics; | ||
| taskContext.set(this); | ||
| } | ||
|
|
||
| public TaskContext(Integer stageId, Integer partitionId, Long attemptId, | ||
| Boolean runningLocally) { | ||
| this.attemptId = attemptId; | ||
| this.partitionId = partitionId; | ||
| this.runningLocally = runningLocally; | ||
| this.stageId = stageId; | ||
| this.taskMetrics = TaskMetrics.empty(); | ||
| taskContext.set(this); | ||
| } | ||
|
|
||
| public TaskContext(Integer stageId, Integer partitionId, Long attemptId) { | ||
| this.attemptId = attemptId; | ||
| this.partitionId = partitionId; | ||
| this.runningLocally = false; | ||
| this.stageId = stageId; | ||
| this.taskMetrics = TaskMetrics.empty(); | ||
| taskContext.set(this); | ||
| } | ||
|
|
||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. extra line |
||
|
|
||
| private static ThreadLocal<TaskContext> taskContext = | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. u don't need to wrap this, do u?
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You mean text wrap ?, yes in one line they are 114 chars. |
||
| new ThreadLocal<TaskContext>(); | ||
|
|
||
| public static TaskContext get() { | ||
| return taskContext.get(); | ||
| } | ||
|
|
||
| // List of callback functions to execute when the task completes. | ||
| private transient List<TaskCompletionListener> onCompleteCallbacks = | ||
| new ArrayList<TaskCompletionListener>(); | ||
|
|
||
| // Whether the corresponding task has been killed. | ||
| private volatile Boolean interrupted = false; | ||
|
|
||
| // Whether the task has completed. | ||
| private volatile Boolean completed = false; | ||
|
|
||
| /** | ||
| * Checks whether the task has completed. | ||
| */ | ||
| public Boolean isCompleted() { | ||
| return completed; | ||
| } | ||
|
|
||
| /** | ||
| * Checks whether the task has been killed. | ||
| */ | ||
| public Boolean isInterrupted() { | ||
| return interrupted; | ||
| } | ||
|
|
||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. can u go through the file and use only one line to separate functions |
||
|
|
||
| /** | ||
| * Add a (Java friendly) listener to be executed on task completion. | ||
| * This will be called in all situation - success, failure, or cancellation. | ||
| * | ||
| * An example use is for HadoopRDD to register a callback to close the input stream. | ||
| */ | ||
| public TaskContext addTaskCompletionListener(TaskCompletionListener listener){ | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. space before { |
||
| onCompleteCallbacks.add(listener); | ||
| return this; | ||
| } | ||
|
|
||
|
|
||
| /** | ||
| * Add a listener in the form of a Scala closure to be executed on task completion. | ||
| * This will be called in all situation - success, failure, or cancellation. | ||
| * | ||
| * An example use is for HadoopRDD to register a callback to close the input stream. | ||
| */ | ||
| public TaskContext addTaskCompletionListener(final Function1<TaskContext, Unit> f) { | ||
| onCompleteCallbacks.add( new TaskCompletionListener() { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. no space before new, and remove the next blank line |
||
|
|
||
| @Override | ||
| public void onTaskCompletion(TaskContext context) { | ||
| f.apply(context); | ||
| } | ||
| }); | ||
| return this; | ||
| } | ||
|
|
||
| /** | ||
| * Add a callback function to be executed on task completion. An example use | ||
| * is for HadoopRDD to register a callback to close the input stream. | ||
| * Will be called in any situation - success, failure, or cancellation. | ||
| * @param f Callback function. | ||
| */ | ||
| @Deprecated | ||
| public void addOnCompleteCallback(final Function0<Unit> f) { | ||
| onCompleteCallbacks.add(new TaskCompletionListener() { | ||
| @Override | ||
| public void onTaskCompletion(TaskContext context) { | ||
| f.apply(); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| /** Marks the task as completed and triggers the listeners. */ | ||
| public void markTaskCompleted() throws TaskCompletionListenerException { | ||
| completed = true; | ||
| List<String> errorMsgs = new ArrayList<String>(2); | ||
| // Process complete callbacks in the reverse order of registration | ||
| List<TaskCompletionListener> revlist = | ||
| new ArrayList<TaskCompletionListener>(onCompleteCallbacks); | ||
| Collections.reverse(revlist); | ||
| for (TaskCompletionListener tcl : revlist){ | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. space before { |
||
| try { | ||
| tcl.onTaskCompletion(this); | ||
| } catch (Throwable e){ | ||
| errorMsgs.add(e.getMessage()); | ||
| } | ||
| } | ||
|
|
||
| if (!errorMsgs.isEmpty()) { | ||
| throw new TaskCompletionListenerException(JavaConversions.asScalaBuffer(errorMsgs)); | ||
| } | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. we should remove the object from thread local - otherwise it can lead to memory leak with the executor's thread pool being cached |
||
| } | ||
|
|
||
| /** Marks the task for interruption, i.e. cancellation. */ | ||
| public void markInterrupted() { | ||
| interrupted = true; | ||
| } | ||
| } | ||
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -94,7 +94,7 @@ class CacheManagerSuite extends FunSuite with BeforeAndAfter with EasyMockSugar | |
| } | ||
|
|
||
| whenExecuting(blockManager) { | ||
| val context = new TaskContext(0, 0, 0, runningLocally = true) | ||
| val context = new TaskContext(0, 0, 0, true) | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. we should name it here too
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These were breaking compilations.. |
||
| val value = cacheManager.getOrCompute(rdd, split, context, StorageLevel.MEMORY_ONLY) | ||
| assert(value.toList === List(1, 2, 3, 4)) | ||
| } | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do we do 2 space or 4 space indent?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
actually don't make them public - this breaks binary compatibility right now.
you should make them private, and create a public accessor stageId()