You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2021/09/08 16:55:16 UTC
[cassandra] branch cassandra-4.0 updated (d90cd51 -> ffc6593)
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a change to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from d90cd51 Fix CHANGES.txt entries after bumping version to 4.0.2
new 5cdddcf Make assassinate more resilient to missing tokens
new ffc6593 Merge branch 'cassandra-3.11' into cassandra-4.0
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/gms/Gossiper.java | 8 +++++---
src/java/org/apache/cassandra/locator/TokenMetadata.java | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0
Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit ffc6593d06d119fb98e930b966b13c5461df6052
Merge: d90cd51 5cdddcf
Author: Brandon Williams <br...@apache.org>
AuthorDate: Wed Sep 8 11:49:05 2021 -0500
Merge branch 'cassandra-3.11' into cassandra-4.0
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/gms/Gossiper.java | 8 +++++---
src/java/org/apache/cassandra/locator/TokenMetadata.java | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --cc CHANGES.txt
index 9ed275e,f589208..0ff0ffe
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,28 -1,25 +1,30 @@@
-3.11.12
- * Make assassinate more resilient to missing tokens (CASSANDRA-16847)
+4.0.2
+ * Delay auth setup until after gossip has settled to avoid unavailables on startup (CASSANDRA-16783)
+ * Fix clustering order logic in CREATE MATERIALIZED VIEW (CASSANDRA-16898)
+ * org.apache.cassandra.db.rows.ArrayCell#unsharedHeapSizeExcludingData includes data twice (CASSANDRA-16900)
* Exclude Jackson 1.x transitive dependency of hadoop* provided dependencies (CASSANDRA-16854)
- * Validate SASI tokenizer options before adding index to schema (CASSANDRA-15135)
- * Fixup scrub output when no data post-scrub and clear up old use of row, which really means partition (CASSANDRA-16835)
- * Fix ant-junit dependency issue (CASSANDRA-16827)
- * Reduce thread contention in CommitLogSegment and HintsBuffer (CASSANDRA-16072)
- * Avoid sending CDC column if not enabled (CASSANDRA-16770)
++Merged from 3.11:
++ * Make assassinate more resilient to missing tokens (CASSANDRA-16847)
Merged from 3.0:
* Make the addition of regular column to COMPACT tables throw an InvalidRequestException (CASSANDRA-14564)
- * Fix materialized view schema backup as table (CASSANDRA-12734)
- * Avoid signaling DigestResolver until the minimum number of responses are guaranteed to be visible (CASSANDRA-16883)
- * Fix secondary indexes on primary key columns skipping some writes (CASSANDRA-16868)
- * Fix incorrect error message in LegacyLayout (CASSANDRA-15136)
- * Use JMX to validate nodetool --jobs parameter (CASSANDRA-16104)
- * Handle properly UnsatisfiedLinkError in NativeLibrary#getProcessID() (CASSANDRA-16578)
- * Remove mutation data from error log message (CASSANDRA-16817)
-Merged from 2.2:
- * Add python2 location to RPMs (CASSANDRA-16822)
-
-3.11.11
+4.0.1
+ * Tolerate missing DNS entry when completing a host replacement (CASSANDRA-16873)
+ * Harden PrunableArrayQueue against Pruner implementations that might throw exceptions (CASSANDRA-16866)
+ * Move RepairedDataInfo to the execution controller rather than the ReadCommand to avoid unintended sharing (CASSANDRA-16721)
+ * Bump zstd-jni version to 1.5.0-4 (CASSANDRA-16884)
+ * Remove assumption that all urgent messages are small (CASSANDRA-16877)
+ * ArrayClustering.unsharedHeapSize does not include the data so undercounts the heap size (CASSANDRA-16845)
+ * Improve help, doc and error messages about sstabledump -k and -x arguments (CASSANDRA-16818)
+ * Add repaired/unrepaired bytes back to nodetool (CASSANDRA-15282)
+ * Upgrade lz4-java to 1.8.0 to add RH6 support back (CASSANDRA-16753)
+ * Improve DiagnosticEventService.publish(event) logging message of events (CASSANDRA-16749)
+ * Cleanup dependency scopes (CASSANDRA-16704)
+ * Make JmxHistogram#getRecentValues() and JmxTimer#getRecentValues() thread-safe (CASSANDRA-16707)
+Merged from 3.11:
+ * Validate SASI tokenizer options before adding index to schema (CASSANDRA-15135)
+ * Fixup scrub output when no data post-scrub and clear up old use of row, which really means partition (CASSANDRA-16835)
+ * Reduce thread contention in CommitLogSegment and HintsBuffer (CASSANDRA-16072)
* Make cqlsh use the same set of reserved keywords than the server uses (CASSANDRA-15663)
* Optimize bytes skipping when reading SSTable files (CASSANDRA-14415)
* Enable tombstone compactions when unchecked_tombstone_compaction is set in TWCS (CASSANDRA-14496)
diff --cc src/java/org/apache/cassandra/gms/Gossiper.java
index 2c38cfb,08cd106..6eb674f
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@@ -770,10 -655,9 +770,9 @@@ public class Gossiper implements IFailu
*/
public void assassinateEndpoint(String address) throws UnknownHostException
{
- InetAddress endpoint = InetAddress.getByName(address);
+ InetAddressAndPort endpoint = InetAddressAndPort.getByName(address);
runInGossipStageBlocking(() -> {
EndpointState epState = endpointStateMap.get(endpoint);
- Collection<Token> tokens;
logger.warn("Assassinating {} via gossip", endpoint);
if (epState == null)
diff --cc src/java/org/apache/cassandra/locator/TokenMetadata.java
index f2bbb9f,8300a39..ab21045
--- a/src/java/org/apache/cassandra/locator/TokenMetadata.java
+++ b/src/java/org/apache/cassandra/locator/TokenMetadata.java
@@@ -561,10 -556,9 +561,9 @@@ public class TokenMetadat
}
}
- public Collection<Token> getTokens(InetAddress endpoint)
+ public Collection<Token> getTokens(InetAddressAndPort endpoint)
{
assert endpoint != null;
- assert isMember(endpoint); // don't want to return nulls
lock.readLock().lock();
try
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org