cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [1/6] cassandra git commit: Remove unnecessary file existence check during anticompaction.
Date Wed, 27 Apr 2016 08:15:11 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 b6b251770 -> 3db30aab9
  refs/heads/cassandra-3.0 f2afd04e7 -> 8bfe09f46
  refs/heads/trunk 29d4a8297 -> 0e5266664


Remove unnecessary file existence check during anticompaction.

Patch by marcuse; reviewed by Paulo Motta for CASSANDRA-11660


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3db30aab
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3db30aab
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3db30aab

Branch: refs/heads/cassandra-2.2
Commit: 3db30aab98e8ca568b006273b533ae68f448f3ac
Parents: b6b2517
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Tue Apr 26 13:33:21 2016 +0200
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Wed Apr 27 10:03:42 2016 +0200

----------------------------------------------------------------------
 CHANGES.txt                                                  | 1 +
 .../apache/cassandra/db/compaction/CompactionManager.java    | 8 --------
 2 files changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3db30aab/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index bdabf29..e8a301a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.7
+ * Remove unnescessary file existence check during anticompaction (CASSANDRA-11660)
  * Add missing files to debian packages (CASSANDRA-11642)
  * Avoid calling Iterables::concat in loops during ModificationStatement::getFunctions (CASSANDRA-11621)
  * cqlsh: COPY FROM should use regular inserts for single statement batches and

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3db30aab/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 675d3cc..3f41672 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -1235,17 +1235,9 @@ public class CompactionManager implements CompactionManagerMBean
     {
         long groupMaxDataAge = -1;
 
-        // check that compaction hasn't stolen any sstables used in previous repair sessions
-        // if we need to skip the anticompaction, it will be carried out by the next repair
         for (Iterator<SSTableReader> i = anticompactionGroup.originals().iterator();
i.hasNext();)
         {
             SSTableReader sstable = i.next();
-            if (!new File(sstable.getFilename()).exists())
-            {
-                logger.info("Skipping anticompaction for {}, required sstable was compacted
and is no longer available.", sstable);
-                i.remove();
-                continue;
-            }
             if (groupMaxDataAge < sstable.maxDataAge)
                 groupMaxDataAge = sstable.maxDataAge;
         }


Mime
View raw message