Skip to content

RATIS-1798. Make ratis-shell command respect GENERIC_COMMAND_OPTIONS #834

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 7 commits into from
Mar 3, 2023
Merged

RATIS-1798. Make ratis-shell command respect GENERIC_COMMAND_OPTIONS #834

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2ac93d5
[RATIS-1798] ratis-shell command should respect GENERIC_COMMAND_OPTIONS
AngersZhuuuu Mar 1, 2023
41867bd
Update RaftUtils.java
AngersZhuuuu Mar 2, 2023
a237252
follow comment
AngersZhuuuu Mar 2, 2023
45292d6
Merge branch 'master' into RATIS-1798
AngersZhuuuu Mar 2, 2023
70c0a8f
Update TestLogAppenderWithGrpc.java
AngersZhuuuu Mar 2, 2023
7d61e2c
Revert "Update TestLogAppenderWithGrpc.java"
AngersZhuuuu Mar 2, 2023
c6d83d0
update
AngersZhuuuu Mar 3, 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
7 changes: 7 additions & 0 deletions ratis-shell/src/main/java/org/apache/ratis/shell/cli/RaftUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.apache.ratis.util.TimeDuration;

import java.net.InetSocketAddress;
import java.util.Properties;
import java.util.concurrent.TimeUnit;

/**
Expand Down Expand Up @@ -67,6 +68,12 @@ public static RaftClient createClient(RaftGroup raftGroup) {
RaftProperties properties = new RaftProperties();
RaftClientConfigKeys.Rpc.setRequestTimeout(properties,
Copy link
Contributor

@szetszwo szetszwo Mar 1, 2023

Choose a reason for hiding this comment

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

@AngersZhuuuu , thanks for working on this! This is a good change. We should check if the requestTimeout is already set.

Copy link
Contributor Author

@AngersZhuuuu AngersZhuuuu Mar 2, 2023

Choose a reason for hiding this comment

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

We should check if the requestTimeout is already set.

How about the current change? Properties in System should have higher priority. It can cover the requestTimeout if we set it passed by -D

TimeDuration.valueOf(15, TimeUnit.SECONDS));

// Since ratis-shell support GENERIC_COMMAND_OPTIONS, here we should
// merge these options to raft properties to make it work.
final Properties sys = System.getProperties();
sys.stringPropertyNames().forEach(key -> properties.set(key, sys.getProperty(key)));

ExponentialBackoffRetry retryPolicy = ExponentialBackoffRetry.newBuilder()
.setBaseSleepTime(TimeDuration.valueOf(1000, TimeUnit.MILLISECONDS))
.setMaxAttempts(10)
Expand Down