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/a060698c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a060698c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a060698c Branch: refs/heads/cassandra-3.11 Commit: a060698c55797d8f92db290ea2fe209433dc7b3f Parents: 7f02348 c673389 Author: Paulo Motta <pa...@apache.org> Authored: Tue Mar 6 11:14:49 2018 -0300 Committer: Paulo Motta <pa...@apache.org> Committed: Tue Mar 6 11:15:15 2018 -0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 8 ++++++++ src/java/org/apache/cassandra/service/StorageProxy.java | 7 +++++-- 3 files changed, 14 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a060698c/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index a4be758,ad558de..ff726a9 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,7 -1,5 +1,8 @@@ -3.0.17 +3.11.3 + * RateBasedBackPressure unnecessarily invokes a lock on the Guava RateLimiter (CASSANDRA-14163) + * Fix wildcard GROUP BY queries (CASSANDRA-14209) +Merged from 3.0: + * Write to pending endpoint when view replica is also base replica (CASSANDRA-14251) * Chain commit log marker potential performance regression in batch commit mode (CASSANDRA-14194) * Fully utilise specified compaction threads (CASSANDRA-14210) * Pre-create deletion log records to finish compactions quicker (CASSANDRA-12763) http://git-wip-us.apache.org/repos/asf/cassandra/blob/a060698c/NEWS.txt ---------------------------------------------------------------------- diff --cc NEWS.txt index 445623e,64de28a..745dad2 --- a/NEWS.txt +++ b/NEWS.txt @@@ -42,8 -42,17 +42,16 @@@ restore snapshots created with the prev 'sstableloader' tool. You can upgrade the file format of your snapshots using the provided 'sstableupgrade' tool. -3.0.17 ++3.11.3 + ===== + + Upgrading + --------- - - Materialized view users upgrading from 3.0.15 or later that have performed range movements (join, decommission, move, etc), - should run repair on the base tables, and subsequently on the views to ensure data affected by CASSANDRA-14251 is correctly - propagated to all replicas. ++ - Materialized view users upgrading from 3.0.15 (3.0.X series) or 3.11.1 (3.11.X series) and later that have performed range movements (join, decommission, move, etc), ++ should run repair on the base tables, and subsequently on the views to ensure data affected by CASSANDRA-14251 is correctly propagated to all replicas. + -3.0.16 -===== +3.11.2 +====== Upgrading --------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a060698c/src/java/org/apache/cassandra/service/StorageProxy.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/StorageProxy.java index e67d46e,7a6bed4..4dc05e3 --- a/src/java/org/apache/cassandra/service/StorageProxy.java +++ b/src/java/org/apache/cassandra/service/StorageProxy.java @@@ -795,9 -759,11 +795,12 @@@ public class StorageProxy implements St continue; } - // When local node is the paired endpoint just apply the mutation locally. - if (pairedEndpoint.get().equals(FBUtilities.getBroadcastAddress()) && StorageService.instance.isJoined()) + // When local node is the endpoint we can just apply the mutation locally, + // unless there are pending endpoints, in which case we want to do an ordinary + // write so the view mutation is sent to the pending endpoint + if (pairedEndpoint.get().equals(FBUtilities.getBroadcastAddress()) && StorageService.instance.isJoined() + && pendingEndpoints.isEmpty()) + { try { mutation.apply(writeCommitLog); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
