Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 patch by Samuel Klock and Sylvain Lebresne; reviewed by Sylvain Lebresne for CASSANDRA-13109
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/74fdfe0a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/74fdfe0a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/74fdfe0a Branch: refs/heads/cassandra-3.11 Commit: 74fdfe0a5f9bd8d3c525e771e2ba2cd3cfc18697 Parents: 7c2437e Author: Samuel Klock <[email protected]> Authored: Thu Feb 9 10:24:10 2017 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Thu Feb 9 10:26:08 2017 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/LegacyLayout.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/74fdfe0a/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 7da61e7..1f638da 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.0.11 + * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 (CASSANDRA-13109) * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125) * Fix UPDATE queries with empty IN restrictions (CASSANDRA-13152) * Abort or retry on failed hints delivery (CASSANDRA-13124) http://git-wip-us.apache.org/repos/asf/cassandra/blob/74fdfe0a/src/java/org/apache/cassandra/db/LegacyLayout.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/LegacyLayout.java b/src/java/org/apache/cassandra/db/LegacyLayout.java index 3788c3c..972bb9f 100644 --- a/src/java/org/apache/cassandra/db/LegacyLayout.java +++ b/src/java/org/apache/cassandra/db/LegacyLayout.java @@ -1261,7 +1261,7 @@ public abstract class LegacyLayout return true; } - if (tombstone.isCollectionTombstone()) + if (tombstone.isCollectionTombstone() && helper.includes(tombstone.start.collectionName)) { if (clustering == null) {
