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

apply schema if schema digest differs 

Patch by clohfink; reviewed by brandonwilliams and jwest for
CASSANDRA-19578
This commit is contained in:
Chris Lohfink 2024-04-19 20:27:42 -05:00 committed by Brandon Williams
parent 858a2b2321
commit a6e80317de
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -1,4 +1,5 @@
4.1.5
* Concurrent equivalent schema updates lead to unresolved disagreement (CASSANDRA-19578)
* Fix hints delivery for a node going down repeatedly (CASSANDRA-19495)
* Do not go to disk for reading hints file sizes (CASSANDRA-19477)
* Fix system_views.settings to handle array types (CASSANDRA-19475)

5
src/java/org/apache/cassandra/schema/DefaultSchemaUpdateHandler.java
View File

@ -197,7 +197,8 @@ public class DefaultSchemaUpdateHandler implements SchemaUpdateHandler, IEndpoin
// no-op
}
private synchronized SchemaTransformationResult applyMutations(Collection<Mutation> schemaMutations)
@VisibleForTesting
synchronized SchemaTransformationResult applyMutations(Collection<Mutation> schemaMutations)
{
// fetch the current state of schema for the affected keyspaces only
DistributedSchema before = schema;
@ -253,7 +254,7 @@ public class DefaultSchemaUpdateHandler implements SchemaUpdateHandler, IEndpoin
private void updateSchema(SchemaTransformationResult update, boolean local)
{
if (!update.diff.isEmpty())
if (!update.diff.isEmpty() || !update.after.getVersion().equals(schema.getVersion()))
{
this.schema = update.after;
logger.debug("Schema updated: {}", update);

18
test/unit/org/apache/cassandra/schema/SchemaTest.java
View File

@ -89,6 +89,24 @@ public class SchemaTest
}
}
@Test
public void testSchemaVersionUpdates() {
KeyspaceMetadata ksm = KeyspaceMetadata.create("testSchemaVersionUpdates", KeyspaceParams.simple(1));
SchemaTransformation.SchemaTransformationResult r = Schema.instance.transform(current -> current.withAddedOrUpdated(ksm));
Collection<Mutation> mutations = SchemaKeyspace.convertSchemaDiffToMutations(r.diff, FBUtilities.timestampMicros());
if (Schema.instance.updateHandler instanceof DefaultSchemaUpdateHandler)
{
((DefaultSchemaUpdateHandler) Schema.instance.updateHandler).applyMutations(mutations);
// now as if a 2nd schema update is received with same data (ie same alter to 2 differnet nodes)
mutations = SchemaKeyspace.convertSchemaDiffToMutations(r.diff, FBUtilities.timestampMicros());
((DefaultSchemaUpdateHandler) Schema.instance.updateHandler).applyMutations(mutations);
// schema should match the current digest
assertEquals(SchemaKeyspace.calculateSchemaDigest(), Schema.instance.getVersion());
}
Schema.instance.transform(current -> current.without(ksm.name));
}
@Test
public void testKeyspaceCreationWhenNotInitialized() {
Keyspace.unsetInitialized();