Skip to content

[SPARK-7183][Network] Fix memory leak of TransportRequestHandler.streamIds #5743

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

Closed
viirya wants to merge 8 commits into from
Closed

[SPARK-7183][Network] Fix memory leak of TransportRequestHandler.streamIds #5743

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3b3f38a
Fix memory leak of TransportRequestHandler.streamIds.
viirya Apr 28, 2015
37a4b6c
Remove streamIds from TransportRequestHandler.
viirya Apr 29, 2015
17f020f
Remove unused import.
viirya Apr 29, 2015
45908b7
for style.
viirya Apr 29, 2015
f9a0c37
Merge remote-tracking branch 'upstream/master' into fix_requesthandle…
viirya May 1, 2015
d35f19a
For comments.
viirya May 1, 2015
97e205c
Remove unused import.
viirya May 1, 2015
cf2c086
For comments.
viirya May 1, 2015
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
Prev Previous commit
For comments.
  • Loading branch information
@viirya
viirya committed May 1, 2015
commit cf2c086cd7dcdb0f047dd1eca73e1708d812f25a
5 changes: 2 additions & 3 deletions network/common/src/main/java/org/apache/spark/network/server/OneForOneStreamManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public class OneForOneStreamManager extends StreamManager {
private final Logger logger = LoggerFactory.getLogger(OneForOneStreamManager.class);

private final AtomicLong nextStreamId;
private final Map<Long, StreamState> streams;
private final ConcurrentHashMap<Long, StreamState> streams;

/** State of a single stream. */
private static class StreamState {
Expand All @@ -54,8 +54,7 @@ private static class StreamState {
int curChunk = 0;

StreamState(Iterator<ManagedBuffer> buffers) {
Preconditions.checkNotNull(buffers);
this.buffers = buffers;
this.buffers = Preconditions.checkNotNull(buffers);
}
}

Expand Down
4 changes: 1 addition & 3 deletions network/common/src/main/java/org/apache/spark/network/server/TransportRequestHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ public void exceptionCaught(Throwable cause) {

@Override
public void channelUnregistered() {
// Inform the StreamManager that this channel is unregistered.
streamManager.connectionTerminated(channel);
rpcHandler.connectionTerminated(reverseClient);
}
Expand All @@ -94,12 +93,11 @@ public void handle(RequestMessage request) {
private void processFetchRequest(final ChunkFetchRequest req) {
final String client = NettyUtils.getRemoteAddress(channel);

streamManager.registerChannel(channel, req.streamChunkId.streamId);

logger.trace("Received req from {} to fetch block {}", client, req.streamChunkId);

ManagedBuffer buf;
try {
streamManager.registerChannel(channel, req.streamChunkId.streamId);
buf = streamManager.getChunk(req.streamChunkId.streamId, req.streamChunkId.chunkIndex);
} catch (Exception e) {
logger.error(String.format(
Expand Down