From cd9bed0aeadd94136a8a6c6ed284cc4684b0666c Mon Sep 17 00:00:00 2001
From: Jon Meredith <jonmeredith@apache.org>
Date: Thu, 20 Apr 2023 14:17:36 -0600
Subject: [PATCH] Deadlock updating sstable metadata if disk boundaries need
 reloading

patch by Jon Meredith; reviewed by Marcus Eriksson for CASSANDRA-18443
---
 CHANGES.txt                                                    | 1 +
 .../cassandra/db/compaction/CompactionStrategyManager.java     | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index cf208d7eb9..35a0fc16d6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 4.0.10
+ * Deadlock updating sstable metadata if disk boundaries need reloading (CASSANDRA-18443)
  * Fix nested selection of reversed collections (CASSANDRA-17913)
 
 4.0.9
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java
index deece30d45..99e2ce996f 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java
@@ -724,8 +724,7 @@ public class CompactionStrategyManager implements INotificationConsumer
      */
     private void handleMetadataChangedNotification(SSTableReader sstable, StatsMetadata oldMetadata)
     {
-        AbstractCompactionStrategy acs = getCompactionStrategyFor(sstable);
-        acs.metadataChanged(oldMetadata, sstable);
+        compactionStrategyFor(sstable).metadataChanged(oldMetadata, sstable);
     }
 
     /**