You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by be...@apache.org on 2015/02/19 12:55:05 UTC
[7/9] cassandra git commit: Merge branch 'cassandra-2.0' into
cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/db/ColumnFamilyStore.java
src/java/org/apache/cassandra/streaming/StreamTransferTask.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/52d19e20
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/52d19e20
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/52d19e20
Branch: refs/heads/cassandra-2.1
Commit: 52d19e20f01642cb95880d3c417c5c3c3f0920f8
Parents: c86fc85 6db2a2e
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Thu Feb 19 11:54:30 2015 +0000
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Thu Feb 19 11:54:30 2015 +0000
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../cassandra/streaming/StreamTransferTask.java | 19 ++++++++++++++++++-
2 files changed, 20 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/52d19e20/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2666eb6,f68c987..acb0497
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,6 +1,19 @@@
-2.0.13:
+2.1.4
+ * Fix SSTableRewriter cleanup (CASSANDRA-8802)
+ * Introduce SafeMemory for CompressionMetadata.Writer (CASSANDRA-8758)
+ * 'nodetool info' prints exception against older node (CASSANDRA-8796)
+ * Ensure SSTableReader.last corresponds exactly with the file end (CASSANDRA-8750)
+ * Make SSTableWriter.openEarly more robust and obvious (CASSANDRA-8747)
+ * Enforce SSTableReader.first/last (CASSANDRA-8744)
+ * Cleanup SegmentedFile API (CASSANDRA-8749)
+ * Avoid overlap with early compaction replacement (CASSANDRA-8683)
+ * Safer Resource Management++ (CASSANDRA-8707)
+ * Write partition size estimates into a system table (CASSANDRA-7688)
+ * cqlsh: Fix keys() and full() collection indexes in DESCRIBE output
+ (CASSANDRA-8154)
+Merged from 2.0:
+ * Make CFS.markReferenced() resistant to bad refcounting (CASSANDRA-8829)
+ * Fix StreamTransferTask abort/complete bad refcounting (CASSANDRA-8815)
* Fix AssertionError when querying a DESC clustering ordered
table with ASC ordering and paging (CASSANDRA-8767)
* AssertionError: "Memory was freed" when running cleanup (CASSANDRA-8716)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/52d19e20/src/java/org/apache/cassandra/streaming/StreamTransferTask.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/streaming/StreamTransferTask.java
index b00042e,8d699e1..3add478
--- a/src/java/org/apache/cassandra/streaming/StreamTransferTask.java
+++ b/src/java/org/apache/cassandra/streaming/StreamTransferTask.java
@@@ -93,8 -94,22 +96,22 @@@ public class StreamTransferTask extend
future.cancel(false);
timeoutTasks.clear();
+ Throwable fail = null;
for (OutgoingFileMessage file : files.values())
- file.ref.release();
+ {
+ try
+ {
- file.sstable.releaseReference();
++ file.ref.release();
+ }
+ catch (Throwable t)
+ {
+ if (fail == null) fail = t;
+ else fail.addSuppressed(t);
+ }
+ }
+ files.clear();
+ if (fail != null)
+ Throwables.propagate(fail);
}
public synchronized int getTotalNumberOfFiles()