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

InternalStreamConnection must release buffers obtained via ByteBufferBsonOutput.getByteBuffers #1160

Merged
merged 4 commits into from
Jul 27, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
6 changes: 4 additions & 2 deletions driver-core/src/main/com/mongodb/connection/Stream.java
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ public interface Stream extends BufferProvider{
/**
* Write each buffer in the list to the stream in order, blocking until all are completely written.
*
* @param buffers the buffers to write
* @param buffers the buffers to write. The operation must not {@linkplain ByteBuf#release() release} any buffer from {@code buffers},
* unless it also {@linkplain ByteBuf#retain() retained} it, and releasing is meant to compensate for that.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a breaking change, right? If a third party had written something like NettyStream, it would now be broken with the change to InternalStreamConnection.

I have never heard of anyone actually writing their own Stream implementation, so it's not likely to affect anyone in practice, but it should at least make the release notes.

Copy link
Member Author

@stIncMale stIncMale Jul 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!💡 I was thinking that I'll need to update #1154 if/when this is merged and the changes in #1154 are rebased on top of the new master, but it didn't occur to me that users may be in a similar situation.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is ok even in a minor release. Just mark the JAVA ticket as Docs Changed Needed so we get something in the release notes.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I documented the required doc change in the "Documentation Changes Summary" in https://jira.mongodb.org/browse/DOCSP-31709.

* @throws IOException if there are problems writing to the stream
*/
void write(List<ByteBuf> buffers) throws IOException;
Expand Down Expand Up @@ -100,7 +101,8 @@ default ByteBuf read(int numBytes, int additionalTimeout) throws IOException {
* Write each buffer in the list to the stream in order, asynchronously. This method should return immediately, and invoke the given
* callback on completion.
*
* @param buffers the buffers to write
* @param buffers the buffers to write. The operation must not {@linkplain ByteBuf#release() release} any buffer from {@code buffers},
* unless it also {@linkplain ByteBuf#retain() retained} it, and releasing is meant to compensate for that.
* @param handler invoked when the write operation has completed
*/
void writeAsync(List<ByteBuf> buffers, AsyncCompletionHandler<Void> handler);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,12 @@ public ByteBuf read(final int numBytes, final int additionalTimeoutMillis) throw
public void writeAsync(final List<ByteBuf> buffers, final AsyncCompletionHandler<Void> handler) {
CompositeByteBuf composite = PooledByteBufAllocator.DEFAULT.compositeBuffer();
for (ByteBuf cur : buffers) {
composite.addComponent(true, ((NettyByteBuf) cur).asByteBuf());
// The Netty framework releases `CompositeByteBuf` after writing
// (see https://netty.io/wiki/reference-counted-objects.html#outbound-messages),
// which results in the buffer we pass to `CompositeByteBuf.addComponent` being released.
// However, `CompositeByteBuf.addComponent` does not retain this buffer,
// which means we must retain it to conform to the `Stream.writeAsync` contract.
composite.addComponent(true, ((NettyByteBuf) cur).asByteBuf().retain());
}

channel.writeAndFlush(composite).addListener((ChannelFutureListener) future -> {
Expand Down
36 changes: 36 additions & 0 deletions driver-core/src/main/com/mongodb/internal/ResourceUtil.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*
* Copyright 2008-present MongoDB, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.mongodb.internal;

import org.bson.ByteBuf;

/**
* <p>This class is not part of the public API and may be removed or changed at any time</p>
*/
public final class ResourceUtil {
public static void release(final Iterable<? extends ByteBuf> buffers) {
// we assume `ByteBuf::release` does not complete abruptly
buffers.forEach(buffer -> {
if (buffer != null) {
buffer.release();
}
});
}

private ResourceUtil() {
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
import com.mongodb.connection.Stream;
import com.mongodb.connection.StreamFactory;
import com.mongodb.event.CommandListener;
import com.mongodb.internal.ResourceUtil;
import com.mongodb.internal.VisibleForTesting;
import com.mongodb.internal.async.SingleResultCallback;
import com.mongodb.internal.diagnostics.logging.Logger;
Expand Down Expand Up @@ -412,26 +413,30 @@ private void sendCommandMessage(final CommandMessage message,

Compressor localSendCompressor = sendCompressor;
if (localSendCompressor == null || SECURITY_SENSITIVE_COMMANDS.contains(message.getCommandDocument(bsonOutput).getFirstKey())) {
List<ByteBuf> byteBuffers = bsonOutput.getByteBuffers();
try {
sendMessage(bsonOutput.getByteBuffers(), message.getId());
sendMessage(byteBuffers, message.getId());
} finally {
ResourceUtil.release(byteBuffers);
bsonOutput.close();
}
} else {
List<ByteBuf> byteBuffers = bsonOutput.getByteBuffers();
ByteBufferBsonOutput compressedBsonOutput;
List<ByteBuf> byteBuffers = bsonOutput.getByteBuffers();
try {
CompressedMessage compressedMessage = new CompressedMessage(message.getOpCode(), byteBuffers, localSendCompressor,
getMessageSettings(description));
compressedBsonOutput = new ByteBufferBsonOutput(this);
compressedMessage.encode(compressedBsonOutput, sessionContext);
} finally {
jyemin marked this conversation as resolved.
Show resolved Hide resolved
releaseAllBuffers(byteBuffers);
ResourceUtil.release(byteBuffers);
bsonOutput.close();
}
List<ByteBuf> compressedByteBuffers = compressedBsonOutput.getByteBuffers();
try {
sendMessage(compressedBsonOutput.getByteBuffers(), message.getId());
sendMessage(compressedByteBuffers, message.getId());
} finally {
ResourceUtil.release(compressedByteBuffers);
compressedBsonOutput.close();
}
}
Expand Down Expand Up @@ -497,7 +502,7 @@ public <T> void sendAndReceiveAsync(final CommandMessage message, final Decoder<
getMessageSettings(description));
compressedMessage.encode(compressedBsonOutput, sessionContext);
} finally {
releaseAllBuffers(byteBuffers);
ResourceUtil.release(byteBuffers);
bsonOutput.close();
}
sendCommandMessageAsync(message.getId(), decoder, sessionContext, callback, compressedBsonOutput, commandEventSender,
Expand All @@ -510,16 +515,12 @@ public <T> void sendAndReceiveAsync(final CommandMessage message, final Decoder<
}
}

private void releaseAllBuffers(final List<ByteBuf> byteBuffers) {
for (ByteBuf cur : byteBuffers) {
cur.release();
}
}

private <T> void sendCommandMessageAsync(final int messageId, final Decoder<T> decoder, final SessionContext sessionContext,
final SingleResultCallback<T> callback, final ByteBufferBsonOutput bsonOutput,
final CommandEventSender commandEventSender, final boolean responseExpected) {
sendMessageAsync(bsonOutput.getByteBuffers(), messageId, (result, t) -> {
List<ByteBuf> byteBuffers = bsonOutput.getByteBuffers();
sendMessageAsync(byteBuffers, messageId, (result, t) -> {
ResourceUtil.release(byteBuffers);
bsonOutput.close();
if (t != null) {
commandEventSender.sendFailedEvent(t);
Expand Down