Merge branch 'cassandra-4.0' into trunk

cyber43 · Jul 2, 2021 · c611966 · c611966
2 parents 985b46d + bb3a39a
commit c611966
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -5,6 +5,7 @@
  * Add a system property to set hostId if not yet initialized (CASSANDRA-14582)
  * GossiperTest.testHasVersion3Nodes didn't take into account trunk version changes, fixed to rely on latest version (CASSANDRA-16651)
 Merged from 4.0:
+ * BinLog does not close chronicle queue leaving this to GC to cleanup (CASSANDRA-16774)
  * Add repaired/unrepaired bytes back to nodetool (CASSANDRA-15282)
  * Upgrade lz4-java to 1.8.0 to add RH6 support back (CASSANDRA-16753)
  * Improve DiagnosticEventService.publish(event) logging message of events (CASSANDRA-16749)

diff --git a/src/java/org/apache/cassandra/utils/binlog/BinLog.java b/src/java/org/apache/cassandra/utils/binlog/BinLog.java
@@ -169,7 +169,9 @@ public synchronized void stop() throws InterruptedException
         shouldContinue = false;
         sampleQueue.put(NO_OP);
         binLogThread.join();
+        appender.close();
         appender = null;
+        queue.close();
         queue = null;
         archiver.stop();
         currentPaths.remove(path);