From b3dff3e035bf58b69ee238591c76f6a4f0c9a64f Mon Sep 17 00:00:00 2001
From: Sam Tunnicliffe <samt@apache.org>
Date: Fri, 26 Jun 2026 13:52:09 +0100
Subject: [PATCH] Don't sync host ids in ClusterMetadata and system tables
 before CMS initialization

---
 src/java/org/apache/cassandra/db/SystemPeersValidator.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/java/org/apache/cassandra/db/SystemPeersValidator.java b/src/java/org/apache/cassandra/db/SystemPeersValidator.java
index 2f490a4bb4..21dbd4b305 100644
--- a/src/java/org/apache/cassandra/db/SystemPeersValidator.java
+++ b/src/java/org/apache/cassandra/db/SystemPeersValidator.java
@@ -34,6 +34,7 @@ import org.apache.cassandra.db.virtual.PeersTable;
 import org.apache.cassandra.locator.InetAddressAndPort;
 import org.apache.cassandra.schema.SchemaConstants;
 import org.apache.cassandra.tcm.ClusterMetadata;
+import org.apache.cassandra.tcm.Epoch;
 import org.apache.cassandra.tcm.membership.Location;
 import org.apache.cassandra.tcm.membership.NodeAddresses;
 import org.apache.cassandra.tcm.membership.NodeId;
@@ -68,6 +69,8 @@ public final class SystemPeersValidator
 
     public static void validateAndRepair(ClusterMetadata metadata)
     {
+        if (metadata.epoch.isBefore(Epoch.FIRST))
+            return;
         Map<InetAddressAndPort, UntypedResultSet.Row> peersV2Rows = getPeersV2Rows();
         Map<InetAddress, UntypedResultSet.Row> peersRows = getPeersRows();