Skip to content

RATIS-1847. Stream has memory leak.#884

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

Merged
szetszwo merged 2 commits into from
Jun 19, 2023
Merged

RATIS-1847. Stream has memory leak. #884

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
e07f3c3
RATIS-1847. Stream has memory leak.
szetszwo Jun 7, 2023
8264d6b
Remove unused import.
szetszwo Jun 7, 2023
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
30 changes: 17 additions & 13 deletions ratis-netty/src/main/java/org/apache/ratis/netty/server/DataStreamManagement.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -96,6 +96,10 @@ CompletableFuture<Long> write(ByteBuf buf, Iterable<WriteOption> options,
n -> streamFuture.thenCompose(stream -> writeToAsync(buf, options, stream, executor)
.whenComplete((l, e) -> metrics.stop(context, e == null))));
}

void cleanUp() {
streamFuture.thenAccept(DataStream::cleanUp);
}
Comment thread
szetszwo marked this conversation as resolved.
}

static class RemoteStream {
Expand DownExpand Up@@ -374,31 +378,33 @@ static void sendDataStreamException(Throwable throwable, DataStreamRequestByteBu
ctx.writeAndFlush(newDataStreamReplyByteBuffer(request, reply));
} catch (Throwable t) {
LOG.warn("Failed to sendDataStreamException {} for {}", throwable, request, t);
} finally {
request.release();
}
}

void read(DataStreamRequestByteBuf request, ChannelHandlerContext ctx,
CheckedBiFunction<RaftClientRequest, Set<RaftPeer>, Set<DataStreamOutputRpc>, IOException> getStreams) {
LOG.debug("{}: read {}", this, request);
final ByteBuf buf = request.slice();
try {
readImpl(request, ctx, buf, getStreams);
readImpl(request, ctx, getStreams);
} catch (Throwable t) {
replyDataStreamException(t, request, ctx);
buf.release();
}
}

private void readImpl(DataStreamRequestByteBuf request, ChannelHandlerContext ctx, ByteBuf buf,
private void readImpl(DataStreamRequestByteBuf request, ChannelHandlerContext ctx,
CheckedBiFunction<RaftClientRequest, Set<RaftPeer>, Set<DataStreamOutputRpc>, IOException> getStreams) {
final boolean close = request.getWriteOptionList().contains(StandardWriteOption.CLOSE);
ClientInvocationId key = ClientInvocationId.valueOf(request.getClientId(), request.getStreamId());
final StreamInfo info;
if (request.getType() == Type.STREAM_HEADER) {
final MemoizedSupplier<StreamInfo> supplier = JavaUtils.memoize(() -> newStreamInfo(buf, getStreams));
final MemoizedSupplier<StreamInfo> supplier = JavaUtils.memoize(
() -> newStreamInfo(request.slice(), getStreams));
info = streams.computeIfAbsent(key, id -> supplier.get());
if (!supplier.isInitialized()) {
streams.remove(key);
final StreamInfo removed = streams.remove(key);
removed.getLocal().cleanUp();
throw new IllegalStateException("Failed to create a new stream for " + request
+ " since a stream already exists Key: " + key + " StreamInfo:" + info);
}
Expand All@@ -408,10 +414,7 @@ private void readImpl(DataStreamRequestByteBuf request, ChannelHandlerContext ct
() -> new IllegalStateException("Failed to remove StreamInfo for " + request));
} else {
info = Optional.ofNullable(streams.get(key)).orElseThrow(
() -> {
streams.remove(key);
return new IllegalStateException("Failed to get StreamInfo for " + request);
});
() -> new IllegalStateException("Failed to get StreamInfo for " + request));
}

final CompletableFuture<Long> localWrite;
Expand All@@ -420,7 +423,7 @@ private void readImpl(DataStreamRequestByteBuf request, ChannelHandlerContext ct
localWrite = CompletableFuture.completedFuture(0L);
remoteWrites = Collections.emptyList();
} else if (request.getType() == Type.STREAM_DATA) {
localWrite = info.getLocal().write(buf, request.getWriteOptionList(), writeExecutor);
localWrite = info.getLocal().write(request.slice(), request.getWriteOptionList(), writeExecutor);
remoteWrites = info.applyToRemotes(out -> out.write(request, requestExecutor));
} else {
throw new IllegalStateException(this + ": Unexpected type " + request.getType() + ", request=" + request);
Expand All@@ -439,11 +442,12 @@ private void readImpl(DataStreamRequestByteBuf request, ChannelHandlerContext ct
}, requestExecutor)).whenComplete((v, exception) -> {
try {
if (exception != null) {
streams.remove(key);
final StreamInfo removed = streams.remove(key);
replyDataStreamException(server, exception, info.getRequest(), request, ctx);
removed.getLocal().cleanUp();
}
} finally {
buf.release();
request.release();
}
});
}
Expand Down
22 changes: 18 additions & 4 deletions ratis-netty/src/main/java/org/apache/ratis/netty/server/DataStreamRequestByteBuf.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,20 +30,22 @@

import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicReference;

/**
* Implements {@link DataStreamRequest} with {@link ByteBuf}.
* <p>
* This class is immutable.
*/
public class DataStreamRequestByteBuf extends DataStreamPacketImpl implements DataStreamRequest {
private final ByteBuf buf;
private final AtomicReference<ByteBuf> buf;
private final List<WriteOption> options;

public DataStreamRequestByteBuf(ClientId clientId, Type type, long streamId, long streamOffset,
Iterable<WriteOption> options, ByteBuf buf) {
super(clientId, type, streamId, streamOffset);
this.buf = buf != null? buf.asReadOnly(): Unpooled.EMPTY_BUFFER;
this.buf = new AtomicReference<>(buf != null? buf.asReadOnly(): Unpooled.EMPTY_BUFFER);
this.options = Collections.unmodifiableList(Lists.newArrayList(options));
}

Expand All@@ -52,13 +54,25 @@ public DataStreamRequestByteBuf(DataStreamRequestHeader header, ByteBuf buf) {
header.getWriteOptionList(), buf);
}

