You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by st...@apache.org on 2016/09/29 01:30:48 UTC
[1/3] cassandra git commit: Fix failure in LogTransactionTest
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 9dd805d0d -> 5cebd1fb0
refs/heads/trunk 3a79a027c -> 25d4c7baa
Fix failure in LogTransactionTest
Patch by Stefania Alborghetti; reviewed by Edward Capriolo for CASSANDRA-12632
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5cebd1fb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5cebd1fb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5cebd1fb
Branch: refs/heads/cassandra-3.0
Commit: 5cebd1fb0d60e23ae5a30231e253806d58d0998e
Parents: 9dd805d
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Tue Sep 13 14:51:56 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Thu Sep 29 09:27:18 2016 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/db/lifecycle/LogTransactionTest.java | 14 ++++++++++++--
2 files changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cebd1fb/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 6edc491..f2f8dac 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.10
+ * Fix failure in LogTransactionTest (CASSANDRA-12632)
* Fix potentially incomplete non-frozen UDT values when querying with the
full primary key specified (CASSANDRA-12605)
* Skip writing MV mutations to commitlog on mutation.applyUnsafe() (CASSANDRA-11670)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cebd1fb/test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java b/test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java
index 0f03baf..56df337 100644
--- a/test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java
+++ b/test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java
@@ -1003,11 +1003,15 @@ public class LogTransactionTest extends AbstractTransactionalTest
assertNotNull(log);
log.trackNew(sstableNew);
- log.obsoleted(sstableOld);
+ LogTransaction.SSTableTidier tidier = log.obsoleted(sstableOld);
// Modify the transaction log or disk state for sstableOld
modifier.accept(log, sstableOld);
+ // Sync the folder to make sure that later on removeUnfinishedLeftovers picks up
+ // any changes to the txn files done by the modifier
+ assertNull(log.txnFile().syncFolder(null));
+
assertNull(log.complete(null));
sstableOld.selfRef().release();
@@ -1040,6 +1044,9 @@ public class LogTransactionTest extends AbstractTransactionalTest
oldFiles,
log.logFilePaths())));
}
+
+ // make sure to run the tidier to avoid any leaks in the logs
+ tidier.run();
}
@Test
@@ -1068,7 +1075,7 @@ public class LogTransactionTest extends AbstractTransactionalTest
assertNotNull(log);
log.trackNew(sstableNew);
- /*TransactionLog.SSTableTidier tidier =*/ log.obsoleted(sstableOld);
+ LogTransaction.SSTableTidier tidier = log.obsoleted(sstableOld);
//modify the old sstable files
modifier.accept(sstableOld);
@@ -1093,6 +1100,9 @@ public class LogTransactionTest extends AbstractTransactionalTest
assertFiles(dataFolder.getPath(), Sets.newHashSet(Iterables.concat(sstableNew.getAllFilePaths(),
sstableOld.getAllFilePaths(),
log.logFilePaths())));
+
+ // make sure to run the tidier to avoid any leaks in the logs
+ tidier.run();
}
@Test
[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by st...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/25d4c7ba
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25d4c7ba
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/25d4c7ba
Branch: refs/heads/trunk
Commit: 25d4c7baa5d00d2cc0b6304a544c6099ed24e70f
Parents: 3a79a02 5cebd1f
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Thu Sep 29 09:29:05 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Thu Sep 29 09:29:05 2016 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/db/lifecycle/LogTransactionTest.java | 14 ++++++++++++--
2 files changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/25d4c7ba/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2c99e9d,f2f8dac..a9e46f7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,77 -1,7 +1,78 @@@
-3.0.10
+3.10
+ * 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)
+ * Add row offset support to SASI (CASSANDRA-11990)
+ * 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)
+ * 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)
+Merged from 3.0:
+ * Fix failure in LogTransactionTest (CASSANDRA-12632)
* Fix potentially incomplete non-frozen UDT values when querying with the
full primary key specified (CASSANDRA-12605)
+ * Make sure repaired tombstones are dropped when only_purge_repaired_tombstones is enabled (CASSANDRA-12703)
* Skip writing MV mutations to commitlog on mutation.applyUnsafe() (CASSANDRA-11670)
* Establish consistent distinction between non-existing partition and NULL value for LWTs on static columns (CASSANDRA-12060)
* Extend ColumnIdentifier.internedInstances key to include the type that generated the byte buffer (CASSANDRA-12516)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/25d4c7ba/test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java
index 2620a31,56df337..dd3f370
--- a/test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java
+++ b/test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java
@@@ -1007,6 -1008,10 +1007,10 @@@ public class LogTransactionTest extend
// Modify the transaction log or disk state for sstableOld
modifier.accept(log, sstableOld);
+ // Sync the folder to make sure that later on removeUnfinishedLeftovers picks up
+ // any changes to the txn files done by the modifier
- assertNull(log.txnFile().syncFolder(null));
++ assertNull(log.txnFile().syncDirectory(null));
+
assertNull(log.complete(null));
sstableOld.selfRef().release();
[2/3] cassandra git commit: Fix failure in LogTransactionTest
Posted by st...@apache.org.
Fix failure in LogTransactionTest
Patch by Stefania Alborghetti; reviewed by Edward Capriolo for CASSANDRA-12632
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5cebd1fb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5cebd1fb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5cebd1fb
Branch: refs/heads/trunk
Commit: 5cebd1fb0d60e23ae5a30231e253806d58d0998e
Parents: 9dd805d
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Tue Sep 13 14:51:56 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Thu Sep 29 09:27:18 2016 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/db/lifecycle/LogTransactionTest.java | 14 ++++++++++++--
2 files changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cebd1fb/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 6edc491..f2f8dac 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.10
+ * Fix failure in LogTransactionTest (CASSANDRA-12632)
* Fix potentially incomplete non-frozen UDT values when querying with the
full primary key specified (CASSANDRA-12605)
* Skip writing MV mutations to commitlog on mutation.applyUnsafe() (CASSANDRA-11670)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cebd1fb/test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java b/test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java
index 0f03baf..56df337 100644
--- a/test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java
+++ b/test/unit/org/apache/cassandra/db/lifecycle/LogTransactionTest.java
@@ -1003,11 +1003,15 @@ public class LogTransactionTest extends AbstractTransactionalTest
assertNotNull(log);
log.trackNew(sstableNew);
- log.obsoleted(sstableOld);
+ LogTransaction.SSTableTidier tidier = log.obsoleted(sstableOld);
// Modify the transaction log or disk state for sstableOld
modifier.accept(log, sstableOld);
+ // Sync the folder to make sure that later on removeUnfinishedLeftovers picks up
+ // any changes to the txn files done by the modifier
+ assertNull(log.txnFile().syncFolder(null));
+
assertNull(log.complete(null));
sstableOld.selfRef().release();
@@ -1040,6 +1044,9 @@ public class LogTransactionTest extends AbstractTransactionalTest
oldFiles,
log.logFilePaths())));
}
+
+ // make sure to run the tidier to avoid any leaks in the logs
+ tidier.run();
}
@Test
@@ -1068,7 +1075,7 @@ public class LogTransactionTest extends AbstractTransactionalTest
assertNotNull(log);
log.trackNew(sstableNew);
- /*TransactionLog.SSTableTidier tidier =*/ log.obsoleted(sstableOld);
+ LogTransaction.SSTableTidier tidier = log.obsoleted(sstableOld);
//modify the old sstable files
modifier.accept(sstableOld);
@@ -1093,6 +1100,9 @@ public class LogTransactionTest extends AbstractTransactionalTest
assertFiles(dataFolder.getPath(), Sets.newHashSet(Iterables.concat(sstableNew.getAllFilePaths(),
sstableOld.getAllFilePaths(),
log.logFilePaths())));
+
+ // make sure to run the tidier to avoid any leaks in the logs
+ tidier.run();
}
@Test