From 2bcbd92a25c420b30cc8cc0eb8b266d9889ea973 Mon Sep 17 00:00:00 2001
From: Brandon Williams <brandonwilliams@apache.org>
Date: Wed, 2 Dec 2020 12:13:40 -0600
Subject: [PATCH] Ninja fix CASSANDRA-16225 and update changes.

---
 CHANGES.txt                                                  | 1 +
 .../org/apache/cassandra/db/lifecycle/LogTransaction.java    | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index bb968e8138..1955168e1f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.24:
+ * Synchronize transaction logs for JBOD (CASSANDRA-16225)
  * Fix the counting of cells per partition (CASSANDRA-16259)
  * Fix serial read/non-applying CAS linearizability (CASSANDRA-12126)
  * Avoid potential NPE in JVMStabilityInspector (CASSANDRA-16294)
diff --git a/src/java/org/apache/cassandra/db/lifecycle/LogTransaction.java b/src/java/org/apache/cassandra/db/lifecycle/LogTransaction.java
index 5d858a9ac8..da92fa2e3d 100644
--- a/src/java/org/apache/cassandra/db/lifecycle/LogTransaction.java
+++ b/src/java/org/apache/cassandra/db/lifecycle/LogTransaction.java
@@ -151,7 +151,10 @@ class LogTransaction extends Transactional.AbstractTransactional implements Tran
      */
     void untrackNew(SSTable table)
     {
-        txnFile.remove(table);
+        synchronized (lock)
+        {
+            txnFile.remove(table);
+        }
     }
 
     /**