ByteBuf getBuf() {
return Optional.ofNullable(buf.get()).orElseThrow(
() -> new IllegalStateException("buf is already released in " + this));
}

@Override
public long getDataLength() {
return buf.readableBytes();
return getBuf().readableBytes();
}

public ByteBuf slice() {
return buf.slice();
return getBuf().slice();
}

public void release() {
final ByteBuf got = buf.getAndSet(null);
if (got != null) {
got.release();
}
}

@Override
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
RATIS-1847. Stream has memory leak. by szetszwo · Pull Request #884 · apache/ratis · GitHub
Skip to content
RATIS-1847. Stream has memory leak.#884

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

 Merged

szetszwo
merged 2 commits into

from

Jun 19, 2023
 Merged


RATIS-1847. Stream has memory leak.
#884
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
e07f3c3

RATIS-1847. Stream has memory leak.


szetszwo Jun 7, 2023
8264d6b

Remove unused import.


szetszwo Jun 7, 2023

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


30 changes: 17 additions & 13 deletions
ratis-netty/src/main/java/org/apache/ratis/netty/server/DataStreamManagement.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,6 +96,10 @@ CompletableFuture<Long> write(ByteBuf buf, Iterable<WriteOption> options,
 n -> streamFuture.thenCompose(stream -> writeToAsync(buf, options, stream, executor)
 .whenComplete((l, e) -> metrics.stop(context, e == null))));
 }

 void cleanUp() {
 streamFuture.thenAccept(DataStream::cleanUp);
 }
Comment thread
szetszwo marked this conversation as resolved.

 }

 static class RemoteStream {
Expand DownExpand Up@@ -374,31 +378,33 @@ static void sendDataStreamException(Throwable throwable, DataStreamRequestByteBu
 ctx.writeAndFlush(newDataStreamReplyByteBuffer(request, reply));
 } catch (Throwable t) {
 LOG.warn("Failed to sendDataStreamException {} for {}", throwable, request, t);
 } finally {
 request.release();
 }
 }

 void read(DataStreamRequestByteBuf request, ChannelHandlerContext ctx,
 CheckedBiFunction<RaftClientRequest, Set<RaftPeer>, Set<DataStreamOutputRpc>, IOException> getStreams) {
 LOG.debug("{}: read {}", this, request);
 final ByteBuf buf = request.slice();
 try {
 readImpl(request, ctx, buf, getStreams);
 readImpl(request, ctx, getStreams);
 } catch (Throwable t) {
 replyDataStreamException(t, request, ctx);
 buf.release();
 }
 }

 private void readImpl(DataStreamRequestByteBuf request, ChannelHandlerContext ctx, ByteBuf buf,
 private void readImpl(DataStreamRequestByteBuf request, ChannelHandlerContext ctx,
 CheckedBiFunction<RaftClientRequest, Set<RaftPeer>, Set<DataStreamOutputRpc>, IOException> getStreams) {
 final boolean close = request.getWriteOptionList().contains(StandardWriteOption.CLOSE);
 ClientInvocationId key = ClientInvocationId.valueOf(request.getClientId(), request.getStreamId());
 final StreamInfo info;
 if (request.getType() == Type.STREAM_HEADER) {
 final MemoizedSupplier<StreamInfo> supplier = JavaUtils.memoize(() -> newStreamInfo(buf, getStreams));
 final MemoizedSupplier<StreamInfo> supplier = JavaUtils.memoize(
 () -> newStreamInfo(request.slice(), getStreams));
 info = streams.computeIfAbsent(key, id -> supplier.get());
 if (!supplier.isInitialized()) {
 streams.remove(key);
 final StreamInfo removed = streams.remove(key);
 removed.getLocal().cleanUp();
 throw new IllegalStateException("Failed to create a new stream for " + request
 + " since a stream already exists Key: " + key + " StreamInfo:" + info);
 }
Expand All@@ -408,10 +414,7 @@ private void readImpl(DataStreamRequestByteBuf request, ChannelHandlerContext ct
 () -> new IllegalStateException("Failed to remove StreamInfo for " + request));
 } else {
 info = Optional.ofNullable(streams.get(key)).orElseThrow(
 () -> {
 streams.remove(key);
 return new IllegalStateException("Failed to get StreamInfo for " + request);
 });
 () -> new IllegalStateException("Failed to get StreamInfo for " + request));
 }

 final CompletableFuture<Long> localWrite;
Expand All@@ -420,7 +423,7 @@ private void readImpl(DataStreamRequestByteBuf request, ChannelHandlerContext ct
 localWrite = CompletableFuture.completedFuture(0L);
 remoteWrites = Collections.emptyList();
 } else if (request.getType() == Type.STREAM_DATA) {
 localWrite = info.getLocal().write(buf, request.getWriteOptionList(), writeExecutor);
 localWrite = info.getLocal().write(request.slice(), request.getWriteOptionList(), writeExecutor);
 remoteWrites = info.applyToRemotes(out -> out.write(request, requestExecutor));
 } else {
 throw new IllegalStateException(this + ": Unexpected type " + request.getType() + ", request=" + request);
Expand All@@ -439,11 +442,12 @@ private void readImpl(DataStreamRequestByteBuf request, ChannelHandlerContext ct
 }, requestExecutor)).whenComplete((v, exception) -> {
 try {
 if (exception != null) {
 streams.remove(key);
final StreamInfo removed = streams.remove(key);
 replyDataStreamException(server, exception, info.getRequest(), request, ctx);
 removed.getLocal().cleanUp();
 }
 } finally {
buf.release();
request.release();
 }
 });
 }
Expand Down

22 changes: 18 additions & 4 deletions
ratis-netty/src/main/java/org/apache/ratis/netty/server/DataStreamRequestByteBuf.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,20 +30,22 @@

import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicReference;

/**
 * Implements {@link DataStreamRequest} with {@link ByteBuf}.
 * <p>
 * This class is immutable.
 */
