Skip to content

HDDS-13593. Make container ListSubcommand use JsonUtils#getStdoutSequenceWriter #9017

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
errose28 merged 2 commits into from
Sep 12, 2025
Merged

HDDS-13593. Make container ListSubcommand use JsonUtils#getStdoutSequenceWriter #9017

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5b6415
HDDS-13593. Make container ListSubcommand use JsonUtils#getStdoutSequ…
Sep 9, 2025
3220816
Fixed test failure
Sep 10, 2025
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
40 changes: 2 additions & 38 deletions ...zone/cli-admin/src/main/java/org/apache/hadoop/hdds/scm/cli/container/ListSubcommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import com.google.common.base.Strings;
import java.io.IOException;
import java.io.OutputStream;
import java.util.List;
import org.apache.hadoop.hdds.cli.HddsVersionProvider;
import org.apache.hadoop.hdds.client.ReplicationConfig;
Expand All @@ -38,6 +37,7 @@
import org.apache.hadoop.hdds.scm.client.ScmClient;
import org.apache.hadoop.hdds.scm.container.ContainerInfo;
import org.apache.hadoop.hdds.scm.container.ContainerListResult;
import org.apache.hadoop.hdds.server.JsonUtils;
import picocli.CommandLine.Command;
import picocli.CommandLine.Help.Visibility;
import picocli.CommandLine.Option;
Expand Down Expand Up @@ -117,8 +117,7 @@ public void execute(ScmClient scmClient) throws IOException {
ScmConfigKeys.OZONE_SCM_CONTAINER_LIST_MAX_COUNT_DEFAULT);

// Use SequenceWriter to output JSON array format for all cases
SequenceWriter sequenceWriter = WRITER.writeValues(new NonClosingOutputStream(System.out));
sequenceWriter.init(true); // Initialize as a JSON array
SequenceWriter sequenceWriter = JsonUtils.getStdoutSequenceWriter();

if (!all) {
// Regular listing with count limit
Expand Down Expand Up @@ -181,39 +180,4 @@ private void listAllContainers(ScmClient scmClient, SequenceWriter writer,
}
} while (fetchedCount > 0);
}

// TODO HDDS-13593 Remove this in favor of JsonUtils#getStdoutSequenceWriter.
private static class NonClosingOutputStream extends OutputStream {

private final OutputStream delegate;

NonClosingOutputStream(OutputStream delegate) {
this.delegate = delegate;
}

@Override
public void write(int b) throws IOException {
delegate.write(b);
}

@Override
public void write(byte[] b) throws IOException {
delegate.write(b);
}

@Override
public void write(byte[] b, int off, int len) throws IOException {
delegate.write(b, off, len);
}

@Override
public void flush() throws IOException {
delegate.flush();
}

@Override
public void close() {
// Ignore close to keep the underlying stream open
}
}
}