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/e58c26a2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e58c26a2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e58c26a2 Branch: refs/heads/cassandra-3.11 Commit: e58c26a296b6aa1fced6482dd64acb36e736a16d Parents: b221e8e 0cc1c1b Author: Jeff Jirsa <j...@jeffjirsa.net> Authored: Fri Feb 10 15:53:34 2017 -0800 Committer: Jeff Jirsa <j...@jeffjirsa.net> Committed: Fri Feb 10 15:54:01 2017 -0800 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../org/apache/cassandra/hints/HintVerbHandler.java | 6 ++++-- .../apache/cassandra/hints/HintsDispatchExecutor.java | 13 +++++++------ src/java/org/apache/cassandra/hints/HintsReader.java | 7 +++++-- 4 files changed, 18 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e58c26a2/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index aaad3e7,007d06c..df91d43 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,6 +1,13 @@@ -3.0.11 - * Hint related logging should include the IP address of the destination in addition to +3.11.0 + * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034) + * nodetool stopdaemon errors out (CASSANDRA-13030) + * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954) + * Fix primary index calculation for SASI (CASSANDRA-12910) + * More fixes to the TokenAllocator (CASSANDRA-12990) + * NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983) +Merged from 3.0: ++ * Hint related logging should include the IP address of the destination in addition to + host ID (CASSANDRA-13205) * Reloading logback.xml does not work (CASSANDRA-13173) * Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 (CASSANDRA-13109) * Duplicate rows after upgrading from 2.1.16 to 3.0.10/3.9 (CASSANDRA-13125) http://git-wip-us.apache.org/repos/asf/cassandra/blob/e58c26a2/src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java index d7ccf81,333232d..54cddd9 --- a/src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java +++ b/src/java/org/apache/cassandra/hints/HintsDispatchExecutor.java @@@ -278,9 -266,9 +279,9 @@@ final class HintsDispatchExecuto } else { - store.markDispatchOffset(descriptor, dispatcher.dispatchOffset()); + store.markDispatchOffset(descriptor, dispatcher.dispatchPosition()); store.offerFirst(descriptor); - logger.info("Finished hinted handoff of file {} to endpoint {}, partially", descriptor.fileName(), hostId); + logger.info("Finished hinted handoff of file {} to endpoint {}: {}, partially", descriptor.fileName(), address, hostId); return false; } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/e58c26a2/src/java/org/apache/cassandra/hints/HintsReader.java ----------------------------------------------------------------------
