This is an automated email from the ASF dual-hosted git repository. samt pushed a commit to branch cep-21-tcm in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 890e13173571108b2b9fd24eb8b83c4dea9f2024 Author: Sam Tunnicliffe <[email protected]> AuthorDate: Wed Mar 22 11:43:15 2023 +0000 [CEP-21] Always use Paxos.v2 for global log reads/writes patch by Sam Tunnicliffe; reviewed by Alex Petrov and Marcus Eriksson for CASSANDRA-18406 --- src/java/org/apache/cassandra/config/Config.java | 2 +- src/java/org/apache/cassandra/service/StorageProxy.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java index b829ee06ab..bc0f56d2ec 100644 --- a/src/java/org/apache/cassandra/config/Config.java +++ b/src/java/org/apache/cassandra/config/Config.java @@ -992,7 +992,7 @@ public class Config /** * See {@link PaxosVariant}. Defaults to v1, recommend upgrading to v2 at earliest opportunity. */ - public volatile PaxosVariant paxos_variant = PaxosVariant.v2; // TODO: only use v2 for CMS operations + public volatile PaxosVariant paxos_variant = PaxosVariant.v1; /** * If true, paxos topology change repair will not run on a topology change - this option should only be used in diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java index 86185d6366..688e41ce1d 100644 --- a/src/java/org/apache/cassandra/service/StorageProxy.java +++ b/src/java/org/apache/cassandra/service/StorageProxy.java @@ -115,6 +115,7 @@ import org.apache.cassandra.net.MessageFlag; import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.net.RequestCallback; import org.apache.cassandra.net.Verb; +import org.apache.cassandra.schema.DistributedMetadataLogKeyspace; import org.apache.cassandra.schema.PartitionDenylist; import org.apache.cassandra.schema.Schema; import org.apache.cassandra.schema.SchemaConstants; @@ -315,7 +316,7 @@ public class StorageProxy implements StorageProxyMBean key.toString(), keyspaceName, cfName)); } - return Paxos.useV2() + return (keyspaceName.equals(DistributedMetadataLogKeyspace.metadata().name) || Paxos.useV2()) ? Paxos.cas(key, request, consistencyForPaxos, consistencyForCommit, clientState) : legacyCas(keyspaceName, cfName, key, request, consistencyForPaxos, consistencyForCommit, clientState, nowInSeconds, queryStartNanoTime); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
