You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2015/03/16 13:40:13 UTC
[1/2] cassandra git commit: Don't check if sstables are live for
offline compactions
Repository: cassandra
Updated Branches:
refs/heads/trunk a64f4143c -> 482cbc0c8
Don't check if sstables are live for offline compactions
Patch by marcuse; reviewed by benedict for CASSANDRA-8841
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1a77a698
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1a77a698
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1a77a698
Branch: refs/heads/trunk
Commit: 1a77a6986852f39f983b1bb95032c134ed210605
Parents: 022e3ee
Author: Marcus Eriksson <ma...@apache.org>
Authored: Mon Mar 16 08:24:28 2015 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Mon Mar 16 13:35:47 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/DataTracker.java | 6 +++---
src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java | 2 +-
src/java/org/apache/cassandra/tools/StandaloneSplitter.java | 2 +-
.../org/apache/cassandra/io/sstable/SSTableRewriterTest.java | 2 +-
5 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a77a698/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d41a1a4..a48787f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.4
+ * Don't check if an sstable is live for offline compactions (CASSANDRA-8841)
* Don't set clientMode in SSTableLoader (CASSANDRA-8238)
* Fix SSTableRewriter with disabled early open (CASSANDRA-8535)
* Allow invalidating permissions and cache time (CASSANDRA-8722)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a77a698/src/java/org/apache/cassandra/db/DataTracker.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/DataTracker.java b/src/java/org/apache/cassandra/db/DataTracker.java
index 2c2053c..757b48a 100644
--- a/src/java/org/apache/cassandra/db/DataTracker.java
+++ b/src/java/org/apache/cassandra/db/DataTracker.java
@@ -194,9 +194,9 @@ public class DataTracker
*/
public boolean markCompacting(Collection<SSTableReader> sstables)
{
- return markCompacting(sstables, false);
+ return markCompacting(sstables, false, false);
}
- public boolean markCompacting(Collection<SSTableReader> sstables, boolean newTables)
+ public boolean markCompacting(Collection<SSTableReader> sstables, boolean newTables, boolean offline)
{
assert sstables != null && !Iterables.isEmpty(sstables);
while (true)
@@ -214,7 +214,7 @@ public class DataTracker
};
if (newTables)
assert !Iterables.any(sstables, Predicates.in(currentView.sstables));
- else if (!Iterables.all(sstables, live))
+ else if (!offline && !Iterables.all(sstables, live))
return false;
View newView = currentView.markCompacting(sstables);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a77a698/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java b/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
index 641dd7c..19b2b2c 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
@@ -351,7 +351,7 @@ public class SSTableRewriter
}
else
{
- dataTracker.markCompacting(Collections.singleton(replaceWith), true);
+ dataTracker.markCompacting(Collections.singleton(replaceWith), true, isOffline);
toReplaceSet = Collections.emptySet();
}
dataTracker.replaceEarlyOpenedFiles(toReplaceSet, Collections.singleton(replaceWith));
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a77a698/src/java/org/apache/cassandra/tools/StandaloneSplitter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/StandaloneSplitter.java b/src/java/org/apache/cassandra/tools/StandaloneSplitter.java
index 242b1c0..bc614cc 100644
--- a/src/java/org/apache/cassandra/tools/StandaloneSplitter.java
+++ b/src/java/org/apache/cassandra/tools/StandaloneSplitter.java
@@ -146,7 +146,7 @@ public class StandaloneSplitter
if (options.snapshot)
System.out.println(String.format("Pre-split sstables snapshotted into snapshot %s", snapshotName));
- cfs.getDataTracker().markCompacting(sstables);
+ cfs.getDataTracker().markCompacting(sstables, false, true);
for (SSTableReader sstable : sstables)
{
try
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a77a698/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
index 76b89e5..09937bc 100644
--- a/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
@@ -577,7 +577,7 @@ public class SSTableRewriterTest extends SchemaLoader
cfs.truncateBlocking();
cfs.disableAutoCompaction();
SSTableReader s = writeFile(cfs, 1000);
- cfs.getDataTracker().markCompacting(Arrays.asList(s), true);
+ cfs.getDataTracker().markCompacting(Arrays.asList(s), true, false);
SSTableSplitter splitter = new SSTableSplitter(cfs, s, 10);
splitter.split();
Thread.sleep(1000);
[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by ma...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/482cbc0c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/482cbc0c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/482cbc0c
Branch: refs/heads/trunk
Commit: 482cbc0c81342d14e133dc3f408aaf6ae7f4e680
Parents: a64f414 1a77a69
Author: Marcus Eriksson <ma...@apache.org>
Authored: Mon Mar 16 13:38:48 2015 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Mon Mar 16 13:38:48 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/DataTracker.java | 6 +++---
src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java | 2 +-
src/java/org/apache/cassandra/tools/StandaloneSplitter.java | 2 +-
.../org/apache/cassandra/io/sstable/SSTableRewriterTest.java | 2 +-
5 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/482cbc0c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 123e455,a48787f..ef2a7c7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,78 -1,10 +1,79 @@@
+3.0
+ * Add WriteFailureException to native protocol, notify coordinator of
+ write failures (CASSANDRA-8592)
+ * Convert SequentialWriter to nio (CASSANDRA-8709)
+ * Add role based access control (CASSANDRA-7653, 8650, 7216, 8760, 8849, 8761, 8850)
+ * Record client ip address in tracing sessions (CASSANDRA-8162)
+ * Indicate partition key columns in response metadata for prepared
+ statements (CASSANDRA-7660)
+ * Merge UUIDType and TimeUUIDType parse logic (CASSANDRA-8759)
+ * Avoid memory allocation when searching index summary (CASSANDRA-8793)
+ * Optimise (Time)?UUIDType Comparisons (CASSANDRA-8730)
+ * Make CRC32Ex into a separate maven dependency (CASSANDRA-8836)
+ * Use preloaded jemalloc w/ Unsafe (CASSANDRA-8714)
+ * Avoid accessing partitioner through StorageProxy (CASSANDRA-8244, 8268)
+ * Upgrade Metrics library and remove depricated metrics (CASSANDRA-5657)
+ * Serializing Row cache alternative, fully off heap (CASSANDRA-7438)
+ * Duplicate rows returned when in clause has repeated values (CASSANDRA-6707)
+ * Make CassandraException unchecked, extend RuntimeException (CASSANDRA-8560)
+ * Support direct buffer decompression for reads (CASSANDRA-8464)
+ * DirectByteBuffer compatible LZ4 methods (CASSANDRA-7039)
+ * Group sstables for anticompaction correctly (CASSANDRA-8578)
+ * Add ReadFailureException to native protocol, respond
+ immediately when replicas encounter errors while handling
+ a read request (CASSANDRA-7886)
+ * Switch CommitLogSegment from RandomAccessFile to nio (CASSANDRA-8308)
+ * Allow mixing token and partition key restrictions (CASSANDRA-7016)
+ * Support index key/value entries on map collections (CASSANDRA-8473)
+ * Modernize schema tables (CASSANDRA-8261)
+ * Support for user-defined aggregation functions (CASSANDRA-8053)
+ * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
+ * Refactor SelectStatement, return IN results in natural order instead
+ of IN value list order and ignore duplicate values in partition key IN restrictions (CASSANDRA-7981)
+ * Support UDTs, tuples, and collections in user-defined
+ functions (CASSANDRA-7563)
+ * Fix aggregate fn results on empty selection, result column name,
+ and cqlsh parsing (CASSANDRA-8229)
+ * Mark sstables as repaired after full repair (CASSANDRA-7586)
+ * Extend Descriptor to include a format value and refactor reader/writer
+ APIs (CASSANDRA-7443)
+ * Integrate JMH for microbenchmarks (CASSANDRA-8151)
+ * Keep sstable levels when bootstrapping (CASSANDRA-7460)
+ * Add Sigar library and perform basic OS settings check on startup (CASSANDRA-7838)
+ * Support for aggregation functions (CASSANDRA-4914)
+ * Remove cassandra-cli (CASSANDRA-7920)
+ * Accept dollar quoted strings in CQL (CASSANDRA-7769)
+ * Make assassinate a first class command (CASSANDRA-7935)
+ * Support IN clause on any partition key column (CASSANDRA-7855)
+ * Support IN clause on any clustering column (CASSANDRA-4762)
+ * Improve compaction logging (CASSANDRA-7818)
+ * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
+ * Do anticompaction in groups (CASSANDRA-6851)
+ * Support user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 7929,
+ 7924, 7812, 8063, 7813, 7708)
+ * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
+ * Move sstable RandomAccessReader to nio2, which allows using the
+ FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
+ * Remove CQL2 (CASSANDRA-5918)
+ * Add Thrift get_multi_slice call (CASSANDRA-6757)
+ * Optimize fetching multiple cells by name (CASSANDRA-6933)
+ * Allow compilation in java 8 (CASSANDRA-7028)
+ * Make incremental repair default (CASSANDRA-7250)
+ * Enable code coverage thru JaCoCo (CASSANDRA-7226)
+ * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369)
+ * Shorten SSTable path (CASSANDRA-6962)
+ * Use unsafe mutations for most unit tests (CASSANDRA-6969)
+ * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
+ * Fail on very large batch sizes (CASSANDRA-8011)
+ * Improve concurrency of repair (CASSANDRA-6455, 8208)
+ * Select optimal CRC32 implementation at runtime (CASSANDRA-8614)
+ * Evaluate MurmurHash of Token once per query (CASSANDRA-7096)
+ * Generalize progress reporting (CASSANDRA-8901)
+
2.1.4
+ * Don't check if an sstable is live for offline compactions (CASSANDRA-8841)
* Don't set clientMode in SSTableLoader (CASSANDRA-8238)
* Fix SSTableRewriter with disabled early open (CASSANDRA-8535)
- * Allow invalidating permissions and cache time (CASSANDRA-8722)
- * Log warning when queries that will require ALLOW FILTERING in Cassandra 3.0
- are executed (CASSANDRA-8418)
* Fix cassandra-stress so it respects the CL passed in user mode (CASSANDRA-8948)
* Fix rare NPE in ColumnDefinition#hasIndexOption() (CASSANDRA-8786)
* cassandra-stress reports per-operation statistics, plus misc (CASSANDRA-8769)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/482cbc0c/src/java/org/apache/cassandra/db/DataTracker.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/482cbc0c/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/482cbc0c/src/java/org/apache/cassandra/tools/StandaloneSplitter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/482cbc0c/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
----------------------------------------------------------------------