From 6bedeff4fd1af436c47e45e239f22668f84702f2 Mon Sep 17 00:00:00 2001
From: Marcus Eriksson <marcuse@apache.org>
Date: Thu, 22 Jan 2015 15:48:15 +0100
Subject: [PATCH] Make sure we don't add tmplink sstables to the compaction
 strategy

Patch by marcuse; reviewed by ayeschenko for CASSANDRA-8580
---
 CHANGES.txt                                           |  2 ++
 .../db/compaction/WrappingCompactionStrategy.java     | 11 +++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 54f734c71f..ad9cb94f3d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
 2.1.3
+ * Make sure we don't add tmplink files to the compaction
+   strategy (CASSANDRA-8580)
  * (cqlsh) Handle maps with blob keys (CASSANDRA-8372)
  * (cqlsh) Handle DynamicCompositeType schemas correctly (CASSANDRA-8563)
  * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
diff --git a/src/java/org/apache/cassandra/db/compaction/WrappingCompactionStrategy.java b/src/java/org/apache/cassandra/db/compaction/WrappingCompactionStrategy.java
index c88bdf00a8..2f8bd7c9e1 100644
--- a/src/java/org/apache/cassandra/db/compaction/WrappingCompactionStrategy.java
+++ b/src/java/org/apache/cassandra/db/compaction/WrappingCompactionStrategy.java
@@ -323,10 +323,13 @@ public final class WrappingCompactionStrategy extends AbstractCompactionStrategy
         super.startup();
         for (SSTableReader sstable : cfs.getSSTables())
         {
-            if (sstable.isRepaired())
-                repaired.addSSTable(sstable);
-            else
-                unrepaired.addSSTable(sstable);
+            if (sstable.openReason != SSTableReader.OpenReason.EARLY)
+            {
+                if (sstable.isRepaired())
+                    repaired.addSSTable(sstable);
+                else
+                    unrepaired.addSSTable(sstable);
+            }
         }
         repaired.startup();
         unrepaired.startup();