You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by ru...@apache.org on 2021/01/06 01:12:35 UTC
[ozone] branch HDDS-2823 updated: HDDS-4643. Ratis Snapshot should
be loaded from the config (#1756)
This is an automated email from the ASF dual-hosted git repository.
runzhiwang pushed a commit to branch HDDS-2823
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/HDDS-2823 by this push:
new b32c2bb HDDS-4643. Ratis Snapshot should be loaded from the config (#1756)
b32c2bb is described below
commit b32c2bb07e72162d1a7e79942e3e7ebba2482bd7
Author: Rui Wang <am...@users.noreply.github.com>
AuthorDate: Tue Jan 5 17:12:22 2021 -0800
HDDS-4643. Ratis Snapshot should be loaded from the config (#1756)
---
.../java/org/apache/hadoop/hdds/scm/ha/RatisUtil.java | 3 ++-
.../apache/hadoop/hdds/scm/ha/SCMHAConfiguration.java | 16 ++++++++++++++++
.../hadoop/hdds/scm/ha/TestReplicationAnnotation.java | 3 +--
3 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/RatisUtil.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/RatisUtil.java
index 253d996..879b68a 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/RatisUtil.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/RatisUtil.java
@@ -149,7 +149,8 @@ public final class RatisUtil {
private static void setRaftSnapshotProperties(
final RaftProperties properties, final SCMHAConfiguration conf) {
Snapshot.setAutoTriggerEnabled(properties, true);
- Snapshot.setAutoTriggerThreshold(properties, 400000);
+ Snapshot.setAutoTriggerThreshold(properties,
+ conf.getRatisSnapshotThreshold());
}
}
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAConfiguration.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAConfiguration.java
index cee736f..fa478cc 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAConfiguration.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAConfiguration.java
@@ -114,6 +114,14 @@ public class SCMHAConfiguration {
)
private int raftLogPurgeGap = 1000000;
+ @Config(key = "ratis.snapshot.threshold",
+ type = ConfigType.LONG,
+ defaultValue = "1000",
+ tags = {SCM, OZONE, HA, RATIS},
+ description = "The threshold to trigger a Ratis taking snapshot " +
+ "operation for SCM")
+ private long ratisSnapshotThreshold = 1000L;
+
@Config(key = "ratis.request.timeout",
type = ConfigType.TIME,
defaultValue = "3000ms",
@@ -197,6 +205,14 @@ public class SCMHAConfiguration {
return raftLogPurgeGap;
}
+ public long getRatisSnapshotThreshold() {
+ return ratisSnapshotThreshold;
+ }
+
+ public void setRatisSnapshotThreshold(long threshold) {
+ this.ratisSnapshotThreshold = threshold;
+ }
+
public long getRatisRetryCacheTimeout() {
return ratisRetryCacheTimeout;
}
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestReplicationAnnotation.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestReplicationAnnotation.java
index 3609030..d82faa2 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestReplicationAnnotation.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/ha/TestReplicationAnnotation.java
@@ -88,8 +88,7 @@ public class TestReplicationAnnotation {
try {
proxy.addContainer(HddsProtos.ContainerInfoProto.getDefaultInstance());
- // Should have seen a IOException.
- Assert.fail();
+ Assert.fail("Cannot reach here: should have seen a IOException");
} catch (IOException ignore) {
// Expecting to hit here.
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org