You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sp...@apache.org on 2017/04/03 18:17:45 UTC
[1/6] cassandra git commit: Fix hint delivery when prefer_local
enabled
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 13e6699da -> 2e36eb6ca
refs/heads/cassandra-3.11 05a0658d7 -> 420c91c9a
refs/heads/trunk 39bca4813 -> ab7aa57b3
Fix hint delivery when prefer_local enabled
patch by Stefan Podkowinski; reviewed by Aleksey Yeschenko for CASSANDRA-13020
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2e36eb6c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2e36eb6c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2e36eb6c
Branch: refs/heads/cassandra-3.0
Commit: 2e36eb6ca38dd018e7ef0cda61d43ec9a7eb144c
Parents: 13e6699
Author: Stefan Podkowinski <s....@gmail.com>
Authored: Fri Mar 10 14:34:29 2017 +0100
Committer: Stefan Podkowinski <s....@gmail.com>
Committed: Mon Apr 3 20:10:52 2017 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e36eb6c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 371abed..41489c1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.13
+ * Fix hint delivery when using ext+internal IPs with prefer_local enabled (CASSANDRA-13020)
* Fix possible NPE on upgrade to 3.0/3.X in case of IO errors (CASSANDRA-13389)
* Legacy deserializer can create empty range tombstones (CASSANDRA-13341)
* Use the Kernel32 library to retrieve the PID on Windows and fix startup checks (CASSANDRA-13333)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e36eb6c/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 6760040..aa3407b 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -3655,8 +3655,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
// stream to the closest peer as chosen by the snitch
DatabaseDescriptor.getEndpointSnitch().sortByProximity(FBUtilities.getBroadcastAddress(), candidates);
InetAddress hintsDestinationHost = candidates.get(0);
- InetAddress preferred = SystemKeyspace.getPreferredIP(hintsDestinationHost);
- return tokenMetadata.getHostId(preferred);
+ return tokenMetadata.getHostId(hintsDestinationHost);
}
}
[3/6] cassandra git commit: Fix hint delivery when prefer_local
enabled
Posted by sp...@apache.org.
Fix hint delivery when prefer_local enabled
patch by Stefan Podkowinski; reviewed by Aleksey Yeschenko for CASSANDRA-13020
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2e36eb6c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2e36eb6c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2e36eb6c
Branch: refs/heads/trunk
Commit: 2e36eb6ca38dd018e7ef0cda61d43ec9a7eb144c
Parents: 13e6699
Author: Stefan Podkowinski <s....@gmail.com>
Authored: Fri Mar 10 14:34:29 2017 +0100
Committer: Stefan Podkowinski <s....@gmail.com>
Committed: Mon Apr 3 20:10:52 2017 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e36eb6c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 371abed..41489c1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.13
+ * Fix hint delivery when using ext+internal IPs with prefer_local enabled (CASSANDRA-13020)
* Fix possible NPE on upgrade to 3.0/3.X in case of IO errors (CASSANDRA-13389)
* Legacy deserializer can create empty range tombstones (CASSANDRA-13341)
* Use the Kernel32 library to retrieve the PID on Windows and fix startup checks (CASSANDRA-13333)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e36eb6c/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 6760040..aa3407b 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -3655,8 +3655,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
// stream to the closest peer as chosen by the snitch
DatabaseDescriptor.getEndpointSnitch().sortByProximity(FBUtilities.getBroadcastAddress(), candidates);
InetAddress hintsDestinationHost = candidates.get(0);
- InetAddress preferred = SystemKeyspace.getPreferredIP(hintsDestinationHost);
- return tokenMetadata.getHostId(preferred);
+ return tokenMetadata.getHostId(hintsDestinationHost);
}
}
[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by sp...@apache.org.
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/420c91c9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/420c91c9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/420c91c9
Branch: refs/heads/trunk
Commit: 420c91c9ab5702305886ce0c06dda97d4c382fe6
Parents: 05a0658 2e36eb6
Author: Stefan Podkowinski <s....@gmail.com>
Authored: Mon Apr 3 20:12:34 2017 +0200
Committer: Stefan Podkowinski <s....@gmail.com>
Committed: Mon Apr 3 20:13:35 2017 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/420c91c9/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2408b8a,41489c1..fc7a2bb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,27 -1,7 +1,28 @@@
-3.0.13
+3.11.0
+ * Fix testLimitSSTables flake caused by concurrent flush (CASSANDRA-12820)
+ * cdc column addition strikes again (CASSANDRA-13382)
+ * Fix static column indexes (CASSANDRA-13277)
+ * DataOutputBuffer.asNewBuffer broken (CASSANDRA-13298)
+ * unittest CipherFactoryTest failed on MacOS (CASSANDRA-13370)
+ * Forbid SELECT restrictions and CREATE INDEX over non-frozen UDT columns (CASSANDRA-13247)
+ * Default logging we ship will incorrectly print "?:?" for "%F:%L" pattern (CASSANDRA-13317)
+ * Possible AssertionError in UnfilteredRowIteratorWithLowerBound (CASSANDRA-13366)
+ * Support unaligned memory access for AArch64 (CASSANDRA-13326)
+ * Improve SASI range iterator efficiency on intersection with an empty range (CASSANDRA-12915).
+ * Fix equality comparisons of columns using the duration type (CASSANDRA-13174)
+ * Obfuscate password in stress-graphs (CASSANDRA-12233)
+ * 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)
+ * Address message coalescing regression (CASSANDRA-12676)
+Merged from 3.0:
+ * Fix hint delivery when using ext+internal IPs with prefer_local enabled (CASSANDRA-13020)
* Fix possible NPE on upgrade to 3.0/3.X in case of IO errors (CASSANDRA-13389)
* Legacy deserializer can create empty range tombstones (CASSANDRA-13341)
+ * Legacy caching options can prevent 3.0 upgrade (CASSANDRA-13384)
* Use the Kernel32 library to retrieve the PID on Windows and fix startup checks (CASSANDRA-13333)
* Fix code to not exchange schema across major versions (CASSANDRA-13274)
* Dropping column results in "corrupt" SSTable (CASSANDRA-13337)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/420c91c9/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by sp...@apache.org.
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/420c91c9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/420c91c9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/420c91c9
Branch: refs/heads/cassandra-3.11
Commit: 420c91c9ab5702305886ce0c06dda97d4c382fe6
Parents: 05a0658 2e36eb6
Author: Stefan Podkowinski <s....@gmail.com>
Authored: Mon Apr 3 20:12:34 2017 +0200
Committer: Stefan Podkowinski <s....@gmail.com>
Committed: Mon Apr 3 20:13:35 2017 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/420c91c9/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2408b8a,41489c1..fc7a2bb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,27 -1,7 +1,28 @@@
-3.0.13
+3.11.0
+ * Fix testLimitSSTables flake caused by concurrent flush (CASSANDRA-12820)
+ * cdc column addition strikes again (CASSANDRA-13382)
+ * Fix static column indexes (CASSANDRA-13277)
+ * DataOutputBuffer.asNewBuffer broken (CASSANDRA-13298)
+ * unittest CipherFactoryTest failed on MacOS (CASSANDRA-13370)
+ * Forbid SELECT restrictions and CREATE INDEX over non-frozen UDT columns (CASSANDRA-13247)
+ * Default logging we ship will incorrectly print "?:?" for "%F:%L" pattern (CASSANDRA-13317)
+ * Possible AssertionError in UnfilteredRowIteratorWithLowerBound (CASSANDRA-13366)
+ * Support unaligned memory access for AArch64 (CASSANDRA-13326)
+ * Improve SASI range iterator efficiency on intersection with an empty range (CASSANDRA-12915).
+ * Fix equality comparisons of columns using the duration type (CASSANDRA-13174)
+ * Obfuscate password in stress-graphs (CASSANDRA-12233)
+ * 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)
+ * Address message coalescing regression (CASSANDRA-12676)
+Merged from 3.0:
+ * Fix hint delivery when using ext+internal IPs with prefer_local enabled (CASSANDRA-13020)
* Fix possible NPE on upgrade to 3.0/3.X in case of IO errors (CASSANDRA-13389)
* Legacy deserializer can create empty range tombstones (CASSANDRA-13341)
+ * Legacy caching options can prevent 3.0 upgrade (CASSANDRA-13384)
* Use the Kernel32 library to retrieve the PID on Windows and fix startup checks (CASSANDRA-13333)
* Fix code to not exchange schema across major versions (CASSANDRA-13274)
* Dropping column results in "corrupt" SSTable (CASSANDRA-13337)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/420c91c9/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[6/6] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by sp...@apache.org.
Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ab7aa57b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ab7aa57b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ab7aa57b
Branch: refs/heads/trunk
Commit: ab7aa57b376658e87a8fd4221ddc7712734ffcd8
Parents: 39bca48 420c91c
Author: Stefan Podkowinski <s....@gmail.com>
Authored: Mon Apr 3 20:14:57 2017 +0200
Committer: Stefan Podkowinski <s....@gmail.com>
Committed: Mon Apr 3 20:15:23 2017 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ab7aa57b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 42e476f,fc7a2bb..3632903
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -69,6 -19,8 +69,7 @@@
* NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983)
* Address message coalescing regression (CASSANDRA-12676)
Merged from 3.0:
+ * Fix hint delivery when using ext+internal IPs with prefer_local enabled (CASSANDRA-13020)
- * Fix possible NPE on upgrade to 3.0/3.X in case of IO errors (CASSANDRA-13389)
* Legacy deserializer can create empty range tombstones (CASSANDRA-13341)
* Legacy caching options can prevent 3.0 upgrade (CASSANDRA-13384)
* Use the Kernel32 library to retrieve the PID on Windows and fix startup checks (CASSANDRA-13333)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ab7aa57b/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[2/6] cassandra git commit: Fix hint delivery when prefer_local
enabled
Posted by sp...@apache.org.
Fix hint delivery when prefer_local enabled
patch by Stefan Podkowinski; reviewed by Aleksey Yeschenko for CASSANDRA-13020
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2e36eb6c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2e36eb6c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2e36eb6c
Branch: refs/heads/cassandra-3.11
Commit: 2e36eb6ca38dd018e7ef0cda61d43ec9a7eb144c
Parents: 13e6699
Author: Stefan Podkowinski <s....@gmail.com>
Authored: Fri Mar 10 14:34:29 2017 +0100
Committer: Stefan Podkowinski <s....@gmail.com>
Committed: Mon Apr 3 20:10:52 2017 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e36eb6c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 371abed..41489c1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.13
+ * Fix hint delivery when using ext+internal IPs with prefer_local enabled (CASSANDRA-13020)
* Fix possible NPE on upgrade to 3.0/3.X in case of IO errors (CASSANDRA-13389)
* Legacy deserializer can create empty range tombstones (CASSANDRA-13341)
* Use the Kernel32 library to retrieve the PID on Windows and fix startup checks (CASSANDRA-13333)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e36eb6c/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 6760040..aa3407b 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -3655,8 +3655,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
// stream to the closest peer as chosen by the snitch
DatabaseDescriptor.getEndpointSnitch().sortByProximity(FBUtilities.getBroadcastAddress(), candidates);
InetAddress hintsDestinationHost = candidates.get(0);
- InetAddress preferred = SystemKeyspace.getPreferredIP(hintsDestinationHost);
- return tokenMetadata.getHostId(preferred);
+ return tokenMetadata.getHostId(hintsDestinationHost);
}
}