From 39e2b0b8bf0f87ce07e17f22a295a64f337e323c Mon Sep 17 00:00:00 2001 From: Rootul Patel Date: Mon, 9 Dec 2024 14:12:04 -0500 Subject: [PATCH 1/3] chore: deprecate timeout_commit and timeout_propose config --- config/toml.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/toml.go b/config/toml.go index 6f0c699c6f..9f1ccc4cc7 100644 --- a/config/toml.go +++ b/config/toml.go @@ -480,6 +480,8 @@ only_internal_wal = "{{ .Consensus.OnlyInternalWal }}" wal_file = "{{ js .Consensus.WalPath }}" # How long we wait for a proposal block before prevoting nil +# Deprecated: timeout_commit is overriden by the state machine in app version >= 3. +# Therefore, the value set in this config will be ignored. timeout_propose = "{{ .Consensus.TimeoutPropose }}" # How much timeout_propose increases with each round timeout_propose_delta = "{{ .Consensus.TimeoutProposeDelta }}" @@ -494,6 +496,8 @@ timeout_precommit_delta = "{{ .Consensus.TimeoutPrecommitDelta }}" # How long we wait after committing a block, before starting on the new # height (this gives us a chance to receive some more precommits, even # though we already have +2/3). +# Deprecated: timeout_commit is overriden by the state machine in app version >= 3. +# Therefore, the value set in this config will be ignored. timeout_commit = "{{ .Consensus.TimeoutCommit }}" # How many blocks to look back to check existence of the node's consensus votes before joining consensus From 88f4b34581622ed45ddd9cd8cccc73fb2d1b02ba Mon Sep 17 00:00:00 2001 From: Rootul P Date: Mon, 9 Dec 2024 16:16:39 -0500 Subject: [PATCH 2/3] Update config/toml.go Co-authored-by: CHAMI Rachid --- config/toml.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/toml.go b/config/toml.go index 9f1ccc4cc7..ca798df62c 100644 --- a/config/toml.go +++ b/config/toml.go @@ -496,7 +496,7 @@ timeout_precommit_delta = "{{ .Consensus.TimeoutPrecommitDelta }}" # How long we wait after committing a block, before starting on the new # height (this gives us a chance to receive some more precommits, even # though we already have +2/3). -# Deprecated: timeout_commit is overriden by the state machine in app version >= 3. +# Deprecated: timeout_commit is overridden by the state machine in app version >= 3. # Therefore, the value set in this config will be ignored. timeout_commit = "{{ .Consensus.TimeoutCommit }}" From a8747a0d6ea69dbb9e657bd853a5d508b27c9365 Mon Sep 17 00:00:00 2001 From: Rootul P Date: Mon, 9 Dec 2024 16:16:44 -0500 Subject: [PATCH 3/3] Update config/toml.go Co-authored-by: CHAMI Rachid --- config/toml.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/toml.go b/config/toml.go index ca798df62c..a43773630a 100644 --- a/config/toml.go +++ b/config/toml.go @@ -480,7 +480,7 @@ only_internal_wal = "{{ .Consensus.OnlyInternalWal }}" wal_file = "{{ js .Consensus.WalPath }}" # How long we wait for a proposal block before prevoting nil -# Deprecated: timeout_commit is overriden by the state machine in app version >= 3. +# Deprecated: timeout_commit is overridden by the state machine in app version >= 3. # Therefore, the value set in this config will be ignored. timeout_propose = "{{ .Consensus.TimeoutPropose }}" # How much timeout_propose increases with each round