HeartSaVioR commented on a change in pull request #27064:
[SPARK-30246]OneForOneStreamManager might leak memory in connectionTerminated
URL: https://github.com/apache/spark/pull/27064#discussion_r362468664
##########
File path:
common/network-common/src/main/java/org/apache/spark/network/server/OneForOneStreamManager.java
##########
@@ -117,18 +118,21 @@ public static String genStreamChunkId(long streamId, int
chunkId) {
@Override
public void connectionTerminated(Channel channel) {
+ LinkedList<StreamState> removedStates = new LinkedList<>();
// Close all streams which have been associated with the channel.
for (Map.Entry<Long, StreamState> entry: streams.entrySet()) {
StreamState state = entry.getValue();
if (state.associatedChannel == channel) {
- streams.remove(entry.getKey());
-
- // Release all remaining buffers.
- while (state.buffers.hasNext()) {
- ManagedBuffer buffer = state.buffers.next();
- if (buffer != null) {
- buffer.release();
- }
+ removedStates.add(streams.remove(entry.getKey()));
+ }
+ }
+
+ for (StreamState state: removedStates) {
+ // Release all remaining buffers.
Review comment:
What I actually suggested was like:
```
for (StreamState state: removedStates) {
try {
while (state.buffers.hasNext()) {
ManagedBuffer buffer = state.buffers.next();
if (buffer != null) {
buffer.release();
}
}
} catch {
case NonFatal(e) => logError("...proper log message with e...")
}
}
```
instead of looping with hasNext() & next() even there's exception.
But looks like it also makes sense if and only if state.buffers.hasNext()
would throw exception if state.buffers.next() throws exception. Then we can
determine when to give up iterating.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
