Skip to content

[SPARK-45377][CORE] Handle InputStream in NettyLogger #43165

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
hasnain-db wants to merge 3 commits into from
Closed

[SPARK-45377][CORE] Handle InputStream in NettyLogger #43165

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
32c84db
handle InputStream
hasnain-db Sep 28, 2023
15616e9
address comments
hasnain-db Oct 1, 2023
4a9cb29
address nit
hasnain-db Oct 2, 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
11 changes: 11 additions & 0 deletions common/network-common/src/main/java/org/apache/spark/network/util/NettyLogger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@

package org.apache.spark.network.util;

import java.io.IOException;
import java.io.InputStream;

import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufHolder;
import io.netty.channel.ChannelHandlerContext;
Expand All @@ -42,6 +45,14 @@ protected String format(ChannelHandlerContext ctx, String eventName, Object arg)
} else if (arg instanceof ByteBufHolder) {
return format(ctx, eventName) + " " +
((ByteBufHolder) arg).content().readableBytes() + "B";
} else if (arg instanceof InputStream) {
int available = -1;
try {
available = ((InputStream) arg).available();
} catch (IOException ex) {
// Swallow, but return -1 to indicate an error happened
}
return format(ctx, eventName, arg) + " " + available + "B";
} else {
return super.format(ctx, eventName, arg);
}
Expand Down