You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by aw...@apache.org on 2017/05/03 22:07:46 UTC
[1/6] cassandra git commit: CASSANDRA-13163,
fix NPE in StorageService.excise() [Forced Update!]
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 18b77c3e0 -> 6ed913433 (forced update)
refs/heads/cassandra-3.11 efd3ab121 -> 8b97a91bf (forced update)
refs/heads/trunk 42655387d -> 2f9de24f0 (forced update)
CASSANDRA-13163, fix NPE in StorageService.excise()
Patch by Ariel Weisberg; Reviewed by Jason Brown for CASSANDRA-13163
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6ed91343
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6ed91343
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6ed91343
Branch: refs/heads/cassandra-3.0
Commit: 6ed9134336bb48d04284cefd303d8374ed901c0a
Parents: 617c8eb
Author: Ariel Weisberg <ar...@datastax.com>
Authored: Fri Jan 27 17:08:23 2017 -0500
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Wed May 3 17:57:24 2017 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ed91343/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9ec6c95..17a11ab 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.14
+ * Fix NPE in StorageService.excise() (CASSANDRA-13163)
* Expire OutboundTcpConnection messages by a single Thread (CASSANDRA-13265)
* Fail repair if insufficient responses received (CASSANDRA-13397)
* Fix SSTableLoader fail when the loaded table contains dropped columns (CASSANDRA-13276)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ed91343/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 143b402..9bc046f 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -2247,8 +2247,9 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
{
logger.info("Removing tokens {} for {}", tokens, endpoint);
- if (tokenMetadata.isMember(endpoint))
- HintsService.instance.excise(tokenMetadata.getHostId(endpoint));
+ UUID hostId = tokenMetadata.getHostId(endpoint);
+ if (hostId != null && tokenMetadata.isMember(endpoint))
+ HintsService.instance.excise(hostId);
removeEndpoint(endpoint);
tokenMetadata.removeEndpoint(endpoint);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by aw...@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/8b97a91b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8b97a91b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8b97a91b
Branch: refs/heads/cassandra-3.11
Commit: 8b97a91bfe2674430241df16ef4a073feac114c1
Parents: 1876588 6ed9134
Author: Ariel Weisberg <aw...@apple.com>
Authored: Wed May 3 17:59:06 2017 -0400
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Wed May 3 18:00:03 2017 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b97a91b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 64e9e50,17a11ab..6603911
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,34 -1,5 +1,35 @@@
-3.0.14
+3.11.0
+ * UDA fails without input rows (CASSANDRA-13399)
+ * Fix compaction-stress by using daemonInitialization (CASSANDRA-13188)
+ * V5 protocol flags decoding broken (CASSANDRA-13443)
+ * Use write lock not read lock for removing sstables from compaction strategies. (CASSANDRA-13422)
+ * Use corePoolSize equal to maxPoolSize in JMXEnabledThreadPoolExecutors (CASSANDRA-13329)
+ * Avoid rebuilding SASI indexes containing no values (CASSANDRA-12962)
+ * Add charset to Analyser input stream (CASSANDRA-13151)
+ * 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)
+ * Delete illegal character from StandardTokenizerImpl.jflex (CASSANDRA-13417)
+ * Fix cqlsh automatic protocol downgrade regression (CASSANDRA-13307)
+ * Tracing payload not passed from QueryMessage to tracing session (CASSANDRA-12835)
+Merged from 3.0:
+ * Fix NPE in StorageService.excise() (CASSANDRA-13163)
* Expire OutboundTcpConnection messages by a single Thread (CASSANDRA-13265)
* Fail repair if insufficient responses received (CASSANDRA-13397)
* Fix SSTableLoader fail when the loaded table contains dropped columns (CASSANDRA-13276)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b97a91b/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[6/6] cassandra git commit: Merge branch 'cassandra-3.11' into HEAD
Posted by aw...@apache.org.
Merge branch 'cassandra-3.11' into HEAD
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2f9de24f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2f9de24f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2f9de24f
Branch: refs/heads/trunk
Commit: 2f9de24f0237ec217c461c376f844783c96420af
Parents: ed4a7c5 8b97a91
Author: Ariel Weisberg <aw...@apple.com>
Authored: Wed May 3 18:01:21 2017 -0400
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Wed May 3 18:02:05 2017 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f9de24f/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f9de24f/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[3/6] cassandra git commit: CASSANDRA-13163,
fix NPE in StorageService.excise()
Posted by aw...@apache.org.
CASSANDRA-13163, fix NPE in StorageService.excise()
Patch by Ariel Weisberg; Reviewed by Jason Brown for CASSANDRA-13163
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6ed91343
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6ed91343
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6ed91343
Branch: refs/heads/trunk
Commit: 6ed9134336bb48d04284cefd303d8374ed901c0a
Parents: 617c8eb
Author: Ariel Weisberg <ar...@datastax.com>
Authored: Fri Jan 27 17:08:23 2017 -0500
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Wed May 3 17:57:24 2017 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ed91343/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9ec6c95..17a11ab 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.14
+ * Fix NPE in StorageService.excise() (CASSANDRA-13163)
* Expire OutboundTcpConnection messages by a single Thread (CASSANDRA-13265)
* Fail repair if insufficient responses received (CASSANDRA-13397)
* Fix SSTableLoader fail when the loaded table contains dropped columns (CASSANDRA-13276)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ed91343/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 143b402..9bc046f 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -2247,8 +2247,9 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
{
logger.info("Removing tokens {} for {}", tokens, endpoint);
- if (tokenMetadata.isMember(endpoint))
- HintsService.instance.excise(tokenMetadata.getHostId(endpoint));
+ UUID hostId = tokenMetadata.getHostId(endpoint);
+ if (hostId != null && tokenMetadata.isMember(endpoint))
+ HintsService.instance.excise(hostId);
removeEndpoint(endpoint);
tokenMetadata.removeEndpoint(endpoint);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[2/6] cassandra git commit: CASSANDRA-13163,
fix NPE in StorageService.excise()
Posted by aw...@apache.org.
CASSANDRA-13163, fix NPE in StorageService.excise()
Patch by Ariel Weisberg; Reviewed by Jason Brown for CASSANDRA-13163
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6ed91343
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6ed91343
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6ed91343
Branch: refs/heads/cassandra-3.11
Commit: 6ed9134336bb48d04284cefd303d8374ed901c0a
Parents: 617c8eb
Author: Ariel Weisberg <ar...@datastax.com>
Authored: Fri Jan 27 17:08:23 2017 -0500
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Wed May 3 17:57:24 2017 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ed91343/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9ec6c95..17a11ab 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.14
+ * Fix NPE in StorageService.excise() (CASSANDRA-13163)
* Expire OutboundTcpConnection messages by a single Thread (CASSANDRA-13265)
* Fail repair if insufficient responses received (CASSANDRA-13397)
* Fix SSTableLoader fail when the loaded table contains dropped columns (CASSANDRA-13276)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ed91343/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 143b402..9bc046f 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -2247,8 +2247,9 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
{
logger.info("Removing tokens {} for {}", tokens, endpoint);
- if (tokenMetadata.isMember(endpoint))
- HintsService.instance.excise(tokenMetadata.getHostId(endpoint));
+ UUID hostId = tokenMetadata.getHostId(endpoint);
+ if (hostId != null && tokenMetadata.isMember(endpoint))
+ HintsService.instance.excise(hostId);
removeEndpoint(endpoint);
tokenMetadata.removeEndpoint(endpoint);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by aw...@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/8b97a91b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8b97a91b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8b97a91b
Branch: refs/heads/trunk
Commit: 8b97a91bfe2674430241df16ef4a073feac114c1
Parents: 1876588 6ed9134
Author: Ariel Weisberg <aw...@apple.com>
Authored: Wed May 3 17:59:06 2017 -0400
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Wed May 3 18:00:03 2017 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b97a91b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 64e9e50,17a11ab..6603911
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,34 -1,5 +1,35 @@@
-3.0.14
+3.11.0
+ * UDA fails without input rows (CASSANDRA-13399)
+ * Fix compaction-stress by using daemonInitialization (CASSANDRA-13188)
+ * V5 protocol flags decoding broken (CASSANDRA-13443)
+ * Use write lock not read lock for removing sstables from compaction strategies. (CASSANDRA-13422)
+ * Use corePoolSize equal to maxPoolSize in JMXEnabledThreadPoolExecutors (CASSANDRA-13329)
+ * Avoid rebuilding SASI indexes containing no values (CASSANDRA-12962)
+ * Add charset to Analyser input stream (CASSANDRA-13151)
+ * 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)
+ * Delete illegal character from StandardTokenizerImpl.jflex (CASSANDRA-13417)
+ * Fix cqlsh automatic protocol downgrade regression (CASSANDRA-13307)
+ * Tracing payload not passed from QueryMessage to tracing session (CASSANDRA-12835)
+Merged from 3.0:
+ * Fix NPE in StorageService.excise() (CASSANDRA-13163)
* Expire OutboundTcpConnection messages by a single Thread (CASSANDRA-13265)
* Fail repair if insufficient responses received (CASSANDRA-13397)
* Fix SSTableLoader fail when the loaded table contains dropped columns (CASSANDRA-13276)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b97a91b/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org