public class DataStreamRequestByteBuf extends DataStreamPacketImpl implements DataStreamRequest {
 private final ByteBuf buf;
 private final AtomicReference<ByteBuf> buf;
 private final List<WriteOption> options;

 public DataStreamRequestByteBuf(ClientId clientId, Type type, long streamId, long streamOffset,
 Iterable<WriteOption> options, ByteBuf buf) {
 super(clientId, type, streamId, streamOffset);
 this.buf = buf != null? buf.asReadOnly(): Unpooled.EMPTY_BUFFER;
 this.buf = new AtomicReference<>(buf != null? buf.asReadOnly(): Unpooled.EMPTY_BUFFER);
 this.options = Collections.unmodifiableList(Lists.newArrayList(options));
 }

Expand All@@ -52,13 +54,25 @@ public DataStreamRequestByteBuf(DataStreamRequestHeader header, ByteBuf buf) {
 header.getWriteOptionList(), buf);
 }

 ByteBuf getBuf() {
 return Optional.ofNullable(buf.get()).orElseThrow(
 () -> new IllegalStateException("buf is already released in " + this));
 }

 @Override
 public long getDataLength() {
 return buf.readableBytes();
 return getBuf().readableBytes();
 }

 public ByteBuf slice() {
 return buf.slice();
 return getBuf().slice();
 }

 public void release() {
 final ByteBuf got = buf.getAndSet(null);
 if (got != null) {
 got.release();
 }
 }

 @Override
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
RATIS-1847. Stream has memory leak. by szetszwo · Pull Request #884 · apache/ratis · GitHub
Skip to content
RATIS-1847. Stream has memory leak.#884

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

 Merged

szetszwo
merged 2 commits into

from

Jun 19, 2023
 Merged


RATIS-1847. Stream has memory leak.
#884
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
e07f3c3

RATIS-1847. Stream has memory leak.


szetszwo Jun 7, 2023
8264d6b

Remove unused import.


szetszwo Jun 7, 2023

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


30 changes: 17 additions & 13 deletions
ratis-netty/src/main/java/org/apache/ratis/netty/server/DataStreamManagement.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,6 +96,10 @@ CompletableFuture<Long> write(ByteBuf buf, Iterable<WriteOption> options,
 n -> streamFuture.thenCompose(stream -> writeToAsync(buf, options, stream, executor)
 .whenComplete((l, e) -> metrics.stop(context, e == null))));
 }

 void cleanUp() {
 streamFuture.thenAccept(DataStream::cleanUp);
 }
Comment thread
szetszwo marked this conversation as resolved.

 }

 static class RemoteStream {
Expand DownExpand Up@@ -374,31 +378,33 @@ static void sendDataStreamException(Throwable throwable, DataStreamRequestByteBu
 ctx.writeAndFlush(newDataStreamReplyByteBuffer(request, reply));
 } catch (Throwable t) {
 LOG.warn("Failed to sendDataStreamException {} for {}", throwable, request, t);
 } finally {
 request.release();
 }
 }

 void read(DataStreamRequestByteBuf request, ChannelHandlerContext ctx,
 CheckedBiFunction<RaftClientRequest, Set<RaftPeer>, Set<DataStreamOutputRpc>, IOException> getStreams) {
 LOG.debug("{}: read {}", this, request);
 final ByteBuf buf = request.slice();
 try {
 readImpl(request, ctx, buf, getStreams);
 readImpl(request, ctx, getStreams);
 } catch (Throwable t) {
 replyDataStreamException(t, request, ctx);
 buf.release();
 }
 }

 private void readImpl(DataStreamRequestByteBuf request, ChannelHandlerContext ctx, ByteBuf buf,
 private void readImpl(DataStreamRequestByteBuf request, ChannelHandlerContext ctx,
 CheckedBiFunction<RaftClientRequest, Set<RaftPeer>, Set<DataStreamOutputRpc>, IOException> getStreams) {
 final boolean close = request.getWriteOptionList().contains(StandardWriteOption.CLOSE);
 ClientInvocationId key = ClientInvocationId.valueOf(request.getClientId(), request.getStreamId());
 final StreamInfo info;
 if (request.getType() == Type.STREAM_HEADER) {
 final MemoizedSupplier<StreamInfo> supplier = JavaUtils.memoize(() -> newStreamInfo(buf, getStreams));
 final MemoizedSupplier<StreamInfo> supplier = JavaUtils.memoize(
 () -> newStreamInfo(request.slice(), getStreams));
 info = streams.computeIfAbsent(key, id -> supplier.get());
 if (!supplier.isInitialized()) {
 streams.remove(key);
 final StreamInfo removed = streams.remove(key);
 removed.getLocal().cleanUp();
 throw new IllegalStateException("Failed to create a new stream for " + request
 + " since a stream already exists Key: " + key + " StreamInfo:" + info);
 }
Expand All@@ -408,10 +414,7 @@ private void readImpl(DataStreamRequestByteBuf request, ChannelHandlerContext ct
 () -> new IllegalStateException("Failed to remove StreamInfo for " + request));
 } else {
 info = Optional.ofNullable(streams.get(key)).orElseThrow(
 () -> {
 streams.remove(key);
 return new IllegalStateException("Failed to get StreamInfo for " + request);
 });
 () -> new IllegalStateException("Failed to get StreamInfo for " + request));
 }

 final CompletableFuture<Long> localWrite;
Expand All@@ -420,7 +423,7 @@ private void readImpl(DataStreamRequestByteBuf request, ChannelHandlerContext ct
 localWrite = CompletableFuture.completedFuture(0L);
 remoteWrites = Collections.emptyList();
 } else if (request.getType() == Type.STREAM_DATA) {
 localWrite = info.getLocal().write(buf, request.getWriteOptionList(), writeExecutor);
 localWrite = info.getLocal().write(request.slice(), request.getWriteOptionList(), writeExecutor);
 remoteWrites = info.applyToRemotes(out -> out.write(request, requestExecutor));
 } else {
 throw new IllegalStateException(this + ": Unexpected type " + request.getType() + ", request=" + request);
Expand All@@ -439,11 +442,12 @@ private void readImpl(DataStreamRequestByteBuf request, ChannelHandlerContext ct
 }, requestExecutor)).whenComplete((v, exception) -> {
 try {
 if (exception != null) {
 streams.remove(key);
final StreamInfo removed = streams.remove(key);
 replyDataStreamException(server, exception, info.getRequest(), request, ctx);
 removed.getLocal().cleanUp();
 }
 } finally {
buf.release();
request.release();
 }
 });
 }
