You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2017/02/23 02:14:22 UTC
[01/10] cassandra git commit: run
LongLeveledCompactionStrategyTest.testLeveledScanner in a separate table
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 88f36a095 -> 6ffd5cc5d
refs/heads/cassandra-3.0 51796ea63 -> 61f0c988f
refs/heads/cassandra-3.11 f624b14ae -> b887ae944
refs/heads/trunk fbf7e1274 -> ac2101305
run LongLeveledCompactionStrategyTest.testLeveledScanner in a separate table
patch by marcuse; reviewed by yukim for CASSANDRA-12202
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6ffd5cc5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6ffd5cc5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6ffd5cc5
Branch: refs/heads/cassandra-2.2
Commit: 6ffd5cc5d28658b4d058de79a9bea9c10a82c8d4
Parents: 88f36a0
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Jul 14 15:31:30 2016 +0200
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Feb 23 10:35:50 2017 +0900
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../LongLeveledCompactionStrategyTest.java | 84 +++++++++++++-------
.../unit/org/apache/cassandra/SchemaLoader.java | 3 +
.../LeveledCompactionStrategyTest.java | 2 +-
4 files changed, 62 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ffd5cc5/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1a22814..033b366 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.10
+ * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
* Fix failing COPY TO STDOUT (CASSANDRA-12497)
* Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
* Exceptions encountered calling getSeeds() breaks OTC thread (CASSANDRA-13018)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ffd5cc5/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
----------------------------------------------------------------------
diff --git a/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java b/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
index 5439a72..8e63006 100644
--- a/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
+++ b/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
@@ -25,6 +25,7 @@ import org.apache.cassandra.db.columniterator.OnDiskAtomIterator;
import org.apache.cassandra.io.sstable.ISSTableScanner;
import org.apache.cassandra.io.sstable.format.SSTableReader;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
import org.apache.cassandra.SchemaLoader;
@@ -41,6 +42,7 @@ public class LongLeveledCompactionStrategyTest
{
public static final String KEYSPACE1 = "LongLeveledCompactionStrategyTest";
public static final String CF_STANDARDLVL = "StandardLeveled";
+ public static final String CF_STANDARDLVL2 = "StandardLeveled2";
@BeforeClass
public static void defineSchema() throws ConfigurationException
@@ -53,6 +55,9 @@ public class LongLeveledCompactionStrategyTest
KSMetaData.optsWithRF(1),
SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARDLVL)
.compactionStrategyClass(LeveledCompactionStrategy.class)
+ .compactionStrategyOptions(leveledOptions),
+ SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARDLVL2)
+ .compactionStrategyClass(LeveledCompactionStrategy.class)
.compactionStrategyOptions(leveledOptions));
}
@@ -144,16 +149,34 @@ public class LongLeveledCompactionStrategyTest
@Test
public void testLeveledScanner() throws Exception
{
- testParallelLeveledCompaction();
Keyspace keyspace = Keyspace.open(KEYSPACE1);
- ColumnFamilyStore store = keyspace.getColumnFamilyStore(CF_STANDARDLVL);
- store.disableAutoCompaction();
-
+ final ColumnFamilyStore store = keyspace.getColumnFamilyStore(CF_STANDARDLVL2);
WrappingCompactionStrategy strategy = ((WrappingCompactionStrategy) store.getCompactionStrategy());
- LeveledCompactionStrategy lcs = (LeveledCompactionStrategy) strategy.getWrappedStrategies().get(1);
+ final LeveledCompactionStrategy lcs = (LeveledCompactionStrategy) strategy.getWrappedStrategies().get(1);
- ByteBuffer value = ByteBuffer.wrap(new byte[10 * 1024]); // 10 KB value
+ ByteBuffer value = ByteBuffer.wrap(new byte[100 * 1024]); // 100 KB value, make it easy to have multiple files
+
+ // Enough data to have a level 1 and 2
+ int rows = 128;
+ int columns = 10;
+ // Adds enough data to trigger multiple sstable per level
+ for (int r = 0; r < rows; r++)
+ {
+ DecoratedKey key = Util.dk(String.valueOf(r));
+ Mutation rm = new Mutation(KEYSPACE1, key.getKey());
+ for (int c = 0; c < columns; c++)
+ {
+ rm.add(CF_STANDARDLVL2, Util.cellname("column" + c), value, 0);
+ }
+ rm.apply();
+ store.forceBlockingFlush();
+ }
+
+ value = ByteBuffer.wrap(new byte[10 * 1024]); // 10 KB value
+ LeveledCompactionStrategyTest.waitForLeveling(store);
+ // wait for higher-level compactions to finish
+ store.disableAutoCompaction();
// Adds 10 partitions
for (int r = 0; r < 10; r++)
{
@@ -161,7 +184,7 @@ public class LongLeveledCompactionStrategyTest
Mutation rm = new Mutation(KEYSPACE1, key.getKey());
for (int c = 0; c < 10; c++)
{
- rm.add(CF_STANDARDLVL, Util.cellname("column" + c), value, 0);
+ rm.add(CF_STANDARDLVL2, Util.cellname("column" + c), value, 0);
}
rm.apply();
}
@@ -169,33 +192,40 @@ public class LongLeveledCompactionStrategyTest
//Flush sstable
store.forceBlockingFlush();
- Collection<SSTableReader> allSSTables = store.getSSTables();
- for (SSTableReader sstable : allSSTables)
+ store.runWithCompactionsDisabled(new Callable<Void>()
{
- if (sstable.getSSTableLevel() == 0)
+ public Void call() throws Exception
{
- System.out.println("Mutating L0-SSTABLE level to L1 to simulate a bug: " + sstable.getFilename());
- sstable.descriptor.getMetadataSerializer().mutateLevel(sstable.descriptor, 1);
- sstable.reloadSSTableMetadata();
- }
- }
+ Collection<SSTableReader> allSSTables = store.getSSTables();
+ for (SSTableReader sstable : allSSTables)
+ {
+ if (sstable.getSSTableLevel() == 0)
+ {
+ System.out.println("Mutating L0-SSTABLE level to L1 to simulate a bug: " + sstable.getFilename());
+ sstable.descriptor.getMetadataSerializer().mutateLevel(sstable.descriptor, 1);
+ sstable.reloadSSTableMetadata();
+ }
+ }
- try (AbstractCompactionStrategy.ScannerList scannerList = lcs.getScanners(allSSTables))
- {
- //Verify that leveled scanners will always iterate in ascending order (CASSANDRA-9935)
- for (ISSTableScanner scanner : scannerList.scanners)
- {
- DecoratedKey lastKey = null;
- while (scanner.hasNext())
+ try (AbstractCompactionStrategy.ScannerList scannerList = lcs.getScanners(allSSTables))
{
- OnDiskAtomIterator row = scanner.next();
- if (lastKey != null)
+ //Verify that leveled scanners will always iterate in ascending order (CASSANDRA-9935)
+ for (ISSTableScanner scanner : scannerList.scanners)
{
- assertTrue("row " + row.getKey() + " received out of order wrt " + lastKey, row.getKey().compareTo(lastKey) >= 0);
+ DecoratedKey lastKey = null;
+ while (scanner.hasNext())
+ {
+ OnDiskAtomIterator row = scanner.next();
+ if (lastKey != null)
+ {
+ assertTrue("row " + row.getKey() + " received out of order wrt " + lastKey, row.getKey().compareTo(lastKey) >= 0);
+ }
+ lastKey = row.getKey();
+ }
}
- lastKey = row.getKey();
}
+ return null;
}
- }
+ }, true);
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ffd5cc5/test/unit/org/apache/cassandra/SchemaLoader.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/SchemaLoader.java b/test/unit/org/apache/cassandra/SchemaLoader.java
index 2048f74..45748a9 100644
--- a/test/unit/org/apache/cassandra/SchemaLoader.java
+++ b/test/unit/org/apache/cassandra/SchemaLoader.java
@@ -180,6 +180,9 @@ public class SchemaLoader
standardCFMD(ks1, "StandardLeveled")
.compactionStrategyClass(LeveledCompactionStrategy.class)
.compactionStrategyOptions(leveledOptions),
+ standardCFMD(ks1, "StandardLeveled2")
+ .compactionStrategyClass(LeveledCompactionStrategy.class)
+ .compactionStrategyOptions(leveledOptions),
standardCFMD(ks1, "legacyleveled")
.compactionStrategyClass(LeveledCompactionStrategy.class)
.compactionStrategyOptions(leveledOptions),
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ffd5cc5/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
index 8b9ca08..0047678 100644
--- a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
@@ -207,7 +207,7 @@ public class LeveledCompactionStrategyTest
/**
* wait for leveled compaction to quiesce on the given columnfamily
*/
- private void waitForLeveling(ColumnFamilyStore cfs) throws InterruptedException
+ public static void waitForLeveling(ColumnFamilyStore cfs) throws InterruptedException
{
WrappingCompactionStrategy strategyManager = (WrappingCompactionStrategy)cfs.getCompactionStrategy();
while (true)
[06/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by yu...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/61f0c988
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/61f0c988
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/61f0c988
Branch: refs/heads/cassandra-3.0
Commit: 61f0c988f78c00fec2c4e028cfb793b84069f737
Parents: 51796ea 6ffd5cc
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Feb 23 11:01:32 2017 +0900
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Feb 23 11:01:32 2017 +0900
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../LongLeveledCompactionStrategyTest.java | 58 ++++++++++++--------
.../LeveledCompactionStrategyTest.java | 2 +-
3 files changed, 37 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/61f0c988/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index afda236,033b366..e978a5c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
-2.2.10
+3.0.12
+ * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
+ * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
+Merged from 2.2
+ * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
* Fix failing COPY TO STDOUT (CASSANDRA-12497)
* Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
* Exceptions encountered calling getSeeds() breaks OTC thread (CASSANDRA-13018)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/61f0c988/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
----------------------------------------------------------------------
diff --cc test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
index 79497aa,8e63006..562de22
--- a/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
+++ b/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
@@@ -53,9 -51,14 +55,11 @@@ public class LongLeveledCompactionStrat
leveledOptions.put("sstable_size_in_mb", "1");
SchemaLoader.prepareServer();
SchemaLoader.createKeyspace(KEYSPACE1,
- SimpleStrategy.class,
- KSMetaData.optsWithRF(1),
+ KeyspaceParams.simple(1),
SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARDLVL)
- .compactionStrategyClass(LeveledCompactionStrategy.class)
- .compactionStrategyOptions(leveledOptions),
++ .compaction(CompactionParams.lcs(leveledOptions)),
+ SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARDLVL2)
- .compactionStrategyClass(LeveledCompactionStrategy.class)
- .compactionStrategyOptions(leveledOptions));
+ .compaction(CompactionParams.lcs(leveledOptions)));
}
@Test
@@@ -145,15 -149,34 +149,14 @@@
@Test
public void testLeveledScanner() throws Exception
{
- testParallelLeveledCompaction();
Keyspace keyspace = Keyspace.open(KEYSPACE1);
- ColumnFamilyStore store = keyspace.getColumnFamilyStore(CF_STANDARDLVL);
- final ColumnFamilyStore store = keyspace.getColumnFamilyStore(CF_STANDARDLVL2);
- WrappingCompactionStrategy strategy = ((WrappingCompactionStrategy) store.getCompactionStrategy());
- final LeveledCompactionStrategy lcs = (LeveledCompactionStrategy) strategy.getWrappedStrategies().get(1);
-
- ByteBuffer value = ByteBuffer.wrap(new byte[100 * 1024]); // 100 KB value, make it easy to have multiple files
++ ColumnFamilyStore store = keyspace.getColumnFamilyStore(CF_STANDARDLVL2);
+ store.disableAutoCompaction();
- // Enough data to have a level 1 and 2
- int rows = 128;
- int columns = 10;
+ LeveledCompactionStrategy lcs = (LeveledCompactionStrategy)store.getCompactionStrategyManager().getStrategies().get(1);
- ByteBuffer value = ByteBuffer.wrap(new byte[10 * 1024]); // 10 KB value
- // Adds enough data to trigger multiple sstable per level
- for (int r = 0; r < rows; r++)
- {
- DecoratedKey key = Util.dk(String.valueOf(r));
- Mutation rm = new Mutation(KEYSPACE1, key.getKey());
- for (int c = 0; c < columns; c++)
- {
- rm.add(CF_STANDARDLVL2, Util.cellname("column" + c), value, 0);
- }
- rm.apply();
- store.forceBlockingFlush();
- }
++ ByteBuffer value = ByteBuffer.wrap(new byte[100 * 1024]); // 100 KB value, make it easy to have multiple files
- value = ByteBuffer.wrap(new byte[10 * 1024]); // 10 KB value
- LeveledCompactionStrategyTest.waitForLeveling(store);
- // wait for higher-level compactions to finish
- store.disableAutoCompaction();
// Adds 10 partitions
for (int r = 0; r < 10; r++)
{
@@@ -169,33 -192,40 +172,42 @@@
//Flush sstable
store.forceBlockingFlush();
- Iterable<SSTableReader> allSSTables = store.getSSTables(SSTableSet.LIVE);
- for (SSTableReader sstable : allSSTables)
+ store.runWithCompactionsDisabled(new Callable<Void>()
{
- if (sstable.getSSTableLevel() == 0)
+ public Void call() throws Exception
{
- System.out.println("Mutating L0-SSTABLE level to L1 to simulate a bug: " + sstable.getFilename());
- sstable.descriptor.getMetadataSerializer().mutateLevel(sstable.descriptor, 1);
- sstable.reloadSSTableMetadata();
- }
- }
- Collection<SSTableReader> allSSTables = store.getSSTables();
++ Iterable<SSTableReader> allSSTables = store.getSSTables(SSTableSet.LIVE);
+ for (SSTableReader sstable : allSSTables)
+ {
+ if (sstable.getSSTableLevel() == 0)
+ {
+ System.out.println("Mutating L0-SSTABLE level to L1 to simulate a bug: " + sstable.getFilename());
+ sstable.descriptor.getMetadataSerializer().mutateLevel(sstable.descriptor, 1);
+ sstable.reloadSSTableMetadata();
+ }
+ }
- try (AbstractCompactionStrategy.ScannerList scannerList = lcs.getScanners(Lists.newArrayList(allSSTables)))
- {
- //Verify that leveled scanners will always iterate in ascending order (CASSANDRA-9935)
- for (ISSTableScanner scanner : scannerList.scanners)
- {
- DecoratedKey lastKey = null;
- while (scanner.hasNext())
- try (AbstractCompactionStrategy.ScannerList scannerList = lcs.getScanners(allSSTables))
++ try (AbstractCompactionStrategy.ScannerList scannerList = lcs.getScanners(Lists.newArrayList(allSSTables)))
{
- UnfilteredRowIterator row = scanner.next();
- if (lastKey != null)
+ //Verify that leveled scanners will always iterate in ascending order (CASSANDRA-9935)
+ for (ISSTableScanner scanner : scannerList.scanners)
{
- assertTrue("row " + row.partitionKey() + " received out of order wrt " + lastKey, row.partitionKey().compareTo(lastKey) >= 0);
+ DecoratedKey lastKey = null;
+ while (scanner.hasNext())
+ {
- OnDiskAtomIterator row = scanner.next();
++ UnfilteredRowIterator row = scanner.next();
+ if (lastKey != null)
+ {
- assertTrue("row " + row.getKey() + " received out of order wrt " + lastKey, row.getKey().compareTo(lastKey) >= 0);
++ assertTrue("row " + row.partitionKey() + " received out of order wrt " + lastKey, row.partitionKey().compareTo(lastKey) >= 0);
+ }
- lastKey = row.getKey();
++ lastKey = row.partitionKey();
+ }
}
- lastKey = row.partitionKey();
}
+ return null;
}
- }
- }, true);
++ }, true, true);
++
++
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/61f0c988/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
index 1277209,0047678..636afe1
--- a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
@@@ -194,9 -207,9 +194,9 @@@ public class LeveledCompactionStrategyT
/**
* wait for leveled compaction to quiesce on the given columnfamily
*/
- private void waitForLeveling(ColumnFamilyStore cfs) throws InterruptedException
+ public static void waitForLeveling(ColumnFamilyStore cfs) throws InterruptedException
{
- WrappingCompactionStrategy strategyManager = (WrappingCompactionStrategy)cfs.getCompactionStrategy();
+ CompactionStrategyManager strategyManager = cfs.getCompactionStrategyManager();
while (true)
{
// since we run several compaction strategies we wait until L0 in all strategies is empty and
[09/10] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by yu...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b887ae94
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b887ae94
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b887ae94
Branch: refs/heads/trunk
Commit: b887ae944bfbdbd0a808e368acbbc507311fce0e
Parents: f624b14 61f0c98
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Feb 23 11:12:46 2017 +0900
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Feb 23 11:12:46 2017 +0900
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../LongLeveledCompactionStrategyTest.java | 50 ++++++++++++--------
2 files changed, 31 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b887ae94/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index ca490ba,e978a5c..3e38844
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -21,135 -23,6 +21,136 @@@ Merged from 3.0
live rows in sstabledump (CASSANDRA-13177)
* Provide user workaround when system_schema.columns does not contain entries
for a table that's in system_schema.tables (CASSANDRA-13180)
+Merged from 2.2:
++ * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
+ * Fix failing COPY TO STDOUT (CASSANDRA-12497)
+ * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
+ * Exceptions encountered calling getSeeds() breaks OTC thread (CASSANDRA-13018)
+ * Fix negative mean latency metric (CASSANDRA-12876)
+ * Use only one file pointer when creating commitlog segments (CASSANDRA-12539)
+Merged from 2.1:
+ * Log stacktrace of uncaught exceptions (CASSANDRA-13108)
+ * Use portable stderr for java error in startup (CASSANDRA-13211)
+ * Fix Thread Leak in OutboundTcpConnection (CASSANDRA-13204)
+ * Coalescing strategy can enter infinite loop (CASSANDRA-13159)
+
+3.10
+ * Fix secondary index queries regression (CASSANDRA-13013)
+ * Add duration type to the protocol V5 (CASSANDRA-12850)
+ * Fix duration type validation (CASSANDRA-13143)
+ * Fix flaky GcCompactionTest (CASSANDRA-12664)
+ * Fix TestHintedHandoff.hintedhandoff_decom_test (CASSANDRA-13058)
+ * Fixed query monitoring for range queries (CASSANDRA-13050)
+ * Remove outboundBindAny configuration property (CASSANDRA-12673)
+ * Use correct bounds for all-data range when filtering (CASSANDRA-12666)
+ * Remove timing window in test case (CASSANDRA-12875)
+ * Resolve unit testing without JCE security libraries installed (CASSANDRA-12945)
+ * Fix inconsistencies in cassandra-stress load balancing policy (CASSANDRA-12919)
+ * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
+ * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)
+ * Fix Murmur3PartitionerTest (CASSANDRA-12858)
+ * Move cqlsh syntax rules into separate module and allow easier customization (CASSANDRA-12897)
+ * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
+ * Fix cassandra-stress truncate option (CASSANDRA-12695)
+ * Fix crossNode value when receiving messages (CASSANDRA-12791)
+ * Don't load MX4J beans twice (CASSANDRA-12869)
+ * Extend native protocol request flags, add versions to SUPPORTED, and introduce ProtocolVersion enum (CASSANDRA-12838)
+ * Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
+ * remove net.mintern.primitive library due to license issue (CASSANDRA-12845)
+ * Properly format IPv6 addresses when logging JMX service URL (CASSANDRA-12454)
+ * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777)
+ * Use non-token restrictions for bounds when token restrictions are overridden (CASSANDRA-12419)
+ * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
+ * Use different build directories for Eclipse and Ant (CASSANDRA-12466)
+ * Avoid potential AttributeError in cqlsh due to no table metadata (CASSANDRA-12815)
+ * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster (CASSANDRA-12812)
+ * Upgrade commons-codec to 1.9 (CASSANDRA-12790)
+ * Make the fanout size for LeveledCompactionStrategy to be configurable (CASSANDRA-11550)
+ * Add duration data type (CASSANDRA-11873)
+ * Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784)
+ * Improve sum aggregate functions (CASSANDRA-12417)
+ * Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes in CASSANDRA-10876 (CASSANDRA-12761)
+ * cqlsh fails to format collections when using aliases (CASSANDRA-11534)
+ * Check for hash conflicts in prepared statements (CASSANDRA-12733)
+ * Exit query parsing upon first error (CASSANDRA-12598)
+ * Fix cassandra-stress to use single seed in UUID generation (CASSANDRA-12729)
+ * CQLSSTableWriter does not allow Update statement (CASSANDRA-12450)
+ * Config class uses boxed types but DD exposes primitive types (CASSANDRA-12199)
+ * Add pre- and post-shutdown hooks to Storage Service (CASSANDRA-12461)
+ * Add hint delivery metrics (CASSANDRA-12693)
+ * Remove IndexInfo cache from FileIndexInfoRetriever (CASSANDRA-12731)
+ * ColumnIndex does not reuse buffer (CASSANDRA-12502)
+ * cdc column addition still breaks schema migration tasks (CASSANDRA-12697)
+ * Upgrade metrics-reporter dependencies (CASSANDRA-12089)
+ * Tune compaction thread count via nodetool (CASSANDRA-12248)
+ * Add +=/-= shortcut syntax for update queries (CASSANDRA-12232)
+ * Include repair session IDs in repair start message (CASSANDRA-12532)
+ * Add a blocking task to Index, run before joining the ring (CASSANDRA-12039)
+ * Fix NPE when using CQLSSTableWriter (CASSANDRA-12667)
+ * Support optional backpressure strategies at the coordinator (CASSANDRA-9318)
+ * Make randompartitioner work with new vnode allocation (CASSANDRA-12647)
+ * Fix cassandra-stress graphing (CASSANDRA-12237)
+ * Allow filtering on partition key columns for queries without secondary indexes (CASSANDRA-11031)
+ * Fix Cassandra Stress reporting thread model and precision (CASSANDRA-12585)
+ * Add JMH benchmarks.jar (CASSANDRA-12586)
+ * Cleanup uses of AlterTableStatementColumn (CASSANDRA-12567)
+ * Add keep-alive to streaming (CASSANDRA-11841)
+ * Tracing payload is passed through newSession(..) (CASSANDRA-11706)
+ * avoid deleting non existing sstable files and improve related log messages (CASSANDRA-12261)
+ * json/yaml output format for nodetool compactionhistory (CASSANDRA-12486)
+ * Retry all internode messages once after a connection is
+ closed and reopened (CASSANDRA-12192)
+ * Add support to rebuild from targeted replica (CASSANDRA-9875)
+ * Add sequence distribution type to cassandra stress (CASSANDRA-12490)
+ * "SELECT * FROM foo LIMIT ;" does not error out (CASSANDRA-12154)
+ * Define executeLocally() at the ReadQuery Level (CASSANDRA-12474)
+ * Extend read/write failure messages with a map of replica addresses
+ to error codes in the v5 native protocol (CASSANDRA-12311)
+ * Fix rebuild of SASI indexes with existing index files (CASSANDRA-12374)
+ * Let DatabaseDescriptor not implicitly startup services (CASSANDRA-9054, 12550)
+ * Fix clustering indexes in presence of static columns in SASI (CASSANDRA-12378)
+ * Fix queries on columns with reversed type on SASI indexes (CASSANDRA-12223)
+ * Added slow query log (CASSANDRA-12403)
+ * Count full coordinated request against timeout (CASSANDRA-12256)
+ * Allow TTL with null value on insert and update (CASSANDRA-12216)
+ * Make decommission operation resumable (CASSANDRA-12008)
+ * Add support to one-way targeted repair (CASSANDRA-9876)
+ * Remove clientutil jar (CASSANDRA-11635)
+ * Fix compaction throughput throttle (CASSANDRA-12366, CASSANDRA-12717)
+ * Delay releasing Memtable memory on flush until PostFlush has finished running (CASSANDRA-12358)
+ * Cassandra stress should dump all setting on startup (CASSANDRA-11914)
+ * Make it possible to compact a given token range (CASSANDRA-10643)
+ * Allow updating DynamicEndpointSnitch properties via JMX (CASSANDRA-12179)
+ * Collect metrics on queries by consistency level (CASSANDRA-7384)
+ * Add support for GROUP BY to SELECT statement (CASSANDRA-10707)
+ * Deprecate memtable_cleanup_threshold and update default for memtable_flush_writers (CASSANDRA-12228)
+ * Upgrade to OHC 0.4.4 (CASSANDRA-12133)
+ * Add version command to cassandra-stress (CASSANDRA-12258)
+ * Create compaction-stress tool (CASSANDRA-11844)
+ * Garbage-collecting compaction operation and schema option (CASSANDRA-7019)
+ * Add beta protocol flag for v5 native protocol (CASSANDRA-12142)
+ * Support filtering on non-PRIMARY KEY columns in the CREATE
+ MATERIALIZED VIEW statement's WHERE clause (CASSANDRA-10368)
+ * Unify STDOUT and SYSTEMLOG logback format (CASSANDRA-12004)
+ * COPY FROM should raise error for non-existing input files (CASSANDRA-12174)
+ * Faster write path (CASSANDRA-12269)
+ * Option to leave omitted columns in INSERT JSON unset (CASSANDRA-11424)
+ * Support json/yaml output in nodetool tpstats (CASSANDRA-12035)
+ * Expose metrics for successful/failed authentication attempts (CASSANDRA-10635)
+ * Prepend snapshot name with "truncated" or "dropped" when a snapshot
+ is taken before truncating or dropping a table (CASSANDRA-12178)
+ * Optimize RestrictionSet (CASSANDRA-12153)
+ * cqlsh does not automatically downgrade CQL version (CASSANDRA-12150)
+ * Omit (de)serialization of state variable in UDAs (CASSANDRA-9613)
+ * Create a system table to expose prepared statements (CASSANDRA-8831)
+ * Reuse DataOutputBuffer from ColumnIndex (CASSANDRA-11970)
+ * Remove DatabaseDescriptor dependency from SegmentedFile (CASSANDRA-11580)
+ * Add supplied username to authentication error messages (CASSANDRA-12076)
+ * Remove pre-startup check for open JMX port (CASSANDRA-12074)
+ * Remove compaction Severity from DynamicEndpointSnitch (CASSANDRA-11738)
+ * Restore resumable hints delivery (CASSANDRA-11960)
+ * Properly report LWT contention (CASSANDRA-12626)
+Merged from 3.0:
* Dump threads when unit tests time out (CASSANDRA-13117)
* Better error when modifying function permissions without explicit keyspace (CASSANDRA-12925)
* Indexer is not correctly invoked when building indexes over sstables (CASSANDRA-13075)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b887ae94/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
----------------------------------------------------------------------
[03/10] cassandra git commit: run
LongLeveledCompactionStrategyTest.testLeveledScanner in a separate table
Posted by yu...@apache.org.
run LongLeveledCompactionStrategyTest.testLeveledScanner in a separate table
patch by marcuse; reviewed by yukim for CASSANDRA-12202
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6ffd5cc5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6ffd5cc5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6ffd5cc5
Branch: refs/heads/cassandra-3.11
Commit: 6ffd5cc5d28658b4d058de79a9bea9c10a82c8d4
Parents: 88f36a0
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Jul 14 15:31:30 2016 +0200
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Feb 23 10:35:50 2017 +0900
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../LongLeveledCompactionStrategyTest.java | 84 +++++++++++++-------
.../unit/org/apache/cassandra/SchemaLoader.java | 3 +
.../LeveledCompactionStrategyTest.java | 2 +-
4 files changed, 62 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ffd5cc5/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1a22814..033b366 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.10
+ * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
* Fix failing COPY TO STDOUT (CASSANDRA-12497)
* Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
* Exceptions encountered calling getSeeds() breaks OTC thread (CASSANDRA-13018)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ffd5cc5/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
----------------------------------------------------------------------
diff --git a/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java b/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
index 5439a72..8e63006 100644
--- a/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
+++ b/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
@@ -25,6 +25,7 @@ import org.apache.cassandra.db.columniterator.OnDiskAtomIterator;
import org.apache.cassandra.io.sstable.ISSTableScanner;
import org.apache.cassandra.io.sstable.format.SSTableReader;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
import org.apache.cassandra.SchemaLoader;
@@ -41,6 +42,7 @@ public class LongLeveledCompactionStrategyTest
{
public static final String KEYSPACE1 = "LongLeveledCompactionStrategyTest";
public static final String CF_STANDARDLVL = "StandardLeveled";
+ public static final String CF_STANDARDLVL2 = "StandardLeveled2";
@BeforeClass
public static void defineSchema() throws ConfigurationException
@@ -53,6 +55,9 @@ public class LongLeveledCompactionStrategyTest
KSMetaData.optsWithRF(1),
SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARDLVL)
.compactionStrategyClass(LeveledCompactionStrategy.class)
+ .compactionStrategyOptions(leveledOptions),
+ SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARDLVL2)
+ .compactionStrategyClass(LeveledCompactionStrategy.class)
.compactionStrategyOptions(leveledOptions));
}
@@ -144,16 +149,34 @@ public class LongLeveledCompactionStrategyTest
@Test
public void testLeveledScanner() throws Exception
{
- testParallelLeveledCompaction();
Keyspace keyspace = Keyspace.open(KEYSPACE1);
- ColumnFamilyStore store = keyspace.getColumnFamilyStore(CF_STANDARDLVL);
- store.disableAutoCompaction();
-
+ final ColumnFamilyStore store = keyspace.getColumnFamilyStore(CF_STANDARDLVL2);
WrappingCompactionStrategy strategy = ((WrappingCompactionStrategy) store.getCompactionStrategy());
- LeveledCompactionStrategy lcs = (LeveledCompactionStrategy) strategy.getWrappedStrategies().get(1);
+ final LeveledCompactionStrategy lcs = (LeveledCompactionStrategy) strategy.getWrappedStrategies().get(1);
- ByteBuffer value = ByteBuffer.wrap(new byte[10 * 1024]); // 10 KB value
+ ByteBuffer value = ByteBuffer.wrap(new byte[100 * 1024]); // 100 KB value, make it easy to have multiple files
+
+ // Enough data to have a level 1 and 2
+ int rows = 128;
+ int columns = 10;
+ // Adds enough data to trigger multiple sstable per level
+ for (int r = 0; r < rows; r++)
+ {
+ DecoratedKey key = Util.dk(String.valueOf(r));
+ Mutation rm = new Mutation(KEYSPACE1, key.getKey());
+ for (int c = 0; c < columns; c++)
+ {
+ rm.add(CF_STANDARDLVL2, Util.cellname("column" + c), value, 0);
+ }
+ rm.apply();
+ store.forceBlockingFlush();
+ }
+
+ value = ByteBuffer.wrap(new byte[10 * 1024]); // 10 KB value
+ LeveledCompactionStrategyTest.waitForLeveling(store);
+ // wait for higher-level compactions to finish
+ store.disableAutoCompaction();
// Adds 10 partitions
for (int r = 0; r < 10; r++)
{
@@ -161,7 +184,7 @@ public class LongLeveledCompactionStrategyTest
Mutation rm = new Mutation(KEYSPACE1, key.getKey());
for (int c = 0; c < 10; c++)
{
- rm.add(CF_STANDARDLVL, Util.cellname("column" + c), value, 0);
+ rm.add(CF_STANDARDLVL2, Util.cellname("column" + c), value, 0);
}
rm.apply();
}
@@ -169,33 +192,40 @@ public class LongLeveledCompactionStrategyTest
//Flush sstable
store.forceBlockingFlush();
- Collection<SSTableReader> allSSTables = store.getSSTables();
- for (SSTableReader sstable : allSSTables)
+ store.runWithCompactionsDisabled(new Callable<Void>()
{
- if (sstable.getSSTableLevel() == 0)
+ public Void call() throws Exception
{
- System.out.println("Mutating L0-SSTABLE level to L1 to simulate a bug: " + sstable.getFilename());
- sstable.descriptor.getMetadataSerializer().mutateLevel(sstable.descriptor, 1);
- sstable.reloadSSTableMetadata();
- }
- }
+ Collection<SSTableReader> allSSTables = store.getSSTables();
+ for (SSTableReader sstable : allSSTables)
+ {
+ if (sstable.getSSTableLevel() == 0)
+ {
+ System.out.println("Mutating L0-SSTABLE level to L1 to simulate a bug: " + sstable.getFilename());
+ sstable.descriptor.getMetadataSerializer().mutateLevel(sstable.descriptor, 1);
+ sstable.reloadSSTableMetadata();
+ }
+ }
- try (AbstractCompactionStrategy.ScannerList scannerList = lcs.getScanners(allSSTables))
- {
- //Verify that leveled scanners will always iterate in ascending order (CASSANDRA-9935)
- for (ISSTableScanner scanner : scannerList.scanners)
- {
- DecoratedKey lastKey = null;
- while (scanner.hasNext())
+ try (AbstractCompactionStrategy.ScannerList scannerList = lcs.getScanners(allSSTables))
{
- OnDiskAtomIterator row = scanner.next();
- if (lastKey != null)
+ //Verify that leveled scanners will always iterate in ascending order (CASSANDRA-9935)
+ for (ISSTableScanner scanner : scannerList.scanners)
{
- assertTrue("row " + row.getKey() + " received out of order wrt " + lastKey, row.getKey().compareTo(lastKey) >= 0);
+ DecoratedKey lastKey = null;
+ while (scanner.hasNext())
+ {
+ OnDiskAtomIterator row = scanner.next();
+ if (lastKey != null)
+ {
+ assertTrue("row " + row.getKey() + " received out of order wrt " + lastKey, row.getKey().compareTo(lastKey) >= 0);
+ }
+ lastKey = row.getKey();
+ }
}
- lastKey = row.getKey();
}
+ return null;
}
- }
+ }, true);
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ffd5cc5/test/unit/org/apache/cassandra/SchemaLoader.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/SchemaLoader.java b/test/unit/org/apache/cassandra/SchemaLoader.java
index 2048f74..45748a9 100644
--- a/test/unit/org/apache/cassandra/SchemaLoader.java
+++ b/test/unit/org/apache/cassandra/SchemaLoader.java
@@ -180,6 +180,9 @@ public class SchemaLoader
standardCFMD(ks1, "StandardLeveled")
.compactionStrategyClass(LeveledCompactionStrategy.class)
.compactionStrategyOptions(leveledOptions),
+ standardCFMD(ks1, "StandardLeveled2")
+ .compactionStrategyClass(LeveledCompactionStrategy.class)
+ .compactionStrategyOptions(leveledOptions),
standardCFMD(ks1, "legacyleveled")
.compactionStrategyClass(LeveledCompactionStrategy.class)
.compactionStrategyOptions(leveledOptions),
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ffd5cc5/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
index 8b9ca08..0047678 100644
--- a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
@@ -207,7 +207,7 @@ public class LeveledCompactionStrategyTest
/**
* wait for leveled compaction to quiesce on the given columnfamily
*/
- private void waitForLeveling(ColumnFamilyStore cfs) throws InterruptedException
+ public static void waitForLeveling(ColumnFamilyStore cfs) throws InterruptedException
{
WrappingCompactionStrategy strategyManager = (WrappingCompactionStrategy)cfs.getCompactionStrategy();
while (true)
[04/10] cassandra git commit: run
LongLeveledCompactionStrategyTest.testLeveledScanner in a separate table
Posted by yu...@apache.org.
run LongLeveledCompactionStrategyTest.testLeveledScanner in a separate table
patch by marcuse; reviewed by yukim for CASSANDRA-12202
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6ffd5cc5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6ffd5cc5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6ffd5cc5
Branch: refs/heads/trunk
Commit: 6ffd5cc5d28658b4d058de79a9bea9c10a82c8d4
Parents: 88f36a0
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Jul 14 15:31:30 2016 +0200
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Feb 23 10:35:50 2017 +0900
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../LongLeveledCompactionStrategyTest.java | 84 +++++++++++++-------
.../unit/org/apache/cassandra/SchemaLoader.java | 3 +
.../LeveledCompactionStrategyTest.java | 2 +-
4 files changed, 62 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ffd5cc5/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1a22814..033b366 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.10
+ * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
* Fix failing COPY TO STDOUT (CASSANDRA-12497)
* Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
* Exceptions encountered calling getSeeds() breaks OTC thread (CASSANDRA-13018)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ffd5cc5/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
----------------------------------------------------------------------
diff --git a/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java b/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
index 5439a72..8e63006 100644
--- a/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
+++ b/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
@@ -25,6 +25,7 @@ import org.apache.cassandra.db.columniterator.OnDiskAtomIterator;
import org.apache.cassandra.io.sstable.ISSTableScanner;
import org.apache.cassandra.io.sstable.format.SSTableReader;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
import org.apache.cassandra.SchemaLoader;
@@ -41,6 +42,7 @@ public class LongLeveledCompactionStrategyTest
{
public static final String KEYSPACE1 = "LongLeveledCompactionStrategyTest";
public static final String CF_STANDARDLVL = "StandardLeveled";
+ public static final String CF_STANDARDLVL2 = "StandardLeveled2";
@BeforeClass
public static void defineSchema() throws ConfigurationException
@@ -53,6 +55,9 @@ public class LongLeveledCompactionStrategyTest
KSMetaData.optsWithRF(1),
SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARDLVL)
.compactionStrategyClass(LeveledCompactionStrategy.class)
+ .compactionStrategyOptions(leveledOptions),
+ SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARDLVL2)
+ .compactionStrategyClass(LeveledCompactionStrategy.class)
.compactionStrategyOptions(leveledOptions));
}
@@ -144,16 +149,34 @@ public class LongLeveledCompactionStrategyTest
@Test
public void testLeveledScanner() throws Exception
{
- testParallelLeveledCompaction();
Keyspace keyspace = Keyspace.open(KEYSPACE1);
- ColumnFamilyStore store = keyspace.getColumnFamilyStore(CF_STANDARDLVL);
- store.disableAutoCompaction();
-
+ final ColumnFamilyStore store = keyspace.getColumnFamilyStore(CF_STANDARDLVL2);
WrappingCompactionStrategy strategy = ((WrappingCompactionStrategy) store.getCompactionStrategy());
- LeveledCompactionStrategy lcs = (LeveledCompactionStrategy) strategy.getWrappedStrategies().get(1);
+ final LeveledCompactionStrategy lcs = (LeveledCompactionStrategy) strategy.getWrappedStrategies().get(1);
- ByteBuffer value = ByteBuffer.wrap(new byte[10 * 1024]); // 10 KB value
+ ByteBuffer value = ByteBuffer.wrap(new byte[100 * 1024]); // 100 KB value, make it easy to have multiple files
+
+ // Enough data to have a level 1 and 2
+ int rows = 128;
+ int columns = 10;
+ // Adds enough data to trigger multiple sstable per level
+ for (int r = 0; r < rows; r++)
+ {
+ DecoratedKey key = Util.dk(String.valueOf(r));
+ Mutation rm = new Mutation(KEYSPACE1, key.getKey());
+ for (int c = 0; c < columns; c++)
+ {
+ rm.add(CF_STANDARDLVL2, Util.cellname("column" + c), value, 0);
+ }
+ rm.apply();
+ store.forceBlockingFlush();
+ }
+
+ value = ByteBuffer.wrap(new byte[10 * 1024]); // 10 KB value
+ LeveledCompactionStrategyTest.waitForLeveling(store);
+ // wait for higher-level compactions to finish
+ store.disableAutoCompaction();
// Adds 10 partitions
for (int r = 0; r < 10; r++)
{
@@ -161,7 +184,7 @@ public class LongLeveledCompactionStrategyTest
Mutation rm = new Mutation(KEYSPACE1, key.getKey());
for (int c = 0; c < 10; c++)
{
- rm.add(CF_STANDARDLVL, Util.cellname("column" + c), value, 0);
+ rm.add(CF_STANDARDLVL2, Util.cellname("column" + c), value, 0);
}
rm.apply();
}
@@ -169,33 +192,40 @@ public class LongLeveledCompactionStrategyTest
//Flush sstable
store.forceBlockingFlush();
- Collection<SSTableReader> allSSTables = store.getSSTables();
- for (SSTableReader sstable : allSSTables)
+ store.runWithCompactionsDisabled(new Callable<Void>()
{
- if (sstable.getSSTableLevel() == 0)
+ public Void call() throws Exception
{
- System.out.println("Mutating L0-SSTABLE level to L1 to simulate a bug: " + sstable.getFilename());
- sstable.descriptor.getMetadataSerializer().mutateLevel(sstable.descriptor, 1);
- sstable.reloadSSTableMetadata();
- }
- }
+ Collection<SSTableReader> allSSTables = store.getSSTables();
+ for (SSTableReader sstable : allSSTables)
+ {
+ if (sstable.getSSTableLevel() == 0)
+ {
+ System.out.println("Mutating L0-SSTABLE level to L1 to simulate a bug: " + sstable.getFilename());
+ sstable.descriptor.getMetadataSerializer().mutateLevel(sstable.descriptor, 1);
+ sstable.reloadSSTableMetadata();
+ }
+ }
- try (AbstractCompactionStrategy.ScannerList scannerList = lcs.getScanners(allSSTables))
- {
- //Verify that leveled scanners will always iterate in ascending order (CASSANDRA-9935)
- for (ISSTableScanner scanner : scannerList.scanners)
- {
- DecoratedKey lastKey = null;
- while (scanner.hasNext())
+ try (AbstractCompactionStrategy.ScannerList scannerList = lcs.getScanners(allSSTables))
{
- OnDiskAtomIterator row = scanner.next();
- if (lastKey != null)
+ //Verify that leveled scanners will always iterate in ascending order (CASSANDRA-9935)
+ for (ISSTableScanner scanner : scannerList.scanners)
{
- assertTrue("row " + row.getKey() + " received out of order wrt " + lastKey, row.getKey().compareTo(lastKey) >= 0);
+ DecoratedKey lastKey = null;
+ while (scanner.hasNext())
+ {
+ OnDiskAtomIterator row = scanner.next();
+ if (lastKey != null)
+ {
+ assertTrue("row " + row.getKey() + " received out of order wrt " + lastKey, row.getKey().compareTo(lastKey) >= 0);
+ }
+ lastKey = row.getKey();
+ }
}
- lastKey = row.getKey();
}
+ return null;
}
- }
+ }, true);
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ffd5cc5/test/unit/org/apache/cassandra/SchemaLoader.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/SchemaLoader.java b/test/unit/org/apache/cassandra/SchemaLoader.java
index 2048f74..45748a9 100644
--- a/test/unit/org/apache/cassandra/SchemaLoader.java
+++ b/test/unit/org/apache/cassandra/SchemaLoader.java
@@ -180,6 +180,9 @@ public class SchemaLoader
standardCFMD(ks1, "StandardLeveled")
.compactionStrategyClass(LeveledCompactionStrategy.class)
.compactionStrategyOptions(leveledOptions),
+ standardCFMD(ks1, "StandardLeveled2")
+ .compactionStrategyClass(LeveledCompactionStrategy.class)
+ .compactionStrategyOptions(leveledOptions),
standardCFMD(ks1, "legacyleveled")
.compactionStrategyClass(LeveledCompactionStrategy.class)
.compactionStrategyOptions(leveledOptions),
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ffd5cc5/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
index 8b9ca08..0047678 100644
--- a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
@@ -207,7 +207,7 @@ public class LeveledCompactionStrategyTest
/**
* wait for leveled compaction to quiesce on the given columnfamily
*/
- private void waitForLeveling(ColumnFamilyStore cfs) throws InterruptedException
+ public static void waitForLeveling(ColumnFamilyStore cfs) throws InterruptedException
{
WrappingCompactionStrategy strategyManager = (WrappingCompactionStrategy)cfs.getCompactionStrategy();
while (true)
[07/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by yu...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/61f0c988
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/61f0c988
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/61f0c988
Branch: refs/heads/trunk
Commit: 61f0c988f78c00fec2c4e028cfb793b84069f737
Parents: 51796ea 6ffd5cc
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Feb 23 11:01:32 2017 +0900
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Feb 23 11:01:32 2017 +0900
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../LongLeveledCompactionStrategyTest.java | 58 ++++++++++++--------
.../LeveledCompactionStrategyTest.java | 2 +-
3 files changed, 37 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/61f0c988/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index afda236,033b366..e978a5c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
-2.2.10
+3.0.12
+ * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
+ * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
+Merged from 2.2
+ * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
* Fix failing COPY TO STDOUT (CASSANDRA-12497)
* Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
* Exceptions encountered calling getSeeds() breaks OTC thread (CASSANDRA-13018)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/61f0c988/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
----------------------------------------------------------------------
diff --cc test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
index 79497aa,8e63006..562de22
--- a/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
+++ b/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
@@@ -53,9 -51,14 +55,11 @@@ public class LongLeveledCompactionStrat
leveledOptions.put("sstable_size_in_mb", "1");
SchemaLoader.prepareServer();
SchemaLoader.createKeyspace(KEYSPACE1,
- SimpleStrategy.class,
- KSMetaData.optsWithRF(1),
+ KeyspaceParams.simple(1),
SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARDLVL)
- .compactionStrategyClass(LeveledCompactionStrategy.class)
- .compactionStrategyOptions(leveledOptions),
++ .compaction(CompactionParams.lcs(leveledOptions)),
+ SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARDLVL2)
- .compactionStrategyClass(LeveledCompactionStrategy.class)
- .compactionStrategyOptions(leveledOptions));
+ .compaction(CompactionParams.lcs(leveledOptions)));
}
@Test
@@@ -145,15 -149,34 +149,14 @@@
@Test
public void testLeveledScanner() throws Exception
{
- testParallelLeveledCompaction();
Keyspace keyspace = Keyspace.open(KEYSPACE1);
- ColumnFamilyStore store = keyspace.getColumnFamilyStore(CF_STANDARDLVL);
- final ColumnFamilyStore store = keyspace.getColumnFamilyStore(CF_STANDARDLVL2);
- WrappingCompactionStrategy strategy = ((WrappingCompactionStrategy) store.getCompactionStrategy());
- final LeveledCompactionStrategy lcs = (LeveledCompactionStrategy) strategy.getWrappedStrategies().get(1);
-
- ByteBuffer value = ByteBuffer.wrap(new byte[100 * 1024]); // 100 KB value, make it easy to have multiple files
++ ColumnFamilyStore store = keyspace.getColumnFamilyStore(CF_STANDARDLVL2);
+ store.disableAutoCompaction();
- // Enough data to have a level 1 and 2
- int rows = 128;
- int columns = 10;
+ LeveledCompactionStrategy lcs = (LeveledCompactionStrategy)store.getCompactionStrategyManager().getStrategies().get(1);
- ByteBuffer value = ByteBuffer.wrap(new byte[10 * 1024]); // 10 KB value
- // Adds enough data to trigger multiple sstable per level
- for (int r = 0; r < rows; r++)
- {
- DecoratedKey key = Util.dk(String.valueOf(r));
- Mutation rm = new Mutation(KEYSPACE1, key.getKey());
- for (int c = 0; c < columns; c++)
- {
- rm.add(CF_STANDARDLVL2, Util.cellname("column" + c), value, 0);
- }
- rm.apply();
- store.forceBlockingFlush();
- }
++ ByteBuffer value = ByteBuffer.wrap(new byte[100 * 1024]); // 100 KB value, make it easy to have multiple files
- value = ByteBuffer.wrap(new byte[10 * 1024]); // 10 KB value
- LeveledCompactionStrategyTest.waitForLeveling(store);
- // wait for higher-level compactions to finish
- store.disableAutoCompaction();
// Adds 10 partitions
for (int r = 0; r < 10; r++)
{
@@@ -169,33 -192,40 +172,42 @@@
//Flush sstable
store.forceBlockingFlush();
- Iterable<SSTableReader> allSSTables = store.getSSTables(SSTableSet.LIVE);
- for (SSTableReader sstable : allSSTables)
+ store.runWithCompactionsDisabled(new Callable<Void>()
{
- if (sstable.getSSTableLevel() == 0)
+ public Void call() throws Exception
{
- System.out.println("Mutating L0-SSTABLE level to L1 to simulate a bug: " + sstable.getFilename());
- sstable.descriptor.getMetadataSerializer().mutateLevel(sstable.descriptor, 1);
- sstable.reloadSSTableMetadata();
- }
- }
- Collection<SSTableReader> allSSTables = store.getSSTables();
++ Iterable<SSTableReader> allSSTables = store.getSSTables(SSTableSet.LIVE);
+ for (SSTableReader sstable : allSSTables)
+ {
+ if (sstable.getSSTableLevel() == 0)
+ {
+ System.out.println("Mutating L0-SSTABLE level to L1 to simulate a bug: " + sstable.getFilename());
+ sstable.descriptor.getMetadataSerializer().mutateLevel(sstable.descriptor, 1);
+ sstable.reloadSSTableMetadata();
+ }
+ }
- try (AbstractCompactionStrategy.ScannerList scannerList = lcs.getScanners(Lists.newArrayList(allSSTables)))
- {
- //Verify that leveled scanners will always iterate in ascending order (CASSANDRA-9935)
- for (ISSTableScanner scanner : scannerList.scanners)
- {
- DecoratedKey lastKey = null;
- while (scanner.hasNext())
- try (AbstractCompactionStrategy.ScannerList scannerList = lcs.getScanners(allSSTables))
++ try (AbstractCompactionStrategy.ScannerList scannerList = lcs.getScanners(Lists.newArrayList(allSSTables)))
{
- UnfilteredRowIterator row = scanner.next();
- if (lastKey != null)
+ //Verify that leveled scanners will always iterate in ascending order (CASSANDRA-9935)
+ for (ISSTableScanner scanner : scannerList.scanners)
{
- assertTrue("row " + row.partitionKey() + " received out of order wrt " + lastKey, row.partitionKey().compareTo(lastKey) >= 0);
+ DecoratedKey lastKey = null;
+ while (scanner.hasNext())
+ {
- OnDiskAtomIterator row = scanner.next();
++ UnfilteredRowIterator row = scanner.next();
+ if (lastKey != null)
+ {
- assertTrue("row " + row.getKey() + " received out of order wrt " + lastKey, row.getKey().compareTo(lastKey) >= 0);
++ assertTrue("row " + row.partitionKey() + " received out of order wrt " + lastKey, row.partitionKey().compareTo(lastKey) >= 0);
+ }
- lastKey = row.getKey();
++ lastKey = row.partitionKey();
+ }
}
- lastKey = row.partitionKey();
}
+ return null;
}
- }
- }, true);
++ }, true, true);
++
++
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/61f0c988/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
index 1277209,0047678..636afe1
--- a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
@@@ -194,9 -207,9 +194,9 @@@ public class LeveledCompactionStrategyT
/**
* wait for leveled compaction to quiesce on the given columnfamily
*/
- private void waitForLeveling(ColumnFamilyStore cfs) throws InterruptedException
+ public static void waitForLeveling(ColumnFamilyStore cfs) throws InterruptedException
{
- WrappingCompactionStrategy strategyManager = (WrappingCompactionStrategy)cfs.getCompactionStrategy();
+ CompactionStrategyManager strategyManager = cfs.getCompactionStrategyManager();
while (true)
{
// since we run several compaction strategies we wait until L0 in all strategies is empty and
[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by yu...@apache.org.
Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ac210130
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac210130
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ac210130
Branch: refs/heads/trunk
Commit: ac2101305722c81542ff8572b0fa082794846a7f
Parents: fbf7e12 b887ae9
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Feb 23 11:13:13 2017 +0900
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Feb 23 11:13:13 2017 +0900
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../LongLeveledCompactionStrategyTest.java | 50 ++++++++++++--------
2 files changed, 31 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac210130/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac210130/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
----------------------------------------------------------------------
[02/10] cassandra git commit: run
LongLeveledCompactionStrategyTest.testLeveledScanner in a separate table
Posted by yu...@apache.org.
run LongLeveledCompactionStrategyTest.testLeveledScanner in a separate table
patch by marcuse; reviewed by yukim for CASSANDRA-12202
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6ffd5cc5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6ffd5cc5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6ffd5cc5
Branch: refs/heads/cassandra-3.0
Commit: 6ffd5cc5d28658b4d058de79a9bea9c10a82c8d4
Parents: 88f36a0
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Jul 14 15:31:30 2016 +0200
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Feb 23 10:35:50 2017 +0900
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../LongLeveledCompactionStrategyTest.java | 84 +++++++++++++-------
.../unit/org/apache/cassandra/SchemaLoader.java | 3 +
.../LeveledCompactionStrategyTest.java | 2 +-
4 files changed, 62 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ffd5cc5/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1a22814..033b366 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.10
+ * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
* Fix failing COPY TO STDOUT (CASSANDRA-12497)
* Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
* Exceptions encountered calling getSeeds() breaks OTC thread (CASSANDRA-13018)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ffd5cc5/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
----------------------------------------------------------------------
diff --git a/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java b/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
index 5439a72..8e63006 100644
--- a/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
+++ b/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
@@ -25,6 +25,7 @@ import org.apache.cassandra.db.columniterator.OnDiskAtomIterator;
import org.apache.cassandra.io.sstable.ISSTableScanner;
import org.apache.cassandra.io.sstable.format.SSTableReader;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
import org.apache.cassandra.SchemaLoader;
@@ -41,6 +42,7 @@ public class LongLeveledCompactionStrategyTest
{
public static final String KEYSPACE1 = "LongLeveledCompactionStrategyTest";
public static final String CF_STANDARDLVL = "StandardLeveled";
+ public static final String CF_STANDARDLVL2 = "StandardLeveled2";
@BeforeClass
public static void defineSchema() throws ConfigurationException
@@ -53,6 +55,9 @@ public class LongLeveledCompactionStrategyTest
KSMetaData.optsWithRF(1),
SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARDLVL)
.compactionStrategyClass(LeveledCompactionStrategy.class)
+ .compactionStrategyOptions(leveledOptions),
+ SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARDLVL2)
+ .compactionStrategyClass(LeveledCompactionStrategy.class)
.compactionStrategyOptions(leveledOptions));
}
@@ -144,16 +149,34 @@ public class LongLeveledCompactionStrategyTest
@Test
public void testLeveledScanner() throws Exception
{
- testParallelLeveledCompaction();
Keyspace keyspace = Keyspace.open(KEYSPACE1);
- ColumnFamilyStore store = keyspace.getColumnFamilyStore(CF_STANDARDLVL);
- store.disableAutoCompaction();
-
+ final ColumnFamilyStore store = keyspace.getColumnFamilyStore(CF_STANDARDLVL2);
WrappingCompactionStrategy strategy = ((WrappingCompactionStrategy) store.getCompactionStrategy());
- LeveledCompactionStrategy lcs = (LeveledCompactionStrategy) strategy.getWrappedStrategies().get(1);
+ final LeveledCompactionStrategy lcs = (LeveledCompactionStrategy) strategy.getWrappedStrategies().get(1);
- ByteBuffer value = ByteBuffer.wrap(new byte[10 * 1024]); // 10 KB value
+ ByteBuffer value = ByteBuffer.wrap(new byte[100 * 1024]); // 100 KB value, make it easy to have multiple files
+
+ // Enough data to have a level 1 and 2
+ int rows = 128;
+ int columns = 10;
+ // Adds enough data to trigger multiple sstable per level
+ for (int r = 0; r < rows; r++)
+ {
+ DecoratedKey key = Util.dk(String.valueOf(r));
+ Mutation rm = new Mutation(KEYSPACE1, key.getKey());
+ for (int c = 0; c < columns; c++)
+ {
+ rm.add(CF_STANDARDLVL2, Util.cellname("column" + c), value, 0);
+ }
+ rm.apply();
+ store.forceBlockingFlush();
+ }
+
+ value = ByteBuffer.wrap(new byte[10 * 1024]); // 10 KB value
+ LeveledCompactionStrategyTest.waitForLeveling(store);
+ // wait for higher-level compactions to finish
+ store.disableAutoCompaction();
// Adds 10 partitions
for (int r = 0; r < 10; r++)
{
@@ -161,7 +184,7 @@ public class LongLeveledCompactionStrategyTest
Mutation rm = new Mutation(KEYSPACE1, key.getKey());
for (int c = 0; c < 10; c++)
{
- rm.add(CF_STANDARDLVL, Util.cellname("column" + c), value, 0);
+ rm.add(CF_STANDARDLVL2, Util.cellname("column" + c), value, 0);
}
rm.apply();
}
@@ -169,33 +192,40 @@ public class LongLeveledCompactionStrategyTest
//Flush sstable
store.forceBlockingFlush();
- Collection<SSTableReader> allSSTables = store.getSSTables();
- for (SSTableReader sstable : allSSTables)
+ store.runWithCompactionsDisabled(new Callable<Void>()
{
- if (sstable.getSSTableLevel() == 0)
+ public Void call() throws Exception
{
- System.out.println("Mutating L0-SSTABLE level to L1 to simulate a bug: " + sstable.getFilename());
- sstable.descriptor.getMetadataSerializer().mutateLevel(sstable.descriptor, 1);
- sstable.reloadSSTableMetadata();
- }
- }
+ Collection<SSTableReader> allSSTables = store.getSSTables();
+ for (SSTableReader sstable : allSSTables)
+ {
+ if (sstable.getSSTableLevel() == 0)
+ {
+ System.out.println("Mutating L0-SSTABLE level to L1 to simulate a bug: " + sstable.getFilename());
+ sstable.descriptor.getMetadataSerializer().mutateLevel(sstable.descriptor, 1);
+ sstable.reloadSSTableMetadata();
+ }
+ }
- try (AbstractCompactionStrategy.ScannerList scannerList = lcs.getScanners(allSSTables))
- {
- //Verify that leveled scanners will always iterate in ascending order (CASSANDRA-9935)
- for (ISSTableScanner scanner : scannerList.scanners)
- {
- DecoratedKey lastKey = null;
- while (scanner.hasNext())
+ try (AbstractCompactionStrategy.ScannerList scannerList = lcs.getScanners(allSSTables))
{
- OnDiskAtomIterator row = scanner.next();
- if (lastKey != null)
+ //Verify that leveled scanners will always iterate in ascending order (CASSANDRA-9935)
+ for (ISSTableScanner scanner : scannerList.scanners)
{
- assertTrue("row " + row.getKey() + " received out of order wrt " + lastKey, row.getKey().compareTo(lastKey) >= 0);
+ DecoratedKey lastKey = null;
+ while (scanner.hasNext())
+ {
+ OnDiskAtomIterator row = scanner.next();
+ if (lastKey != null)
+ {
+ assertTrue("row " + row.getKey() + " received out of order wrt " + lastKey, row.getKey().compareTo(lastKey) >= 0);
+ }
+ lastKey = row.getKey();
+ }
}
- lastKey = row.getKey();
}
+ return null;
}
- }
+ }, true);
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ffd5cc5/test/unit/org/apache/cassandra/SchemaLoader.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/SchemaLoader.java b/test/unit/org/apache/cassandra/SchemaLoader.java
index 2048f74..45748a9 100644
--- a/test/unit/org/apache/cassandra/SchemaLoader.java
+++ b/test/unit/org/apache/cassandra/SchemaLoader.java
@@ -180,6 +180,9 @@ public class SchemaLoader
standardCFMD(ks1, "StandardLeveled")
.compactionStrategyClass(LeveledCompactionStrategy.class)
.compactionStrategyOptions(leveledOptions),
+ standardCFMD(ks1, "StandardLeveled2")
+ .compactionStrategyClass(LeveledCompactionStrategy.class)
+ .compactionStrategyOptions(leveledOptions),
standardCFMD(ks1, "legacyleveled")
.compactionStrategyClass(LeveledCompactionStrategy.class)
.compactionStrategyOptions(leveledOptions),
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ffd5cc5/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
index 8b9ca08..0047678 100644
--- a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
@@ -207,7 +207,7 @@ public class LeveledCompactionStrategyTest
/**
* wait for leveled compaction to quiesce on the given columnfamily
*/
- private void waitForLeveling(ColumnFamilyStore cfs) throws InterruptedException
+ public static void waitForLeveling(ColumnFamilyStore cfs) throws InterruptedException
{
WrappingCompactionStrategy strategyManager = (WrappingCompactionStrategy)cfs.getCompactionStrategy();
while (true)
[05/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by yu...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/61f0c988
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/61f0c988
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/61f0c988
Branch: refs/heads/cassandra-3.11
Commit: 61f0c988f78c00fec2c4e028cfb793b84069f737
Parents: 51796ea 6ffd5cc
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Feb 23 11:01:32 2017 +0900
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Feb 23 11:01:32 2017 +0900
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../LongLeveledCompactionStrategyTest.java | 58 ++++++++++++--------
.../LeveledCompactionStrategyTest.java | 2 +-
3 files changed, 37 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/61f0c988/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index afda236,033b366..e978a5c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
-2.2.10
+3.0.12
+ * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
+ * Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
+Merged from 2.2
+ * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
* Fix failing COPY TO STDOUT (CASSANDRA-12497)
* Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
* Exceptions encountered calling getSeeds() breaks OTC thread (CASSANDRA-13018)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/61f0c988/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
----------------------------------------------------------------------
diff --cc test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
index 79497aa,8e63006..562de22
--- a/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
+++ b/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
@@@ -53,9 -51,14 +55,11 @@@ public class LongLeveledCompactionStrat
leveledOptions.put("sstable_size_in_mb", "1");
SchemaLoader.prepareServer();
SchemaLoader.createKeyspace(KEYSPACE1,
- SimpleStrategy.class,
- KSMetaData.optsWithRF(1),
+ KeyspaceParams.simple(1),
SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARDLVL)
- .compactionStrategyClass(LeveledCompactionStrategy.class)
- .compactionStrategyOptions(leveledOptions),
++ .compaction(CompactionParams.lcs(leveledOptions)),
+ SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARDLVL2)
- .compactionStrategyClass(LeveledCompactionStrategy.class)
- .compactionStrategyOptions(leveledOptions));
+ .compaction(CompactionParams.lcs(leveledOptions)));
}
@Test
@@@ -145,15 -149,34 +149,14 @@@
@Test
public void testLeveledScanner() throws Exception
{
- testParallelLeveledCompaction();
Keyspace keyspace = Keyspace.open(KEYSPACE1);
- ColumnFamilyStore store = keyspace.getColumnFamilyStore(CF_STANDARDLVL);
- final ColumnFamilyStore store = keyspace.getColumnFamilyStore(CF_STANDARDLVL2);
- WrappingCompactionStrategy strategy = ((WrappingCompactionStrategy) store.getCompactionStrategy());
- final LeveledCompactionStrategy lcs = (LeveledCompactionStrategy) strategy.getWrappedStrategies().get(1);
-
- ByteBuffer value = ByteBuffer.wrap(new byte[100 * 1024]); // 100 KB value, make it easy to have multiple files
++ ColumnFamilyStore store = keyspace.getColumnFamilyStore(CF_STANDARDLVL2);
+ store.disableAutoCompaction();
- // Enough data to have a level 1 and 2
- int rows = 128;
- int columns = 10;
+ LeveledCompactionStrategy lcs = (LeveledCompactionStrategy)store.getCompactionStrategyManager().getStrategies().get(1);
- ByteBuffer value = ByteBuffer.wrap(new byte[10 * 1024]); // 10 KB value
- // Adds enough data to trigger multiple sstable per level
- for (int r = 0; r < rows; r++)
- {
- DecoratedKey key = Util.dk(String.valueOf(r));
- Mutation rm = new Mutation(KEYSPACE1, key.getKey());
- for (int c = 0; c < columns; c++)
- {
- rm.add(CF_STANDARDLVL2, Util.cellname("column" + c), value, 0);
- }
- rm.apply();
- store.forceBlockingFlush();
- }
++ ByteBuffer value = ByteBuffer.wrap(new byte[100 * 1024]); // 100 KB value, make it easy to have multiple files
- value = ByteBuffer.wrap(new byte[10 * 1024]); // 10 KB value
- LeveledCompactionStrategyTest.waitForLeveling(store);
- // wait for higher-level compactions to finish
- store.disableAutoCompaction();
// Adds 10 partitions
for (int r = 0; r < 10; r++)
{
@@@ -169,33 -192,40 +172,42 @@@
//Flush sstable
store.forceBlockingFlush();
- Iterable<SSTableReader> allSSTables = store.getSSTables(SSTableSet.LIVE);
- for (SSTableReader sstable : allSSTables)
+ store.runWithCompactionsDisabled(new Callable<Void>()
{
- if (sstable.getSSTableLevel() == 0)
+ public Void call() throws Exception
{
- System.out.println("Mutating L0-SSTABLE level to L1 to simulate a bug: " + sstable.getFilename());
- sstable.descriptor.getMetadataSerializer().mutateLevel(sstable.descriptor, 1);
- sstable.reloadSSTableMetadata();
- }
- }
- Collection<SSTableReader> allSSTables = store.getSSTables();
++ Iterable<SSTableReader> allSSTables = store.getSSTables(SSTableSet.LIVE);
+ for (SSTableReader sstable : allSSTables)
+ {
+ if (sstable.getSSTableLevel() == 0)
+ {
+ System.out.println("Mutating L0-SSTABLE level to L1 to simulate a bug: " + sstable.getFilename());
+ sstable.descriptor.getMetadataSerializer().mutateLevel(sstable.descriptor, 1);
+ sstable.reloadSSTableMetadata();
+ }
+ }
- try (AbstractCompactionStrategy.ScannerList scannerList = lcs.getScanners(Lists.newArrayList(allSSTables)))
- {
- //Verify that leveled scanners will always iterate in ascending order (CASSANDRA-9935)
- for (ISSTableScanner scanner : scannerList.scanners)
- {
- DecoratedKey lastKey = null;
- while (scanner.hasNext())
- try (AbstractCompactionStrategy.ScannerList scannerList = lcs.getScanners(allSSTables))
++ try (AbstractCompactionStrategy.ScannerList scannerList = lcs.getScanners(Lists.newArrayList(allSSTables)))
{
- UnfilteredRowIterator row = scanner.next();
- if (lastKey != null)
+ //Verify that leveled scanners will always iterate in ascending order (CASSANDRA-9935)
+ for (ISSTableScanner scanner : scannerList.scanners)
{
- assertTrue("row " + row.partitionKey() + " received out of order wrt " + lastKey, row.partitionKey().compareTo(lastKey) >= 0);
+ DecoratedKey lastKey = null;
+ while (scanner.hasNext())
+ {
- OnDiskAtomIterator row = scanner.next();
++ UnfilteredRowIterator row = scanner.next();
+ if (lastKey != null)
+ {
- assertTrue("row " + row.getKey() + " received out of order wrt " + lastKey, row.getKey().compareTo(lastKey) >= 0);
++ assertTrue("row " + row.partitionKey() + " received out of order wrt " + lastKey, row.partitionKey().compareTo(lastKey) >= 0);
+ }
- lastKey = row.getKey();
++ lastKey = row.partitionKey();
+ }
}
- lastKey = row.partitionKey();
}
+ return null;
}
- }
- }, true);
++ }, true, true);
++
++
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/61f0c988/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
index 1277209,0047678..636afe1
--- a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
@@@ -194,9 -207,9 +194,9 @@@ public class LeveledCompactionStrategyT
/**
* wait for leveled compaction to quiesce on the given columnfamily
*/
- private void waitForLeveling(ColumnFamilyStore cfs) throws InterruptedException
+ public static void waitForLeveling(ColumnFamilyStore cfs) throws InterruptedException
{
- WrappingCompactionStrategy strategyManager = (WrappingCompactionStrategy)cfs.getCompactionStrategy();
+ CompactionStrategyManager strategyManager = cfs.getCompactionStrategyManager();
while (true)
{
// since we run several compaction strategies we wait until L0 in all strategies is empty and
[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by yu...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b887ae94
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b887ae94
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b887ae94
Branch: refs/heads/cassandra-3.11
Commit: b887ae944bfbdbd0a808e368acbbc507311fce0e
Parents: f624b14 61f0c98
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Feb 23 11:12:46 2017 +0900
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Feb 23 11:12:46 2017 +0900
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../LongLeveledCompactionStrategyTest.java | 50 ++++++++++++--------
2 files changed, 31 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b887ae94/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index ca490ba,e978a5c..3e38844
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -21,135 -23,6 +21,136 @@@ Merged from 3.0
live rows in sstabledump (CASSANDRA-13177)
* Provide user workaround when system_schema.columns does not contain entries
for a table that's in system_schema.tables (CASSANDRA-13180)
+Merged from 2.2:
++ * Fix flaky LongLeveledCompactionStrategyTest (CASSANDRA-12202)
+ * Fix failing COPY TO STDOUT (CASSANDRA-12497)
+ * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
+ * Exceptions encountered calling getSeeds() breaks OTC thread (CASSANDRA-13018)
+ * Fix negative mean latency metric (CASSANDRA-12876)
+ * Use only one file pointer when creating commitlog segments (CASSANDRA-12539)
+Merged from 2.1:
+ * Log stacktrace of uncaught exceptions (CASSANDRA-13108)
+ * Use portable stderr for java error in startup (CASSANDRA-13211)
+ * Fix Thread Leak in OutboundTcpConnection (CASSANDRA-13204)
+ * Coalescing strategy can enter infinite loop (CASSANDRA-13159)
+
+3.10
+ * Fix secondary index queries regression (CASSANDRA-13013)
+ * Add duration type to the protocol V5 (CASSANDRA-12850)
+ * Fix duration type validation (CASSANDRA-13143)
+ * Fix flaky GcCompactionTest (CASSANDRA-12664)
+ * Fix TestHintedHandoff.hintedhandoff_decom_test (CASSANDRA-13058)
+ * Fixed query monitoring for range queries (CASSANDRA-13050)
+ * Remove outboundBindAny configuration property (CASSANDRA-12673)
+ * Use correct bounds for all-data range when filtering (CASSANDRA-12666)
+ * Remove timing window in test case (CASSANDRA-12875)
+ * Resolve unit testing without JCE security libraries installed (CASSANDRA-12945)
+ * Fix inconsistencies in cassandra-stress load balancing policy (CASSANDRA-12919)
+ * Fix validation of non-frozen UDT cells (CASSANDRA-12916)
+ * Don't shut down socket input/output on StreamSession (CASSANDRA-12903)
+ * Fix Murmur3PartitionerTest (CASSANDRA-12858)
+ * Move cqlsh syntax rules into separate module and allow easier customization (CASSANDRA-12897)
+ * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
+ * Fix cassandra-stress truncate option (CASSANDRA-12695)
+ * Fix crossNode value when receiving messages (CASSANDRA-12791)
+ * Don't load MX4J beans twice (CASSANDRA-12869)
+ * Extend native protocol request flags, add versions to SUPPORTED, and introduce ProtocolVersion enum (CASSANDRA-12838)
+ * Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
+ * remove net.mintern.primitive library due to license issue (CASSANDRA-12845)
+ * Properly format IPv6 addresses when logging JMX service URL (CASSANDRA-12454)
+ * Optimize the vnode allocation for single replica per DC (CASSANDRA-12777)
+ * Use non-token restrictions for bounds when token restrictions are overridden (CASSANDRA-12419)
+ * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
+ * Use different build directories for Eclipse and Ant (CASSANDRA-12466)
+ * Avoid potential AttributeError in cqlsh due to no table metadata (CASSANDRA-12815)
+ * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster (CASSANDRA-12812)
+ * Upgrade commons-codec to 1.9 (CASSANDRA-12790)
+ * Make the fanout size for LeveledCompactionStrategy to be configurable (CASSANDRA-11550)
+ * Add duration data type (CASSANDRA-11873)
+ * Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784)
+ * Improve sum aggregate functions (CASSANDRA-12417)
+ * Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes in CASSANDRA-10876 (CASSANDRA-12761)
+ * cqlsh fails to format collections when using aliases (CASSANDRA-11534)
+ * Check for hash conflicts in prepared statements (CASSANDRA-12733)
+ * Exit query parsing upon first error (CASSANDRA-12598)
+ * Fix cassandra-stress to use single seed in UUID generation (CASSANDRA-12729)
+ * CQLSSTableWriter does not allow Update statement (CASSANDRA-12450)
+ * Config class uses boxed types but DD exposes primitive types (CASSANDRA-12199)
+ * Add pre- and post-shutdown hooks to Storage Service (CASSANDRA-12461)
+ * Add hint delivery metrics (CASSANDRA-12693)
+ * Remove IndexInfo cache from FileIndexInfoRetriever (CASSANDRA-12731)
+ * ColumnIndex does not reuse buffer (CASSANDRA-12502)
+ * cdc column addition still breaks schema migration tasks (CASSANDRA-12697)
+ * Upgrade metrics-reporter dependencies (CASSANDRA-12089)
+ * Tune compaction thread count via nodetool (CASSANDRA-12248)
+ * Add +=/-= shortcut syntax for update queries (CASSANDRA-12232)
+ * Include repair session IDs in repair start message (CASSANDRA-12532)
+ * Add a blocking task to Index, run before joining the ring (CASSANDRA-12039)
+ * Fix NPE when using CQLSSTableWriter (CASSANDRA-12667)
+ * Support optional backpressure strategies at the coordinator (CASSANDRA-9318)
+ * Make randompartitioner work with new vnode allocation (CASSANDRA-12647)
+ * Fix cassandra-stress graphing (CASSANDRA-12237)
+ * Allow filtering on partition key columns for queries without secondary indexes (CASSANDRA-11031)
+ * Fix Cassandra Stress reporting thread model and precision (CASSANDRA-12585)
+ * Add JMH benchmarks.jar (CASSANDRA-12586)
+ * Cleanup uses of AlterTableStatementColumn (CASSANDRA-12567)
+ * Add keep-alive to streaming (CASSANDRA-11841)
+ * Tracing payload is passed through newSession(..) (CASSANDRA-11706)
+ * avoid deleting non existing sstable files and improve related log messages (CASSANDRA-12261)
+ * json/yaml output format for nodetool compactionhistory (CASSANDRA-12486)
+ * Retry all internode messages once after a connection is
+ closed and reopened (CASSANDRA-12192)
+ * Add support to rebuild from targeted replica (CASSANDRA-9875)
+ * Add sequence distribution type to cassandra stress (CASSANDRA-12490)
+ * "SELECT * FROM foo LIMIT ;" does not error out (CASSANDRA-12154)
+ * Define executeLocally() at the ReadQuery Level (CASSANDRA-12474)
+ * Extend read/write failure messages with a map of replica addresses
+ to error codes in the v5 native protocol (CASSANDRA-12311)
+ * Fix rebuild of SASI indexes with existing index files (CASSANDRA-12374)
+ * Let DatabaseDescriptor not implicitly startup services (CASSANDRA-9054, 12550)
+ * Fix clustering indexes in presence of static columns in SASI (CASSANDRA-12378)
+ * Fix queries on columns with reversed type on SASI indexes (CASSANDRA-12223)
+ * Added slow query log (CASSANDRA-12403)
+ * Count full coordinated request against timeout (CASSANDRA-12256)
+ * Allow TTL with null value on insert and update (CASSANDRA-12216)
+ * Make decommission operation resumable (CASSANDRA-12008)
+ * Add support to one-way targeted repair (CASSANDRA-9876)
+ * Remove clientutil jar (CASSANDRA-11635)
+ * Fix compaction throughput throttle (CASSANDRA-12366, CASSANDRA-12717)
+ * Delay releasing Memtable memory on flush until PostFlush has finished running (CASSANDRA-12358)
+ * Cassandra stress should dump all setting on startup (CASSANDRA-11914)
+ * Make it possible to compact a given token range (CASSANDRA-10643)
+ * Allow updating DynamicEndpointSnitch properties via JMX (CASSANDRA-12179)
+ * Collect metrics on queries by consistency level (CASSANDRA-7384)
+ * Add support for GROUP BY to SELECT statement (CASSANDRA-10707)
+ * Deprecate memtable_cleanup_threshold and update default for memtable_flush_writers (CASSANDRA-12228)
+ * Upgrade to OHC 0.4.4 (CASSANDRA-12133)
+ * Add version command to cassandra-stress (CASSANDRA-12258)
+ * Create compaction-stress tool (CASSANDRA-11844)
+ * Garbage-collecting compaction operation and schema option (CASSANDRA-7019)
+ * Add beta protocol flag for v5 native protocol (CASSANDRA-12142)
+ * Support filtering on non-PRIMARY KEY columns in the CREATE
+ MATERIALIZED VIEW statement's WHERE clause (CASSANDRA-10368)
+ * Unify STDOUT and SYSTEMLOG logback format (CASSANDRA-12004)
+ * COPY FROM should raise error for non-existing input files (CASSANDRA-12174)
+ * Faster write path (CASSANDRA-12269)
+ * Option to leave omitted columns in INSERT JSON unset (CASSANDRA-11424)
+ * Support json/yaml output in nodetool tpstats (CASSANDRA-12035)
+ * Expose metrics for successful/failed authentication attempts (CASSANDRA-10635)
+ * Prepend snapshot name with "truncated" or "dropped" when a snapshot
+ is taken before truncating or dropping a table (CASSANDRA-12178)
+ * Optimize RestrictionSet (CASSANDRA-12153)
+ * cqlsh does not automatically downgrade CQL version (CASSANDRA-12150)
+ * Omit (de)serialization of state variable in UDAs (CASSANDRA-9613)
+ * Create a system table to expose prepared statements (CASSANDRA-8831)
+ * Reuse DataOutputBuffer from ColumnIndex (CASSANDRA-11970)
+ * Remove DatabaseDescriptor dependency from SegmentedFile (CASSANDRA-11580)
+ * Add supplied username to authentication error messages (CASSANDRA-12076)
+ * Remove pre-startup check for open JMX port (CASSANDRA-12074)
+ * Remove compaction Severity from DynamicEndpointSnitch (CASSANDRA-11738)
+ * Restore resumable hints delivery (CASSANDRA-11960)
+ * Properly report LWT contention (CASSANDRA-12626)
+Merged from 3.0:
* Dump threads when unit tests time out (CASSANDRA-13117)
* Better error when modifying function permissions without explicit keyspace (CASSANDRA-12925)
* Indexer is not correctly invoked when building indexes over sstables (CASSANDRA-13075)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b887ae94/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
----------------------------------------------------------------------