Update default raft log segment size.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ratis/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ratis/commit/9c442378 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ratis/tree/9c442378 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ratis/diff/9c442378 Branch: refs/heads/master Commit: 9c44237880ae2c772d58f036708b0bd3f6b013a8 Parents: 0fed307 Author: Jing Zhao <[email protected]> Authored: Wed Jan 25 15:48:43 2017 -0800 Committer: Jing Zhao <[email protected]> Committed: Wed Jan 25 15:48:43 2017 -0800 ---------------------------------------------------------------------- .../main/java/org/apache/ratis/server/RaftServerConfigKeys.java | 4 ++-- .../main/java/org/apache/ratis/server/storage/LogSegment.java | 4 ++-- .../main/java/org/apache/ratis/server/storage/RaftLogWorker.java | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/9c442378/ratis-server/src/main/java/org/apache/ratis/server/RaftServerConfigKeys.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/main/java/org/apache/ratis/server/RaftServerConfigKeys.java b/ratis-server/src/main/java/org/apache/ratis/server/RaftServerConfigKeys.java index cdf7651..d3c5173 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/RaftServerConfigKeys.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/RaftServerConfigKeys.java @@ -76,10 +76,10 @@ public interface RaftServerConfigKeys { long RAFT_SERVER_SNAPSHOT_TRIGGER_THRESHOLD_DEFAULT = 400000; String RAFT_LOG_SEGMENT_MAX_SIZE_KEY = "raft.log.segment.max.size"; - long RAFT_LOG_SEGMENT_MAX_SIZE_DEFAULT = 1024L * 1024 * 1024 * 2; // 2GB + long RAFT_LOG_SEGMENT_MAX_SIZE_DEFAULT = 1024L * 1024 * 8; // 8MB String RAFT_LOG_SEGMENT_PREALLOCATED_SIZE_KEY = "raft.log.segment.preallocated.size"; - int RAFT_LOG_SEGMENT_PREALLOCATED_SIZE_DEFAULT = 1024 * 1024 * 16; // 16MB + int RAFT_LOG_SEGMENT_PREALLOCATED_SIZE_DEFAULT = 1024 * 1024 * 4; // 4MB String RAFT_LOG_WRITE_BUFFER_SIZE_KEY = "raft.log.write.buffer.size"; int RAFT_LOG_WRITE_BUFFER_SIZE_DEFAULT = 64 * 1024; http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/9c442378/ratis-server/src/main/java/org/apache/ratis/server/storage/LogSegment.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/main/java/org/apache/ratis/server/storage/LogSegment.java b/ratis-server/src/main/java/org/apache/ratis/server/storage/LogSegment.java index af9ee66..c8e5306 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/storage/LogSegment.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/storage/LogSegment.java @@ -216,8 +216,8 @@ class LogSegment implements Comparable<Long> { @Override public String toString() { - return isOpen() ? "log-" + startIndex + "-inprogress" : - "log-" + startIndex + "-" + endIndex; + return isOpen() ? "log_" + "inprogress_" + startIndex : + "log-" + startIndex + "_" + endIndex; } @Override http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/9c442378/ratis-server/src/main/java/org/apache/ratis/server/storage/RaftLogWorker.java ---------------------------------------------------------------------- diff --git a/ratis-server/src/main/java/org/apache/ratis/server/storage/RaftLogWorker.java b/ratis-server/src/main/java/org/apache/ratis/server/storage/RaftLogWorker.java index e057a51..ae71cc1 100644 --- a/ratis-server/src/main/java/org/apache/ratis/server/storage/RaftLogWorker.java +++ b/ratis-server/src/main/java/org/apache/ratis/server/storage/RaftLogWorker.java @@ -221,7 +221,6 @@ class RaftLogWorker implements Runnable { return addIOTask(new TruncateLog(ts)); } - // TODO we can add another level of buffer for writing here private class WriteLog extends Task { private final LogEntryProto entry;
