natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-4.0' into cassandra-4.1

This commit is contained in:
Stefan Miklosovic 2024-01-11 11:28:31 +01:00
parent dc6afb0cf3 ee9e418782
commit fa6e06c933
No known key found for this signature in database
GPG Key ID: 32F35CB2F546D93E
4 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -8,6 +8,7 @@
* Allow empty keystore_password in encryption_options (CASSANDRA-18778)
* Skip ColumnFamilyStore#topPartitions initialization when client or tool mode (CASSANDRA-18697)
Merged from 4.0:
* Skip version check if an endpoint is dead state in Gossiper#upgradeFromVersionSupplier (CASSANDRA-19187)
* Fix Gossiper::hasMajorVersion3Nodes to return false during minor upgrade (CASSANDRA-18999)
* Revert unnecessary read lock acquisition when reading ring version in TokenMetadata introduced in CASSANDRA-16286 (CASSANDRA-19107)
* Support max SSTable size in sorted CQLSSTableWriter (CASSANDRA-18941)

7
src/java/org/apache/cassandra/gms/Gossiper.java
View File

@ -225,10 +225,13 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
// Check the release version of all the peers it heard of. Not necessary the peer that it has/had contacted with.
hasNodeWithUnknownVersion = false;
for (InetAddressAndPort host : endpointStateMap.keySet())
for (Entry<InetAddressAndPort, EndpointState> entry : endpointStateMap.entrySet())
{
CassandraVersion version = getReleaseVersion(host);
CassandraVersion version = getReleaseVersion(entry.getKey());
// if it is dead state, we skip the version check
if (isDeadState(entry.getValue()))
continue;
//Raced with changes to gossip state, wait until next iteration
if (version == null)
hasNodeWithUnknownVersion = true;

2
src/java/org/apache/cassandra/utils/ExpiringMemoizingSupplier.java
View File

@ -102,7 +102,7 @@ public class ExpiringMemoizingSupplier<T> implements Supplier<T>
this.value = value;
}
abstract boolean canMemoize();
public abstract boolean canMemoize();
public T value()
{

22
test/unit/org/apache/cassandra/gms/GossiperTest.java
View File

@ -198,6 +198,28 @@ public class GossiperTest
Gossiper.instance.liveEndpoints.remove(InetAddressAndPort.getByName("127.0.0.2"));
}
@Test
public void testAssassinatedNodeWillNotContributeToVersionCalculation() throws Exception
{
int initialNodeCount = 3;
Util.createInitialRing(ss, partitioner, endpointTokens, keyTokens, hosts, hostIds, initialNodeCount);
for (int i = 0; i < initialNodeCount; i++)
{
Gossiper.instance.injectApplicationState(hosts.get(i), ApplicationState.RELEASE_VERSION, new VersionedValue.VersionedValueFactory(null).releaseVersion(SystemKeyspace.CURRENT_VERSION.toString()));
}
Gossiper.instance.start(1);
Gossiper.instance.expireUpgradeFromVersion();
// assassinate a non-existing node
Gossiper.instance.assassinateEndpoint("127.0.0.4");
assertTrue(Gossiper.instance.endpointStateMap.containsKey(InetAddressAndPort.getByName("127.0.0.4")));
assertNull(Gossiper.instance.upgradeFromVersionSupplier.get().value());
assertTrue(Gossiper.instance.upgradeFromVersionSupplier.get().canMemoize());
assertFalse(Gossiper.instance.hasMajorVersion3OrUnknownNodes());
assertFalse(Gossiper.instance.isUpgradingFromVersionLowerThan(CassandraVersion.CASSANDRA_3_4));
}
@Test
public void testLargeGenerationJump() throws UnknownHostException, InterruptedException
{