Expand Down

22 changes: 18 additions & 4 deletions
ratis-netty/src/main/java/org/apache/ratis/netty/server/DataStreamRequestByteBuf.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,20 +30,22 @@

import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicReference;

/**
 * Implements {@link DataStreamRequest} with {@link ByteBuf}.
 * <p>
 * This class is immutable.
 */
public class DataStreamRequestByteBuf extends DataStreamPacketImpl implements DataStreamRequest {
 private final ByteBuf buf;
 private final AtomicReference<ByteBuf> buf;
 private final List<WriteOption> options;

 public DataStreamRequestByteBuf(ClientId clientId, Type type, long streamId, long streamOffset,
 Iterable<WriteOption> options, ByteBuf buf) {
 super(clientId, type, streamId, streamOffset);
 this.buf = buf != null? buf.asReadOnly(): Unpooled.EMPTY_BUFFER;
 this.buf = new AtomicReference<>(buf != null? buf.asReadOnly(): Unpooled.EMPTY_BUFFER);
 this.options = Collections.unmodifiableList(Lists.newArrayList(options));
 }

Expand All@@ -52,13 +54,25 @@ public DataStreamRequestByteBuf(DataStreamRequestHeader header, ByteBuf buf) {
 header.getWriteOptionList(), buf);
 }

 ByteBuf getBuf() {
 return Optional.ofNullable(buf.get()).orElseThrow(
 () -> new IllegalStateException("buf is already released in " + this));
 }

 @Override
 public long getDataLength() {
 return buf.readableBytes();
 return getBuf().readableBytes();
 }

 public ByteBuf slice() {
 return buf.slice();
 return getBuf().slice();
 }

 public void release() {
 final ByteBuf got = buf.getAndSet(null);
 if (got != null) {
 got.release();
 }
 }

 @Override
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
RATIS-1847. Stream has memory leak. by szetszwo · Pull Request #884 · apache/ratis · GitHub
Skip to content
RATIS-1847. Stream has memory leak.#884

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

 Merged

szetszwo
merged 2 commits into

from

Jun 19, 2023
 Merged


RATIS-1847. Stream has memory leak.
#884
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
e07f3c3

RATIS-1847. Stream has memory leak.


szetszwo Jun 7, 2023
8264d6b

Remove unused import.


szetszwo Jun 7, 2023

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


30 changes: 17 additions & 13 deletions
ratis-netty/src/main/java/org/apache/ratis/netty/server/DataStreamManagement.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,6 +96,10 @@ CompletableFuture<Long> write(ByteBuf buf, Iterable<WriteOption> options,
 n -> streamFuture.thenCompose(stream -> writeToAsync(buf, options, stream, executor)
 .whenComplete((l, e) -> metrics.stop(context, e == null))));
 }

 void cleanUp() {
 streamFuture.thenAccept(DataStream::cleanUp);
 }
Comment thread
szetszwo marked this conversation as resolved.

 }

 static class RemoteStream {
Expand DownExpand Up@@ -374,31 +378,33 @@ static void sendDataStreamException(Throwable throwable, DataStreamRequestByteBu
 ctx.writeAndFlush(newDataStreamReplyByteBuffer(request, reply));
 } catch (Throwable t) {
 LOG.warn("Failed to sendDataStreamException {} for {}", throwable, request, t);
 } finally {
 request.release();
 }
 }

 void read(DataStreamRequestByteBuf request, ChannelHandlerContext ctx,
 CheckedBiFunction<RaftClientRequest, Set<RaftPeer>, Set<DataStreamOutputRpc>, IOException> getStreams) {
 LOG.debug("{}: read {}", this, request);
 final ByteBuf buf = request.slice();
 try {
 readImpl(request, ctx, buf, getStreams);
 readImpl(request, ctx, getStreams);
 } catch (Throwable t) {
 replyDataStreamException(t, request, ctx);
 buf.release();
 }
 }

 private void readImpl(DataStreamRequestByteBuf request, ChannelHandlerContext ctx, ByteBuf buf,
 private void readImpl(DataStreamRequestByteBuf request, ChannelHandlerContext ctx,
 CheckedBiFunction<RaftClientRequest, Set<RaftPeer>, Set<DataStreamOutputRpc>, IOException> getStreams) {
 final boolean close = request.getWriteOptionList().contains(StandardWriteOption.CLOSE);
 ClientInvocationId key = ClientInvocationId.valueOf(request.getClientId(), request.getStreamId());
 final StreamInfo info;
 if (request.getType() == Type.STREAM_HEADER) {
 final MemoizedSupplier<StreamInfo> supplier = JavaUtils.memoize(() -> newStreamInfo(buf, getStreams));
 final MemoizedSupplier<StreamInfo> supplier = JavaUtils.memoize(
 () -> newStreamInfo(request.slice(), getStreams));
 info = streams.computeIfAbsent(key, id -> supplier.get());
 if (!supplier.isInitialized()) {
 streams.remove(key);
 final StreamInfo removed = streams.remove(key);
 removed.getLocal().cleanUp();
 throw new IllegalStateException("Failed to create a new stream for " + request
 + " since a stream already exists Key: " + key + " StreamInfo:" + info);
 }
Expand All@@ -408,10 +414,7 @@ private void readImpl(DataStreamRequestByteBuf request, ChannelHandlerContext ct
 () -> new IllegalStateException("Failed to remove StreamInfo for " + request));
 } else {
 info = Optional.ofNullable(streams.get(key)).orElseThrow(
 () -> {
 streams.remove(key);
 return new IllegalStateException("Failed to get StreamInfo for " + request);
 });
 () -> new IllegalStateException("Failed to get StreamInfo for " + request));
 }

 final CompletableFuture<Long> localWrite;
Expand All@@ -420,7 +423,7 @@ private void readImpl(DataStreamRequestByteBuf request, ChannelHandlerContext ct
 localWrite = CompletableFuture.completedFuture(0L);
 remoteWrites = Collections.emptyList();
 } else if (request.getType() == Type.STREAM_DATA) {
 localWrite = info.getLocal().write(buf, request.getWriteOptionList(), writeExecutor);
 localWrite = info.getLocal().write(request.slice(), request.getWriteOptionList(), writeExecutor);
 remoteWrites = info.applyToRemotes(out -> out.write(request, requestExecutor));
 } else {
 throw new IllegalStateException(this + ": Unexpected type " + request.getType() + ", request=" + request);
Expand All@@ -439,11 +442,12 @@ private void readImpl(DataStreamRequestByteBuf request, ChannelHandlerContext ct
 }, requestExecutor)).whenComplete((v, exception) -> {
 try {
 if (exception != null) {
 streams.remove(key);
final StreamInfo removed = streams.remove(key);
 replyDataStreamException(server, exception, info.getRequest(), request, ctx);
 removed.getLocal().cleanUp();
 }
 } finally {
buf.release();
request.release();
 }
 });
 }
