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

Show file tree
Hide file tree
Changes from 6 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
24 changes: 24 additions & 0 deletions ratis-common/src/main/java/org/apache/ratis/conf/RaftProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

package org.apache.ratis.conf;

import org.apache.ratis.thirdparty.com.google.common.collect.Maps;
import org.apache.ratis.util.JavaUtils;
import org.apache.ratis.util.ReflectionUtils;
import org.apache.ratis.util.SizeInBytes;
Expand All @@ -33,6 +34,7 @@
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Properties;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
Expand All @@ -53,6 +55,10 @@ public class RaftProperties {
public RaftProperties() {
}

public RaftProperties(Properties properties) {
this.properties.putAll(Maps.fromProperties(properties));
}

/**
* A new RaftProperties with the same settings cloned from another.
*
Expand Down Expand Up @@ -124,6 +130,24 @@ private static int[] findSubVariable(String eval) {
return result;
}

/**
* Merge two raft properties.
*
* <p>
* Properties in {@code p2} overwrite those in {@code p1} if they have
* the same key.
* </p>
*
* @param p1 first properties
* @param p2 second properties
* @return merged properties
*/
public static RaftProperties merge(RaftProperties p1, RaftProperties p2) {
RaftProperties result = new RaftProperties(p1);
result.properties.putAll(p2.properties);
return result;
}

/**
* Attempts to repeatedly expand the value {@code expr} by replacing the
* left-most substring of the form "${var}" in the following precedence order
Expand Down
10 changes: 7 additions & 3 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 @@ -64,9 +64,13 @@ public static RaftPeerId getPeerId(String host, int port) {
* @return return a raft client
*/
public static RaftClient createClient(RaftGroup raftGroup) {
RaftProperties properties = new RaftProperties();
RaftClientConfigKeys.Rpc.setRequestTimeout(properties,
RaftProperties defaults = new RaftProperties();
RaftClientConfigKeys.Rpc.setRequestTimeout(defaults,
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.
RaftProperties systems = new RaftProperties(System.getProperties());

@szetszwo szetszwo Mar 2, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@AngersZhuuuu , let's simply use forEach instead of changing RaftProperties.

@@ -67,6 +68,12 @@ public final class RaftUtils {
     RaftProperties properties = new RaftProperties();
     RaftClientConfigKeys.Rpc.setRequestTimeout(properties,
         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()

@AngersZhuuuu AngersZhuuuu Mar 3, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

DOne

ExponentialBackoffRetry retryPolicy = ExponentialBackoffRetry.newBuilder()
.setBaseSleepTime(TimeDuration.valueOf(1000, TimeUnit.MILLISECONDS))
.setMaxAttempts(10)
Expand All @@ -75,7 +79,7 @@ public static RaftClient createClient(RaftGroup raftGroup) {
.build();
return RaftClient.newBuilder()
.setRaftGroup(raftGroup)
.setProperties(properties)
.setProperties(RaftProperties.merge(defaults, systems))
.setRetryPolicy(retryPolicy)
.build();
}
Expand Down