Skip to content

HDDS-5763. Provide an Executor for each LocalStream in ContainerStateMachine #2782

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
captainzmc merged 3 commits into from
Nov 1, 2021
Merged

HDDS-5763. Provide an Executor for each LocalStream in ContainerStateMachine #2782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a1793b4
HDDS-5763. Provide an Executor for each LocalStream in ContainerState…
szetszwo Oct 29, 2021
ad1f30d
Fix checkstyle.
szetszwo Oct 29, 2021
c7628e5
Remove datastream.write.threads from DatanodeRatisServerConfig.
szetszwo Nov 1, 2021
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
7 changes: 5 additions & 2 deletions ...rg/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,8 +515,11 @@ public CompletableFuture<DataStream> stream(RaftClientRequest request) {

ContainerCommandResponseProto response = runCommand(
requestProto, context);
String path = response.getMessage();
return new LocalStream(new StreamDataChannel(Paths.get(path)));
final StreamDataChannel channel = new StreamDataChannel(
Paths.get(response.getMessage()));
final ExecutorService chunkExecutor = requestProto.hasWriteChunk() ?
getChunkExecutor(requestProto.getWriteChunk()) : null;
return new LocalStream(channel, chunkExecutor);
Copy link
Member

@captainzmc captainzmc Nov 1, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

Hi @szetszwo, The size of the chunkExecutors is determined by dfs.container.ratis.num.write.chunk.threads.per.volume. So I'm wondering if we need delete datastream.write.threads in DatanodeRatisServerConfig? Now that we're passing in chunkExecutor every time, this configuration should be useless?

Copy link
Contributor Author

@szetszwo szetszwo Nov 1, 2021

Choose a reason for hiding this comment

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

@captainzmc , you are right. Let's remove it.

} catch (IOException e) {
throw new CompletionException("Failed to create data stream", e);
}
Expand Down
10 changes: 9 additions & 1 deletion ...ain/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/LocalStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,15 @@
import java.io.IOException;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;
import java.util.concurrent.Executor;

class LocalStream implements StateMachine.DataStream {
private final StateMachine.DataChannel dataChannel;
private final Executor executor;

LocalStream(StateMachine.DataChannel dataChannel) {
LocalStream(StateMachine.DataChannel dataChannel, Executor executor) {
this.dataChannel = dataChannel;
this.executor = executor;
}

@Override
Expand All @@ -47,4 +50,9 @@ public CompletableFuture<?> cleanUp() {
}
});
}

@Override
public Executor getExecutor() {
return executor;
}
}
5 changes: 0 additions & 5 deletions ...a/org/apache/hadoop/ozone/container/common/transport/server/ratis/XceiverServerRatis.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,11 +239,6 @@ private void setUpRatisStream(RaftProperties properties) {
.getStreamRequestThreads();
RaftServerConfigKeys.DataStream.setAsyncRequestThreadPoolSize(properties,
dataStreamAsyncRequestThreadPoolSize);
int dataStreamWriteRequestThreadPoolSize =
conf.getObject(DatanodeRatisServerConfig.class)
.getStreamWriteThreads();
RaftServerConfigKeys.DataStream.setAsyncWriteThreadPoolSize(properties,
dataStreamWriteRequestThreadPoolSize);
int dataStreamClientPoolSize =
conf.getObject(DatanodeRatisServerConfig.class)
.getClientPoolSize();
Expand Down
17 changes: 0 additions & 17 deletions ...p-hdds/framework/src/main/java/org/apache/hadoop/hdds/conf/DatanodeRatisServerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,23 +141,6 @@ public void setStreamRequestThreads(int streamRequestThreads) {
this.streamRequestThreads = streamRequestThreads;
}

@Config(key = "datastream.write.threads",
defaultValue = "20",
type = ConfigType.INT,
tags = {OZONE, DATANODE, RATIS, DATASTREAM},
description = "Maximum number of threads in the thread pool for " +
"datastream write."
)
private int streamWriteThreads;

public int getStreamWriteThreads() {
return streamWriteThreads;
}

public void setStreamWriteThreads(int streamWriteThreads) {
this.streamWriteThreads = streamWriteThreads;
}

@Config(key = "datastream.client.pool.size",
defaultValue = "10",
type = ConfigType.INT,
Expand Down