Merge branch 'cassandra-3.11' into trunk * cassandra-3.11: Read repair is not blocking repair to finish in foreground repair
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c3d72444 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c3d72444 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c3d72444 Branch: refs/heads/trunk Commit: c3d72444512861c75ec11e17f52770d2613e5364 Parents: 52df6a5 74559de Author: Sylvain Lebresne <[email protected]> Authored: Thu Jan 19 16:55:11 2017 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Thu Jan 19 16:55:11 2017 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../UnfilteredPartitionIterators.java | 1 + .../cassandra/service/AsyncRepairCallback.java | 2 +- .../apache/cassandra/service/DataResolver.java | 14 ++- .../cassandra/service/DigestResolver.java | 9 +- .../apache/cassandra/service/ReadCallback.java | 4 +- .../cassandra/service/ResponseResolver.java | 12 ++ .../cassandra/service/DataResolverTest.java | 117 +++++++++++++------ 8 files changed, 118 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3d72444/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 8f68618,8b613e6..cc16a8f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -139,11 -109,13 +139,12 @@@ * 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) + * Properly record CAS contention (CASSANDRA-12626) Merged from 3.0: + * Stress daemon help is incorrect (CASSANDRA-12563) + * Read repair is not blocking repair to finish in foreground repair (CASSANDRA-13115) - * Stress daemon help is incorrect(CASSANDRA-12563) - * Remove ALTER TYPE support (CASSANDRA-12443) - * Fix assertion for certain legacy range tombstone pattern (CASSANDRA-12203) * Replace empty strings with null values if they cannot be converted (CASSANDRA-12794) + * Remove support for non-JavaScript UDFs (CASSANDRA-12883) * Fix deserialization of 2.x DeletedCells (CASSANDRA-12620) * Add parent repair session id to anticompaction log message (CASSANDRA-12186) * Improve contention handling on failure to acquire MV lock for streaming and hints (CASSANDRA-12905) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3d72444/src/java/org/apache/cassandra/db/partitions/UnfilteredPartitionIterators.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3d72444/src/java/org/apache/cassandra/service/DataResolver.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3d72444/src/java/org/apache/cassandra/service/ReadCallback.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3d72444/test/unit/org/apache/cassandra/service/DataResolverTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/service/DataResolverTest.java index 3dbc166,7c38224..dba3e95 --- a/test/unit/org/apache/cassandra/service/DataResolverTest.java +++ b/test/unit/org/apache/cassandra/service/DataResolverTest.java @@@ -330,14 -353,17 +353,17 @@@ public class DataResolverTes .add("c2", "v2") .buildUpdate()))); InetAddress peer2 = peer(); - resolver.preprocess(readResponseMessage(peer2, EmptyIterators.unfilteredPartition(cfm, false))); + resolver.preprocess(readResponseMessage(peer2, EmptyIterators.unfilteredPartition(cfm))); - try(PartitionIterator data = resolver.resolve(); - RowIterator rows = Iterators.getOnlyElement(data)) + try(PartitionIterator data = resolver.resolve()) { - Row row = Iterators.getOnlyElement(rows); - assertColumns(row, "c2"); - assertColumn(cfm, row, "c2", "v2", 1); + try (RowIterator rows = Iterators.getOnlyElement(data)) + { + Row row = Iterators.getOnlyElement(rows); + assertColumns(row, "c2"); + assertColumn(cfm, row, "c2", "v2", 1); + } + assertRepairFuture(resolver, 1); } assertEquals(1, messageRecorder.sent.size());
