Skip to content

Fix direct memory leaks #1019

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
wants to merge 2 commits into from
Closed

Fix direct memory leaks #1019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cabd1cd
Fix direct memory leaks in Doppler client
nictas Nov 14, 2019
a106975
Fix direct memory leaks when cancelling operations
nictas Nov 14, 2019
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
17 changes: 16 additions & 1 deletion ...foundry-client-reactor/src/main/java/org/cloudfoundry/reactor/doppler/MultipartCodec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,26 @@

package org.cloudfoundry.reactor.doppler;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import io.netty.buffer.Unpooled;
import io.netty.handler.codec.DelimiterBasedFrameDecoder;
import io.netty.handler.codec.http.HttpHeaderNames;
import reactor.core.publisher.Flux;
import reactor.netty.ByteBufFlux;
import reactor.netty.http.client.HttpClientResponse;

import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.Charset;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

final class MultipartCodec {

private static final Logger LOGGER = LoggerFactory.getLogger(MultipartCodec.class);

private static final Pattern BOUNDARY_PATTERN = Pattern.compile("multipart/.+; boundary=(.*)");

private static final int MAX_PAYLOAD_SIZE = 1024 * 1024;
Expand All @@ -49,7 +55,8 @@ static DelimiterBasedFrameDecoder createDecoder(HttpClientResponse response) {

static Flux<InputStream> decode(ByteBufFlux body) {
return body.asInputStream()
.skip(1);
.skip(1)
.doOnDiscard(InputStream.class, MultipartCodec::close);
}

private static String extractMultipartBoundary(HttpClientResponse response) {
Expand All @@ -63,4 +70,12 @@ private static String extractMultipartBoundary(HttpClientResponse response) {
}
}

private static void close(InputStream in) {
try {
in.close();
} catch (IOException e) {
LOGGER.warn("Could not close input stream. This will cause a direct memory leak.", e);
}
}

}
4 changes: 2 additions & 2 deletions cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/util/Operator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ public <T> Flux<T> parseBodyToFlux(Function<HttpClientResponseWithBody, Publishe
ByteBufFlux body = connection.inbound().receive();

return processResponse(response, body).flatMapMany(responseTransformer)
.doOnTerminate(connection::dispose);
.doFinally(signalType -> connection.dispose());
});
}

Expand Down Expand Up @@ -251,7 +251,7 @@ private Publisher<InputStream> handleWebsocketCommunication(WebsocketInbound inb
return inbound.aggregateFrames()
.receive()
.asInputStream()
.doOnTerminate(outbound::sendClose);
.doFinally(signalType -> outbound.sendClose());
}

}
Expand Down