Expand Down

22 changes: 18 additions & 4 deletions
ratis-netty/src/main/java/org/apache/ratis/netty/server/DataStreamRequestByteBuf.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,20 +30,22 @@

import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicReference;

/**
 * Implements {@link DataStreamRequest} with {@link ByteBuf}.
 * <p>
 * This class is immutable.
 */
public class DataStreamRequestByteBuf extends DataStreamPacketImpl implements DataStreamRequest {
 private final ByteBuf buf;
 private final AtomicReference<ByteBuf> buf;
 private final List<WriteOption> options;

 public DataStreamRequestByteBuf(ClientId clientId, Type type, long streamId, long streamOffset,
 Iterable<WriteOption> options, ByteBuf buf) {
 super(clientId, type, streamId, streamOffset);
 this.buf = buf != null? buf.asReadOnly(): Unpooled.EMPTY_BUFFER;
 this.buf = new AtomicReference<>(buf != null? buf.asReadOnly(): Unpooled.EMPTY_BUFFER);
 this.options = Collections.unmodifiableList(Lists.newArrayList(options));
 }

Expand All@@ -52,13 +54,25 @@ public DataStreamRequestByteBuf(DataStreamRequestHeader header, ByteBuf buf) {
 header.getWriteOptionList(), buf);
 }

 ByteBuf getBuf() {
 return Optional.ofNullable(buf.get()).orElseThrow(
 () -> new IllegalStateException("buf is already released in " + this));
 }

 @Override
 public long getDataLength() {
 return buf.readableBytes();
 return getBuf().readableBytes();
 }

 public ByteBuf slice() {
 return buf.slice();
 return getBuf().slice();
 }

 public void release() {
 final ByteBuf got = buf.getAndSet(null);
 if (got != null) {
 got.release();
 }
 }

 @Override
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
RATIS-1847. Stream has memory leak. by szetszwo · Pull Request #884 · apache/ratis · GitHub
Skip to content
RATIS-1847. Stream has memory leak.#884

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

 Merged

szetszwo
merged 2 commits into

from

Jun 19, 2023
 Merged


RATIS-1847. Stream has memory leak.
#884
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
e07f3c3

RATIS-1847. Stream has memory leak.


szetszwo Jun 7, 2023
8264d6b

Remove unused import.


szetszwo Jun 7, 2023

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


30 changes: 17 additions & 13 deletions
ratis-netty/src/main/java/org/apache/ratis/netty/server/DataStreamManagement.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,6 +96,10 @@ CompletableFuture<Long> write(ByteBuf buf, Iterable<WriteOption> options,
 n -> streamFuture.thenCompose(stream -> writeToAsync(buf, options, stream, executor)
 .whenComplete((l, e) -> metrics.stop(context, e == null))));
 }

 void cleanUp() {
 streamFuture.thenAccept(DataStream::cleanUp);
 }
