From 300065357f293bad51c9e0746c6056870f343ff9 Mon Sep 17 00:00:00 2001 From: Kaijie Chen Date: Thu, 2 Mar 2023 13:33:12 +0800 Subject: [PATCH] [DOCFIX] Correct docs about Ratis ### What changes are proposed in this pull request? Correct docs about Ratis. ### Why are the changes needed? Embedded journal is introduced in #8219, then Copycat is replaced by Ratis in #12181. Some docs are not updated. ### Does this PR introduce any user facing changes? No. pr-link: Alluxio/alluxio#16985 change-id: cid-592a5c06991c5b067690031ef7fffed9d2e6fac6 --- docs/cn/deploy/Running-Alluxio-On-a-HA-Cluster.md | 2 +- docs/en/deploy/Running-Alluxio-On-a-HA-Cluster.md | 2 +- .../java/alluxio/master/journal/raft/RaftJournalSystem.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/cn/deploy/Running-Alluxio-On-a-HA-Cluster.md b/docs/cn/deploy/Running-Alluxio-On-a-HA-Cluster.md index f5b0f6578bdb..887b31597b56 100644 --- a/docs/cn/deploy/Running-Alluxio-On-a-HA-Cluster.md +++ b/docs/cn/deploy/Running-Alluxio-On-a-HA-Cluster.md @@ -47,7 +47,7 @@ alluxio.master.embedded.journal.addresses= - 第二个属性 `alluxio.master.mount.table.root.ufs=` 设置为挂载到Alluxio根目录的底层存储URI。 一定保证master节点和所有worker节点都可以访问此共享存储。 示例包括`alluxio.master.mount.table.root.ufs=hdfs://1.2.3.4:9000/alluxio/root/`或`alluxio.master.mount.table.root.ufs=s3://bucket/dir/` 。 - 第三个属性 `alluxio.master.embedded.journal.addresses` 设置参加Alluxio leading master选举的master节点集。默认的嵌入式日志端口是 `19200`。例如: `alluxio.master.embedded.journal.addresses=master_hostname_1:19200，master_hostname_2:19200，master_hostname_3:19200` -嵌入式日记特性依赖于 [Copycat](https://github.com/atomix/copycat) 内置leader选举功能。内置leader选举功能不能与Zookeeper一起使用，因为系统不能出现多种leader选举机制选出不同leader的情况。启用嵌入式日记就启用了Alluxio的内置leader election机制。请参阅[嵌入式日志配置文档]({{ '/en/operation/Journal.html' | relativize_url}}＃embedded-journal-configuration)，以了解更多详细信息以及使用内部leader选举配置HA集群的替代方案。 +嵌入式日记特性依赖于 [Ratis](https://github.com/apache/ratis) 内置leader选举功能。内置leader选举功能不能与Zookeeper一起使用，因为系统不能出现多种leader选举机制选出不同leader的情况。启用嵌入式日记就启用了Alluxio的内置leader election机制。请参阅[嵌入式日志配置文档]({{ '/en/operation/Journal.html' | relativize_url}}＃embedded-journal-configuration)，以了解更多详细信息以及使用内部leader选举配置HA集群的替代方案。 ### 选项2:Zookeeper和共享日志存储 diff --git a/docs/en/deploy/Running-Alluxio-On-a-HA-Cluster.md b/docs/en/deploy/Running-Alluxio-On-a-HA-Cluster.md index b350789e76cb..c61945835cea 100644 --- a/docs/en/deploy/Running-Alluxio-On-a-HA-Cluster.md +++ b/docs/en/deploy/Running-Alluxio-On-a-HA-Cluster.md @@ -78,7 +78,7 @@ Explanation: The default embedded journal port is `19200`. An example: `alluxio.master.embedded.journal.addresses=master_hostname_1:19200,master_hostname_2:19200,master_hostname_3:19200` -Note that embedded journal feature relies on [Ratis](https://github.com/apache/incubator-ratis) which uses +Note that embedded journal feature relies on [Ratis](https://github.com/apache/ratis) which uses leader election based on the Raft protocol and has its own format for storing journal entries. The built-in leader election cannot work with Zookeeper since the journal formats between these configurations may not match. diff --git a/dora/core/server/common/src/main/java/alluxio/master/journal/raft/RaftJournalSystem.java b/dora/core/server/common/src/main/java/alluxio/master/journal/raft/RaftJournalSystem.java index a0ecfd8f2b3d..2fffe155726e 100644 --- a/dora/core/server/common/src/main/java/alluxio/master/journal/raft/RaftJournalSystem.java +++ b/dora/core/server/common/src/main/java/alluxio/master/journal/raft/RaftJournalSystem.java @@ -164,7 +164,7 @@ * so we allow a snapshot to be taken once a day at a user-configured time. To support this, * all state changes must first acquire a read lock, and snapshotting requires the * corresponding write lock. Once we have the write lock for all state machines, we enable - * snapshots in Copycat through our AtomicBoolean, then wait for any snapshot to complete. + * snapshots in Ratis through our AtomicBoolean, then wait for any snapshot to complete. */ @ThreadSafe public class RaftJournalSystem extends AbstractJournalSystem {