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.

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

[BACKPORT][SPARK-23040][CORE] Returns interruptible iterator for shuffle reader #20954

Closed
wants to merge 2 commits into from

Conversation

jiangxb1987
Copy link
Contributor

Backport #20449 and #20920 to branch-2.3


What changes were proposed in this pull request?

Before this commit, a non-interruptible iterator is returned if aggregator or ordering is specified.
This commit also ensures that sorter is closed even when task is cancelled(killed) in the middle of sorting.

How was this patch tested?

Add a unit test in JobCancellationSuite

advancedxy and others added 2 commits March 31, 2018 11:49
## What changes were proposed in this pull request?

Before this commit, a non-interruptible iterator is returned if aggregator or ordering is specified.
This commit also ensures that sorter is closed even when task is cancelled(killed) in the middle of sorting.

## How was this patch tested?

Add a unit test in JobCancellationSuite

Author: Xianjin YE <advancedxy@gmail.com>

Closes apache#20449 from advancedxy/SPARK-23040.
## What changes were proposed in this pull request?

Address apache#20449 (comment), If `resultIter` is already a `InterruptibleIterator`, don't double wrap it.

## How was this patch tested?
Existing tests.

Author: Xingbo Jiang <xingbo.jiang@databricks.com>

Closes apache#20920 from jiangxb1987/SPARK-23040.
@SparkQA
Copy link

SparkQA commented Mar 31, 2018

Test build #88777 has finished for PR 20954 at commit e9a661f.

  • This patch fails due to an unknown error code, -9.
  • This patch merges cleanly.
  • This patch adds no public classes.

@jiangxb1987
Copy link
Contributor Author

retest this please

@SparkQA
Copy link

SparkQA commented Mar 31, 2018

Test build #88781 has finished for PR 20954 at commit e9a661f.

  • This patch passes all tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

asfgit pushed a commit that referenced this pull request Apr 1, 2018
…fle reader

Backport #20449 and #20920 to branch-2.3

---

## What changes were proposed in this pull request?
Before this commit, a non-interruptible iterator is returned if aggregator or ordering is specified.
This commit also ensures that sorter is closed even when task is cancelled(killed) in the middle of sorting.

## How was this patch tested?
Add a unit test in JobCancellationSuite

Author: Xianjin YE <advancedxy@gmail.com>
Author: Xingbo Jiang <xingbo.jiang@databricks.com>

Closes #20954 from jiangxb1987/SPARK-23040-2.3.
@cloud-fan
Copy link
Contributor

thanks, merging to 2.3!

@jiangxb1987 jiangxb1987 closed this Apr 2, 2018
@jiangxb1987
Copy link
Contributor Author

Thanks for reporting, I'll be looking into the flaky test.

peter-toth pushed a commit to peter-toth/spark that referenced this pull request Oct 6, 2018
…fle reader

Backport apache#20449 and apache#20920 to branch-2.3

---

Before this commit, a non-interruptible iterator is returned if aggregator or ordering is specified.
This commit also ensures that sorter is closed even when task is cancelled(killed) in the middle of sorting.

Add a unit test in JobCancellationSuite

Author: Xianjin YE <advancedxy@gmail.com>
Author: Xingbo Jiang <xingbo.jiang@databricks.com>

Closes apache#20954 from jiangxb1987/SPARK-23040-2.3.

Change-Id: I2c8ce9f64f03ddfe1876a4db439f4b25df52da3e
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
5 participants