Skip to content

Conversation

@abellina
Copy link
Contributor

@abellina abellina commented Mar 7, 2019

What changes were proposed in this pull request?

This is mostly a clean backport of #23521 to branch-2.4

How was this patch tested?

I've tested this with a hack in TransportRequestHandler to force ChunkFetchRequest to get dropped.

Then making a number of ExternalShuffleClient.fetchChunk requests (which OpenBlocks then ChunkFetchRequest) and closing out of my test harness. A heap dump later reveals that the StreamState references are unreachable.

I haven't run this through the unit test suite, but doing that now. Wanted to get this up as I think folks are waiting for it for 2.4.1

viirya and others added 2 commits March 7, 2019 14:26
Now in `TransportRequestHandler.processStreamRequest`, when a stream request is processed, the stream id is not registered with the current channel in stream manager. It should do that so in case of that the channel gets terminated we can remove associated streams of stream requests too.

This also cleans up channel registration in `StreamManager`. Since `StreamManager` doesn't register channel but only `OneForOneStreamManager` does it, this removes `registerChannel` from `StreamManager`. When `OneForOneStreamManager` goes to register stream, it will also register channel for the stream.

Existing tests.

Closes apache#23521 from viirya/SPARK-26604.

Authored-by: Liang-Chi Hsieh <[email protected]>
Signed-off-by: Wenchen Fan <[email protected]>
@vanzin
Copy link
Contributor

vanzin commented Mar 7, 2019

ok to test

@vanzin
Copy link
Contributor

vanzin commented Mar 7, 2019

looks good pending tests

@SparkQA
Copy link

SparkQA commented Mar 8, 2019

Test build #103168 has finished for PR 24013 at commit a1709a6.

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

@vanzin
Copy link
Contributor

vanzin commented Mar 8, 2019

Merging to 2.4.

vanzin pushed a commit that referenced this pull request Mar 8, 2019
…treamManager

## What changes were proposed in this pull request?

This is mostly a clean backport of #23521 to branch-2.4

## How was this patch tested?

I've tested this with a hack in `TransportRequestHandler` to force `ChunkFetchRequest` to get dropped.

Then making a number of `ExternalShuffleClient.fetchChunk` requests (which `OpenBlocks` then `ChunkFetchRequest`) and closing out of my test harness. A heap dump later reveals that the `StreamState` references are unreachable.

I haven't run this through the unit test suite, but doing that now. Wanted to get this up as I think folks are waiting for it for 2.4.1

Closes #24013 from abellina/SPARK-26604_cherry_pick_2_4.

Lead-authored-by: Liang-Chi Hsieh <[email protected]>
Co-authored-by: Alessandro Bellina <[email protected]>
Signed-off-by: Marcelo Vanzin <[email protected]>
@cloud-fan cloud-fan closed this Mar 8, 2019
vanzin pushed a commit that referenced this pull request Mar 8, 2019
…treamManager

## What changes were proposed in this pull request?

This is mostly a clean backport of #23521 to branch-2.4

## How was this patch tested?

I've tested this with a hack in `TransportRequestHandler` to force `ChunkFetchRequest` to get dropped.

Then making a number of `ExternalShuffleClient.fetchChunk` requests (which `OpenBlocks` then `ChunkFetchRequest`) and closing out of my test harness. A heap dump later reveals that the `StreamState` references are unreachable.

I haven't run this through the unit test suite, but doing that now. Wanted to get this up as I think folks are waiting for it for 2.4.1

Closes #24013 from abellina/SPARK-26604_cherry_pick_2_4.

Lead-authored-by: Liang-Chi Hsieh <[email protected]>
Co-authored-by: Alessandro Bellina <[email protected]>
Signed-off-by: Marcelo Vanzin <[email protected]>
(cherry picked from commit 216eeec)
Signed-off-by: Marcelo Vanzin <[email protected]>
@vanzin
Copy link
Contributor

vanzin commented Mar 8, 2019

Merged to 2.3 also after building locally.

kai-chi pushed a commit to kai-chi/spark that referenced this pull request Jul 23, 2019
…treamManager

## What changes were proposed in this pull request?

This is mostly a clean backport of apache#23521 to branch-2.4

## How was this patch tested?

I've tested this with a hack in `TransportRequestHandler` to force `ChunkFetchRequest` to get dropped.

Then making a number of `ExternalShuffleClient.fetchChunk` requests (which `OpenBlocks` then `ChunkFetchRequest`) and closing out of my test harness. A heap dump later reveals that the `StreamState` references are unreachable.

I haven't run this through the unit test suite, but doing that now. Wanted to get this up as I think folks are waiting for it for 2.4.1

Closes apache#24013 from abellina/SPARK-26604_cherry_pick_2_4.

Lead-authored-by: Liang-Chi Hsieh <[email protected]>
Co-authored-by: Alessandro Bellina <[email protected]>
Signed-off-by: Marcelo Vanzin <[email protected]>
kai-chi pushed a commit to kai-chi/spark that referenced this pull request Jul 25, 2019
…treamManager

## What changes were proposed in this pull request?

This is mostly a clean backport of apache#23521 to branch-2.4

## How was this patch tested?

I've tested this with a hack in `TransportRequestHandler` to force `ChunkFetchRequest` to get dropped.

Then making a number of `ExternalShuffleClient.fetchChunk` requests (which `OpenBlocks` then `ChunkFetchRequest`) and closing out of my test harness. A heap dump later reveals that the `StreamState` references are unreachable.

I haven't run this through the unit test suite, but doing that now. Wanted to get this up as I think folks are waiting for it for 2.4.1

Closes apache#24013 from abellina/SPARK-26604_cherry_pick_2_4.

Lead-authored-by: Liang-Chi Hsieh <[email protected]>
Co-authored-by: Alessandro Bellina <[email protected]>
Signed-off-by: Marcelo Vanzin <[email protected]>
kai-chi pushed a commit to kai-chi/spark that referenced this pull request Aug 1, 2019
…treamManager

## What changes were proposed in this pull request?

This is mostly a clean backport of apache#23521 to branch-2.4

## How was this patch tested?

I've tested this with a hack in `TransportRequestHandler` to force `ChunkFetchRequest` to get dropped.

Then making a number of `ExternalShuffleClient.fetchChunk` requests (which `OpenBlocks` then `ChunkFetchRequest`) and closing out of my test harness. A heap dump later reveals that the `StreamState` references are unreachable.

I haven't run this through the unit test suite, but doing that now. Wanted to get this up as I think folks are waiting for it for 2.4.1

Closes apache#24013 from abellina/SPARK-26604_cherry_pick_2_4.

Lead-authored-by: Liang-Chi Hsieh <[email protected]>
Co-authored-by: Alessandro Bellina <[email protected]>
Signed-off-by: Marcelo Vanzin <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants