fix: prevent schema refresh deadlock when newInstance() fails#842
Merged
dkropachev merged 1 commit intoscylladb:scylla-4.xfrom Mar 19, 2026
Conversation
…check fails When SchemaQueries.newInstance() throws or schema agreement check fails, the cleanup code (resetting currentSchemaRefresh, completing firstSchemaRefreshFuture, draining queuedSchemaRefresh) was never executed, permanently blocking all future schema refreshes for the session. Extract cleanup into onSchemaRefreshComplete() and call it from all three completion paths: agreement error, newInstance() exception, and normal completion. Fixes: scylladb#841
dkropachev
force-pushed
the
fix/schema-refresh-deadlock-on-newinstance-failure
branch
from
175fd3e to
4779c0e
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
SchemaQueries.newInstance()throws or schema agreement check fails instartSchemaRequest(),currentSchemaRefreshwas never reset tonull, permanently blocking all future schema refreshes for the sessiononSchemaRefreshComplete()helper and call it from all three completion paths (agreement error,newInstance()exception, normal completion)newInstance()failure, agreement error, and queued refresh drainingFixes #841
Test plan
MetadataManagerTest.refreshSchema_should_recover_after_newInstance_failure— second refresh completes after first failsMetadataManagerTest.refreshSchema_should_recover_after_agreement_error— second refresh completes after agreement check failureMetadataManagerTest.refreshSchema_should_drain_queued_refresh_after_newInstance_failure— queued refresh is drained when active refresh failsMetadataManagerTesttests pass