Skip to content

HDDS-8119. Remove loosely related AutoCloseable from SendContainerOutputStream #4368

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
adoroszlai merged 1 commit into from
Mar 9, 2023
Merged

HDDS-8119. Remove loosely related AutoCloseable from SendContainerOutputStream #4368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 12 additions & 4 deletions ...ce/src/main/java/org/apache/hadoop/ozone/container/replication/GrpcContainerUploader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,22 @@ public GrpcContainerUploader(
public OutputStream startUpload(long containerId, DatanodeDetails target,
CompletableFuture<Void> callback, CopyContainerCompression compression)
throws IOException {
GrpcReplicationClient client = null;
GrpcReplicationClient client = createReplicationClient(target, compression);
try {
client = createReplicationClient(target, compression);
StreamObserver<SendContainerRequest> requestStream = client.upload(
new SendContainerResponseStreamObserver(containerId, target,
callback));
return new SendContainerOutputStream(client, requestStream, containerId,
GrpcReplicationService.BUFFER_SIZE, compression);
return new SendContainerOutputStream(requestStream, containerId,
GrpcReplicationService.BUFFER_SIZE, compression) {
@Override
public void close() throws IOException {
try {
super.close();
} finally {
IOUtils.close(LOG, client);
}
}
};
} catch (Exception e) {
IOUtils.close(LOG, client);
throw e;
Expand Down
21 changes: 1 addition & 20 deletions ...rc/main/java/org/apache/hadoop/ozone/container/replication/SendContainerOutputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,31 +18,21 @@
package org.apache.hadoop.ozone.container.replication;

import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.SendContainerRequest;
import org.apache.hadoop.hdds.utils.IOUtils;
import org.apache.ratis.thirdparty.com.google.protobuf.ByteString;
import org.apache.ratis.thirdparty.io.grpc.stub.StreamObserver;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.IOException;

/**
* Output stream adapter for SendContainerResponse.
*/
class SendContainerOutputStream extends GrpcOutputStream<SendContainerRequest> {

private static final Logger LOG =
LoggerFactory.getLogger(SendContainerOutputStream.class);

private final CopyContainerCompression compression;
private final AutoCloseable client;

SendContainerOutputStream(
AutoCloseable client, StreamObserver<SendContainerRequest> streamObserver,
StreamObserver<SendContainerRequest> streamObserver,
long containerId, int bufferSize, CopyContainerCompression compression) {
super(streamObserver, containerId, bufferSize);
this.compression = compression;
this.client = client;
}

@Override
Expand All @@ -55,13 +45,4 @@ protected void sendPart(boolean eof, int length, ByteString data) {
.build();
getStreamObserver().onNext(request);
}

@Override
public void close() throws IOException {
try {
super.close();
} finally {
IOUtils.close(LOG, client);
}
}
}
8 changes: 2 additions & 6 deletions ...est/java/org/apache/hadoop/ozone/container/replication/TestSendContainerOutputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import org.apache.ratis.thirdparty.com.google.protobuf.ByteString;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.EnumSource;
import org.mockito.Mock;

import java.io.OutputStream;

Expand All @@ -35,23 +34,20 @@
class TestSendContainerOutputStream
extends GrpcOutputStreamTest<SendContainerRequest> {

@Mock
private AutoCloseable client;

TestSendContainerOutputStream() {
super(SendContainerRequest.class);
}

@Override
protected OutputStream createSubject() {
return new SendContainerOutputStream(client, getObserver(),
return new SendContainerOutputStream(getObserver(),
getContainerId(), getBufferSize(), NO_COMPRESSION);
}

@ParameterizedTest
@EnumSource
void usesCompression(CopyContainerCompression compression) throws Exception {
OutputStream subject = new SendContainerOutputStream(client,
OutputStream subject = new SendContainerOutputStream(
getObserver(), getContainerId(), getBufferSize(), compression);

byte[] bytes = getRandomBytes(16);
Expand Down