Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure schema is consistent while bootstrapping #583

Merged
merged 20 commits into from
Dec 12, 2024
Merged

Ensure schema is consistent while bootstrapping #583

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
fe2be48
ensure local schema version matches all endpoints in endpointStateMap…
rhuffy Nov 20, 2024
4c831cc
revert change to first schema check
rhuffy Nov 20, 2024
0aa8538
whitespace
rhuffy Nov 20, 2024
cc3c5ee
Bootstrap Error if schema changes while streams are being prepared
rhuffy Nov 25, 2024
4529d29
remove schema check at the end of bootstrapping
rhuffy Nov 25, 2024
7acfa9a
run schema check immediately after setting up streams.
rhuffy Nov 25, 2024
07e7798
remove unused
rhuffy Nov 25, 2024
e1e0fd3
remove unused imports
rhuffy Nov 25, 2024
e50bbb0
no longer tracking schema version in SS#joinTokenRing
rhuffy Nov 25, 2024
9039bbc
address comments
rhuffy Nov 26, 2024
ff59d2e
combine loops
rhuffy Nov 26, 2024
c577e09
fix visibility
rhuffy Nov 26, 2024
d692f30
nits
rhuffy Nov 26, 2024
63f60fe
whitespace
rhuffy Nov 26, 2024
14a9998
Merge branch 'palantir-cassandra-2.2.18' into rh/lock-schema-bootstrap
rhuffy Nov 26, 2024
56b2b86
refactor schema agreement check and test
rhuffy Nov 27, 2024
b8f3705
Merge branch 'palantir-cassandra-2.2.18' into rh/lock-schema-bootstrap
rhuffy Dec 11, 2024
c6f8db6
use `getStatus` helper, which has some special parsing
rhuffy Dec 12, 2024
e8b5fc1
switch to comparing on UUIDs
rhuffy Dec 12, 2024
be9a8e7
update test
rhuffy Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove schema check at the end of bootstrapping
  • Loading branch information
@rhuffy
rhuffy committed Nov 25, 2024
commit 4529d29889d8e8430367c2d5a838727b18b643bd
9 changes: 0 additions & 9 deletions src/java/org/apache/cassandra/service/StorageService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1055,15 +1055,6 @@ private void joinTokenRing(int delay, boolean autoBootstrap, Collection<String>
recordBootstrapErrorAndThrow("streamingFailed");
}

if(!localSchemaVersion.equals(Schema.instance.getVersion().toString()) || !isSchemaConsistent(localSchemaVersion))
{
logger.error(
"Schema has changed after bootstrapping started, or is inconsistent across nodes. initial: {}, current: {}",
SafeArg.of("initialSchemaVersion", localSchemaVersion),
SafeArg.of("currentSchemaVersion", Schema.instance.getVersion().toString()));
recordBootstrapErrorAndThrow("schemaConsistencyFailed");
}

logger.info("Bootstrap streaming complete. Waiting to finish bootstrap. Not becoming an active ring " +
"member. Use JMX (StorageService->finishBootstrap()) to finalize ring joining.");
try
Expand Down