Comment thread
szetszwo marked this conversation as resolved.

 }

 static class RemoteStream {
Expand DownExpand Up@@ -374,31 +378,33 @@ static void sendDataStreamException(Throwable throwable, DataStreamRequestByteBu
 ctx.writeAndFlush(newDataStreamReplyByteBuffer(request, reply));
 } catch (Throwable t) {
 LOG.warn("Failed to sendDataStreamException {} for {}", throwable, request, t);
 } finally {
 request.release();
 }
 }

 void read(DataStreamRequestByteBuf request, ChannelHandlerContext ctx,
 CheckedBiFunction<RaftClientRequest, Set<RaftPeer>, Set<DataStreamOutputRpc>, IOException> getStreams) {
 LOG.debug("{}: read {}", this, request);
 final ByteBuf buf = request.slice();
 try {
 readImpl(request, ctx, buf, getStreams);
 readImpl(request, ctx, getStreams);
 } catch (Throwable t) {
 replyDataStreamException(t, request, ctx);
 buf.release();
 }
 }

 private void readImpl(DataStreamRequestByteBuf request, ChannelHandlerContext ctx, ByteBuf buf,
 private void readImpl(DataStreamRequestByteBuf request, ChannelHandlerContext ctx,
 CheckedBiFunction<RaftClientRequest, Set<RaftPeer>, Set<DataStreamOutputRpc>, IOException> getStreams) {
 final boolean close = request.getWriteOptionList().contains(StandardWriteOption.CLOSE);
 ClientInvocationId key = ClientInvocationId.valueOf(request.getClientId(), request.getStreamId());
 final StreamInfo info;
 if (request.getType() == Type.STREAM_HEADER) {
 final MemoizedSupplier<StreamInfo> supplier = JavaUtils.memoize(() -> newStreamInfo(buf, getStreams));
 final MemoizedSupplier<StreamInfo> supplier = JavaUtils.memoize(
 () -> newStreamInfo(request.slice(), getStreams));
 info = streams.computeIfAbsent(key, id -> supplier.get());
 if (!supplier.isInitialized()) {
 streams.remove(key);
 final StreamInfo removed = streams.remove(key);
 removed.getLocal().cleanUp();
 throw new IllegalStateException("Failed to create a new stream for " + request
 + " since a stream already exists Key: " + key + " StreamInfo:" + info);
 }
Expand All@@ -408,10 +414,7 @@ private void readImpl(DataStreamRequestByteBuf request, ChannelHandlerContext ct
 () -> new IllegalStateException("Failed to remove StreamInfo for " + request));
 } else {
 info = Optional.ofNullable(streams.get(key)).orElseThrow(
 () -> {
 streams.remove(key);
 return new IllegalStateException("Failed to get StreamInfo for " + request);
 });
 () -> new IllegalStateException("Failed to get StreamInfo for " + request));
 }

 final CompletableFuture<Long> localWrite;
Expand All@@ -420,7 +423,7 @@ private void readImpl(DataStreamRequestByteBuf request, ChannelHandlerContext ct
 localWrite = CompletableFuture.completedFuture(0L);
 remoteWrites = Collections.emptyList();
 } else if (request.getType() == Type.STREAM_DATA) {
 localWrite = info.getLocal().write(buf, request.getWriteOptionList(), writeExecutor);
 localWrite = info.getLocal().write(request.slice(), request.getWriteOptionList(), writeExecutor);
 remoteWrites = info.applyToRemotes(out -> out.write(request, requestExecutor));
 } else {
 throw new IllegalStateException(this + ": Unexpected type " + request.getType() + ", request=" + request);
Expand All@@ -439,11 +442,12 @@ private void readImpl(DataStreamRequestByteBuf request, ChannelHandlerContext ct
 }, requestExecutor)).whenComplete((v, exception) -> {
 try {
 if (exception != null) {
 streams.remove(key);
final StreamInfo removed = streams.remove(key);
 replyDataStreamException(server, exception, info.getRequest(), request, ctx);
 removed.getLocal().cleanUp();
 }
 } finally {
buf.release();
request.release();
 }
 });
 }
Expand Down

22 changes: 18 additions & 4 deletions
ratis-netty/src/main/java/org/apache/ratis/netty/server/DataStreamRequestByteBuf.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,20 +30,22 @@

import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicReference;

/**
 * Implements {@link DataStreamRequest} with {@link ByteBuf}.
 * <p>
 * This class is immutable.
 */
public class DataStreamRequestByteBuf extends DataStreamPacketImpl implements DataStreamRequest {
 private final ByteBuf buf;
 private final AtomicReference<ByteBuf> buf;
 private final List<WriteOption> options;

 public DataStreamRequestByteBuf(ClientId clientId, Type type, long streamId, long streamOffset,
 Iterable<WriteOption> options, ByteBuf buf) {
 super(clientId, type, streamId, streamOffset);
 this.buf = buf != null? buf.asReadOnly(): Unpooled.EMPTY_BUFFER;
 this.buf = new AtomicReference<>(buf != null? buf.asReadOnly(): Unpooled.EMPTY_BUFFER);
 this.options = Collections.unmodifiableList(Lists.newArrayList(options));
 }

Expand All@@ -52,13 +54,25 @@ public DataStreamRequestByteBuf(DataStreamRequestHeader header, ByteBuf buf) {
 header.getWriteOptionList(), buf);
 }

 ByteBuf getBuf() {
 return Optional.ofNullable(buf.get()).orElseThrow(
 () -> new IllegalStateException("buf is already released in " + this));
 }

 @Override
 public long getDataLength() {
 return buf.readableBytes();
 return getBuf().readableBytes();
 }

 public ByteBuf slice() {
 return buf.slice();
 return getBuf().slice();
 }

 public void release() {
 final ByteBuf got = buf.getAndSet(null);
 if (got != null) {
 got.release();
 }
 }

 @Override
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
RATIS-1847. Stream has memory leak. by szetszwo · Pull Request #884 · apache/ratis · GitHub
Skip to content
RATIS-1847. Stream has memory leak.#884

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

 Merged

szetszwo
merged 2 commits into

from

Jun 19, 2023
 Merged


RATIS-1847. Stream has memory leak.
#884
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
e07f3c3

RATIS-1847. Stream has memory leak.


szetszwo Jun 7, 2023
8264d6b

Remove unused import.


szetszwo Jun 7, 2023

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


30 changes: 17 additions & 13 deletions
ratis-netty/src/main/java/org/apache/ratis/netty/server/DataStreamManagement.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,6 +96,10 @@ CompletableFuture<Long> write(ByteBuf buf, Iterable<WriteOption> options,
 n -> streamFuture.thenCompose(stream -> writeToAsync(buf, options, stream, executor)
 .whenComplete((l, e) -> metrics.stop(context, e == null))));
 }

 void cleanUp() {
 streamFuture.thenAccept(DataStream::cleanUp);
 }
