[cassandra] branch cassandra-4.0 updated: BinLog does not close chronicle queue leaving this to GC to cleanup

2021-07-07 Thread maedhroz
This is an automated email from the ASF dual-hosted git repository.

maedhroz pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git


The following commit(s) were added to refs/heads/cassandra-4.0 by this push:
 new 68bf950  BinLog does not close chronicle queue leaving this to GC to 
cleanup
 new afcc0cc  Merge branch 'cassandra-4.0.0' into cassandra-4.0
68bf950 is described below

commit 68bf950f72d20be9f31fd3f91669be7e28c050e4
Author: David Capwell 
AuthorDate: Fri Jul 2 10:38:40 2021 -0700

BinLog does not close chronicle queue leaving this to GC to cleanup

patch by David Capwell; reviewed by Caleb Rackliffe, Marcus Eriksson for 
CASSANDRA-16774
---
 CHANGES.txt| 1 +
 src/java/org/apache/cassandra/utils/binlog/BinLog.java | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index deb883e..a093977 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 4.0-rc3
+ * BinLog does not close chronicle queue leaving this to GC to cleanup 
(CASSANDRA-16774)
 Merged from 3.11:
 Merged from 3.0:
 
diff --git a/src/java/org/apache/cassandra/utils/binlog/BinLog.java 
b/src/java/org/apache/cassandra/utils/binlog/BinLog.java
index f622954..63f74a3 100644
--- 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 class BinLog implements Runnable
 shouldContinue = false;
 sampleQueue.put(NO_OP);
 binLogThread.join();
+appender.close();
 appender = null;
+queue.close();
 queue = null;
 archiver.stop();
 currentPaths.remove(path);

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org



[cassandra] branch cassandra-4.0 updated: BinLog does not close chronicle queue leaving this to GC to cleanup

2021-07-02 Thread dcapwell
This is an automated email from the ASF dual-hosted git repository.

dcapwell pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git


The following commit(s) were added to refs/heads/cassandra-4.0 by this push:
 new bb3a39a  BinLog does not close chronicle queue leaving this to GC to 
cleanup
bb3a39a is described below

commit bb3a39ad4db82bf10a17d775f558ee18a4a70198
Author: David Capwell 
AuthorDate: Fri Jul 2 10:38:40 2021 -0700

BinLog does not close chronicle queue leaving this to GC to cleanup

patch by David Capwell; reviewed by Caleb Rackliffe, Marcus Eriksson for 
CASSANDRA-16774
---
 CHANGES.txt| 1 +
 src/java/org/apache/cassandra/utils/binlog/BinLog.java | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index aa95028..dbbb705 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 4.0.1
+ * 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
index f622954..63f74a3 100644
--- 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 class BinLog implements Runnable
 shouldContinue = false;
 sampleQueue.put(NO_OP);
 binLogThread.join();
+appender.close();
 appender = null;
+queue.close();
 queue = null;
 archiver.stop();
 currentPaths.remove(path);

-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org