From 74fdfe0a5f9bd8d3c525e771e2ba2cd3cfc18697 Mon Sep 17 00:00:00 2001
From: Samuel Klock <sklock@akamai.com>
Date: Thu, 9 Feb 2017 10:24:10 +0100
Subject: [PATCH] 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
---
 CHANGES.txt                                        | 1 +
 src/java/org/apache/cassandra/db/LegacyLayout.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 7da61e70f1..1f638daf9a 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)
diff --git a/src/java/org/apache/cassandra/db/LegacyLayout.java b/src/java/org/apache/cassandra/db/LegacyLayout.java
index 3788c3c792..972bb9f01a 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)
                 {