Comment thread
szetszwo marked this conversation as resolved.

 }

 static class RemoteStream {
Expand DownExpand Up@@ -374,31 +378,33 @@ static void sendDataStreamException(Throwable throwable, DataStreamRequestByteBu
 ctx.writeAndFlush(newDataStreamReplyByteBuffer(request, reply));
 } catch (Throwable t) {
 LOG.warn("Failed to sendDataStreamException {} for {}", throwable, request, t);
 } finally {
 request.release();
 }
 }

 void read(DataStreamRequestByteBuf request, ChannelHandlerContext ctx,
 CheckedBiFunction<RaftClientRequest, Set<RaftPeer>, Set<DataStreamOutputRpc>, IOException> getStreams) {
 LOG.debug("{}: read {}", this, request);
 final ByteBuf buf = request.slice();
 try {
 readImpl(request, ctx, buf, getStreams);
 readImpl(request, ctx, getStreams);
 } catch (Throwable t) {
 replyDataStreamException(t, request, ctx);
 buf.release();
 }
 }

 private void readImpl(DataStreamRequestByteBuf request, ChannelHandlerContext ctx, ByteBuf buf,
 private void readImpl(DataStreamRequestByteBuf request, ChannelHandlerContext ctx,
 CheckedBiFunction<RaftClientRequest, Set<RaftPeer>, Set<DataStreamOutputRpc>, IOException> getStreams) {
 final boolean close = request.getWriteOptionList().contains(StandardWriteOption.CLOSE);
 ClientInvocationId key = ClientInvocationId.valueOf(request.getClientId(), request.getStreamId());
 final StreamInfo info;
 if (request.getType() == Type.STREAM_HEADER) {
 final MemoizedSupplier<StreamInfo> supplier = JavaUtils.memoize(() -> newStreamInfo(buf, getStreams));
 final MemoizedSupplier<StreamInfo> supplier = JavaUtils.memoize(
 () -> newStreamInfo(request.slice(), getStreams));
 info = streams.computeIfAbsent(key, id -> supplier.get());
 if (!supplier.isInitialized()) {
 streams.remove(key);
 final StreamInfo removed = streams.remove(key);
 removed.getLocal().cleanUp();
 throw new IllegalStateException("Failed to create a new stream for " + request
 + " since a stream already exists Key: " + key + " StreamInfo:" + info);
 }
Expand All@@ -408,10 +414,7 @@ private void readImpl(DataStreamRequestByteBuf request, ChannelHandlerContext ct
 () -> new IllegalStateException("Failed to remove StreamInfo for " + request));
 } else {
 info = Optional.ofNullable(streams.get(key)).orElseThrow(
 () -> {
 streams.remove(key);
 return new IllegalStateException("Failed to get StreamInfo for " + request);
 });
 () -> new IllegalStateException("Failed to get StreamInfo for " + request));
 }

 final CompletableFuture<Long> localWrite;
Expand All@@ -420,7 +423,7 @@ private void readImpl(DataStreamRequestByteBuf request, ChannelHandlerContext ct
 localWrite = CompletableFuture.completedFuture(0L);
 remoteWrites = Collections.emptyList();
 } else if (request.getType() == Type.STREAM_DATA) {
 localWrite = info.getLocal().write(buf, request.getWriteOptionList(), writeExecutor);
 localWrite = info.getLocal().write(request.slice(), request.getWriteOptionList(), writeExecutor);
 remoteWrites = info.applyToRemotes(out -> out.write(request, requestExecutor));
 } else {
 throw new IllegalStateException(this + ": Unexpected type " + request.getType() + ", request=" + request);
Expand All@@ -439,11 +442,12 @@ private void readImpl(DataStreamRequestByteBuf request, ChannelHandlerContext ct
 }, requestExecutor)).whenComplete((v, exception) -> {
 try {
 if (exception != null) {
 streams.remove(key);
final StreamInfo removed = streams.remove(key);
 replyDataStreamException(server, exception, info.getRequest(), request, ctx);
 removed.getLocal().cleanUp();
 }
 } finally {
buf.release();
request.release();
 }
 });
 }
Expand Down

22 changes: 18 additions & 4 deletions
ratis-netty/src/main/java/org/apache/ratis/netty/server/DataStreamRequestByteBuf.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,20 +30,22 @@

import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicReference;

/**
 * Implements {@link DataStreamRequest} with {@link ByteBuf}.
 * <p>
 * This class is immutable.
 */
public class DataStreamRequestByteBuf extends DataStreamPacketImpl implements DataStreamRequest {
 private final ByteBuf buf;
 private final AtomicReference<ByteBuf> buf;
 private final List<WriteOption> options;

 public DataStreamRequestByteBuf(ClientId clientId, Type type, long streamId, long streamOffset,
 Iterable<WriteOption> options, ByteBuf buf) {
 super(clientId, type, streamId, streamOffset);
 this.buf = buf != null? buf.asReadOnly(): Unpooled.EMPTY_BUFFER;
 this.buf = new AtomicReference<>(buf != null? buf.asReadOnly(): Unpooled.EMPTY_BUFFER);
 this.options = Collections.unmodifiableList(Lists.newArrayList(options));
 }

Expand All@@ -52,13 +54,25 @@ public DataStreamRequestByteBuf(DataStreamRequestHeader header, ByteBuf buf) {
 header.getWriteOptionList(), buf);
 }

 ByteBuf getBuf() {
 return Optional.ofNullable(buf.get()).orElseThrow(
 () -> new IllegalStateException("buf is already released in " + this));
 }

 @Override
 public long getDataLength() {
 return buf.readableBytes();
 return getBuf().readableBytes();
 }

 public ByteBuf slice() {
 return buf.slice();
 return getBuf().slice();
 }

 public void release() {
 final ByteBuf got = buf.getAndSet(null);
 if (got != null) {
 got.release();
 }
 }

 @Override
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
})();
RATIS-1847. Stream has memory leak. by szetszwo · Pull Request #884 · apache/ratis · GitHub
Skip to content
RATIS-1847. Stream has memory leak.#884

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

 Merged

szetszwo
merged 2 commits into

from

Jun 19, 2023
 Merged


RATIS-1847. Stream has memory leak.
#884
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
e07f3c3

RATIS-1847. Stream has memory leak.


szetszwo Jun 7, 2023
8264d6b

Remove unused import.


szetszwo Jun 7, 2023

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


30 changes: 17 additions & 13 deletions
ratis-netty/src/main/java/org/apache/ratis/netty/server/DataStreamManagement.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,6 +96,10 @@ CompletableFuture<Long> write(ByteBuf buf, Iterable<WriteOption> options,
 n -> streamFuture.thenCompose(stream -> writeToAsync(buf, options, stream, executor)
 .whenComplete((l, e) -> metrics.stop(context, e == null))));
 }

 void cleanUp() {
 streamFuture.thenAccept(DataStream::cleanUp);
 }
