Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 3d7471a56 -> fdc61cb6a refs/heads/cassandra-3.11 4c6a10af8 -> 19a547861 refs/heads/trunk 92cde9b27 -> 49c1a256c
Respect max hint window when hinting for LWT patch by Kurt Greaves; reviewed by Aleksey Yeschenko for CASSANDRA-14215 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fdc61cb6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fdc61cb6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fdc61cb6 Branch: refs/heads/cassandra-3.0 Commit: fdc61cb6a74163402181d133519462f0ab1b504d Parents: 3d7471a Author: kurt <k...@instaclustr.com> Authored: Tue Feb 20 00:59:00 2018 +0000 Committer: Aleksey Yeshchenko <alek...@apple.com> Committed: Thu Mar 15 17:13:56 2018 +0300 ---------------------------------------------------------------------- CHANGES.txt | 8 +++++--- src/java/org/apache/cassandra/service/StorageProxy.java | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fdc61cb6/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 62b904f..6099b01 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,6 @@ 3.0.17 - * Adding missing WriteType enum values to v3,v4 and v5 spec (CASSANDRA-13697) + * Respect max hint window when hinting for LWT (CASSANDRA-14215) + * Adding missing WriteType enum values to v3, v4, and v5 spec (CASSANDRA-13697) * Don't regenerate bloomfilter and summaries on startup (CASSANDRA-11163) * Fix NPE when performing comparison against a null frozen in LWT (CASSANDRA-14087) * Log when SSTables are deleted (CASSANDRA-14302) @@ -8,10 +9,11 @@ * 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) -Merged from 2.1: - * CVE-2017-5929 Security vulnerability in Logback warning in NEWS.txt (CASSANDRA-14183) Merged from 2.2: * Backport circleci yaml (CASSANDRA-14240) +Merged from 2.1: + * CVE-2017-5929 Security vulnerability in Logback warning in NEWS.txt (CASSANDRA-14183) + 3.0.16 * Fix unit test failures in ViewComplexTest (CASSANDRA-14219) http://git-wip-us.apache.org/repos/asf/cassandra/blob/fdc61cb6/src/java/org/apache/cassandra/service/StorageProxy.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java index 7a6bed4..bf58ef2 100644 --- a/src/java/org/apache/cassandra/service/StorageProxy.java +++ b/src/java/org/apache/cassandra/service/StorageProxy.java @@ -497,7 +497,7 @@ public class StorageProxy implements StorageProxyMBean return false; } - private static void commitPaxos(Commit proposal, ConsistencyLevel consistencyLevel, boolean shouldHint) throws WriteTimeoutException + private static void commitPaxos(Commit proposal, ConsistencyLevel consistencyLevel, boolean allowHints) throws WriteTimeoutException { boolean shouldBlock = consistencyLevel != ConsistencyLevel.ANY; Keyspace keyspace = Keyspace.open(proposal.update.metadata().ksName); @@ -523,14 +523,14 @@ public class StorageProxy implements StorageProxyMBean if (canDoLocalRequest(destination)) commitPaxosLocal(message, responseHandler); else - MessagingService.instance().sendRR(message, destination, responseHandler, shouldHint); + MessagingService.instance().sendRR(message, destination, responseHandler, allowHints && shouldHint(destination)); } else { MessagingService.instance().sendOneWay(message, destination); } } - else if (shouldHint) + else if (allowHints && shouldHint(destination)) { submitHint(proposal.makeMutation(), destination, null); } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org