From f6ea362d711ac8e06f254b18ba6fcf99e7e2c8cf Mon Sep 17 00:00:00 2001
From: Marcus Eriksson <marcuse@apache.org>
Date: Mon, 27 Nov 2023 12:54:31 +0100
Subject: [PATCH] Test failure: org.apache.cassandra.tools.JMXCompatabilityTest

Patch by marcuse; reviewed by Sam Tunnicliffe for CASSANDRA-19060
---
 .../org/apache/cassandra/service/StorageService.java  | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 093b1da6d8..865ecb14b2 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -792,7 +792,16 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
 
         if (ClusterMetadataService.state() == ClusterMetadataService.State.REMOTE)
             Gossiper.instance.triggerRoundWithCMS();
-
+        // Has to be called after the host id has potentially changed
+        try
+        {
+            CacheService.instance.counterCache.loadSavedAsync().get();
+        }
+        catch (Throwable t)
+        {
+            JVMStabilityInspector.inspectThrowable(t);
+            logger.warn("Error loading counter cache", t);
+        }
         Gossiper.waitToSettle();
 
         NodeId self;