Comment thread
szetszwo marked this conversation as resolved.

 }

 static class RemoteStream {
Expand DownExpand Up@@ -374,31 +378,33 @@ static void sendDataStreamException(Throwable throwable, DataStreamRequestByteBu
 ctx.writeAndFlush(newDataStreamReplyByteBuffer(request, reply));
 } catch (Throwable t) {
 LOG.warn("Failed to sendDataStreamException {} for {}", throwable, request, t);
 } finally {
 request.release();
 }
 }

 void read(DataStreamRequestByteBuf request, ChannelHandlerContext ctx,
 CheckedBiFunction<RaftClientRequest, Set<RaftPeer>, Set<DataStreamOutputRpc>, IOException> getStreams) {
 LOG.debug("{}: read {}", this, request);
 final ByteBuf buf = request.slice();
 try {
 readImpl(request, ctx, buf, getStreams);
 readImpl(request, ctx, getStreams);
 } catch (Throwable t) {
 replyDataStreamException(t, request, ctx);
 buf.release();
 }
 }

 private void readImpl(DataStreamRequestByteBuf request, ChannelHandlerContext ctx, ByteBuf buf,
 private void readImpl(DataStreamRequestByteBuf request, ChannelHandlerContext ctx,
 CheckedBiFunction<RaftClientRequest, Set<RaftPeer>, Set<DataStreamOutputRpc>, IOException> getStreams) {
 final boolean close = request.getWriteOptionList().contains(StandardWriteOption.CLOSE);
 ClientInvocationId key = ClientInvocationId.valueOf(request.getClientId(), request.getStreamId());
 final StreamInfo info;
 if (request.getType() == Type.STREAM_HEADER) {
 final MemoizedSupplier<StreamInfo> supplier = JavaUtils.memoize(() -> newStreamInfo(buf, getStreams));
 final MemoizedSupplier<StreamInfo> supplier = JavaUtils.memoize(
 () -> newStreamInfo(request.slice(), getStreams));
 info = streams.computeIfAbsent(key, id -> supplier.get());
 if (!supplier.isInitialized()) {
 streams.remove(key);
 final StreamInfo removed = streams.remove(key);
 removed.getLocal().cleanUp();
 throw new IllegalStateException("Failed to create a new stream for " + request
 + " since a stream already exists Key: " + key + " StreamInfo:" + info);
 }
Expand All@@ -408,10 +414,7 @@ private void readImpl(DataStreamRequestByteBuf request, ChannelHandlerContext ct
 () -> new IllegalStateException("Failed to remove StreamInfo for " + request));
 } else {
 info = Optional.ofNullable(streams.get(key)).orElseThrow(
 () -> {
 streams.remove(key);
 return new IllegalStateException("Failed to get StreamInfo for " + request);
 });
 () -> new IllegalStateException("Failed to get StreamInfo for " + request));
 }

 final CompletableFuture<Long> localWrite;
Expand All@@ -420,7 +423,7 @@ private void readImpl(DataStreamRequestByteBuf request, ChannelHandlerContext ct
 localWrite = CompletableFuture.completedFuture(0L);
 remoteWrites = Collections.emptyList();
 } else if (request.getType() == Type.STREAM_DATA) {
 localWrite = info.getLocal().write(buf, request.getWriteOptionList(), writeExecutor);
 localWrite = info.getLocal().write(request.slice(), request.getWriteOptionList(), writeExecutor);
 remoteWrites = info.applyToRemotes(out -> out.write(request, requestExecutor));
 } else {
 throw new IllegalStateException(this + ": Unexpected type " + request.getType() + ", request=" + request);
Expand All@@ -439,11 +442,12 @@ private void readImpl(DataStreamRequestByteBuf request, ChannelHandlerContext ct
 }, requestExecutor)).whenComplete((v, exception) -> {
 try {
 if (exception != null) {
 streams.remove(key);
final StreamInfo removed = streams.remove(key);
 replyDataStreamException(server, exception, info.getRequest(), request, ctx);
 removed.getLocal().cleanUp();
 }
 } finally {
buf.release();
request.release();
 }
 });
 }
Expand Down

22 changes: 18 additions & 4 deletions
ratis-netty/src/main/java/org/apache/ratis/netty/server/DataStreamRequestByteBuf.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,20 +30,22 @@

import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicReference;

/**
 * Implements {@link DataStreamRequest} with {@link ByteBuf}.
 * <p>
 * This class is immutable.
 */
public class DataStreamRequestByteBuf extends DataStreamPacketImpl implements DataStreamRequest {
 private final ByteBuf buf;
 private final AtomicReference<ByteBuf> buf;
 private final List<WriteOption> options;

 public DataStreamRequestByteBuf(ClientId clientId, Type type, long streamId, long streamOffset,
 Iterable<WriteOption> options, ByteBuf buf) {
 super(clientId, type, streamId, streamOffset);
 this.buf = buf != null? buf.asReadOnly(): Unpooled.EMPTY_BUFFER;
 this.buf = new AtomicReference<>(buf != null? buf.asReadOnly(): Unpooled.EMPTY_BUFFER);
 this.options = Collections.unmodifiableList(Lists.newArrayList(options));
 }

Expand All@@ -52,13 +54,25 @@ public DataStreamRequestByteBuf(DataStreamRequestHeader header, ByteBuf buf) {
 header.getWriteOptionList(), buf);
 }

 ByteBuf getBuf() {
 return Optional.ofNullable(buf.get()).orElseThrow(
 () -> new IllegalStateException("buf is already released in " + this));
 }

 @Override
 public long getDataLength() {
 return buf.readableBytes();
 return getBuf().readableBytes();
 }

 public ByteBuf slice() {
 return buf.slice();
 return getBuf().slice();
 }

 public void release() {
 final ByteBuf got = buf.getAndSet(null);
 if (got != null) {
 got.release();
 }
 }

 @Override
Expand Down