From fc3c972493007a5b458a525a1c6a65ba326b00af Mon Sep 17 00:00:00 2001 From: AndriySvyryd <6539701+AndriySvyryd@users.noreply.github.com> Date: Tue, 27 Oct 2026 01:17:07 +0000 Subject: [PATCH] Fix GetRelationalModel race condition Recheck the relational model annotation if its factory has already been removed. Add a deterministic regression test for concurrent first access.\n\nFixes #39214\n\nCo-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../Extensions/RelationalModelExtensions.cs | 10 ++++-- .../Metadata/RelationalModelTest.cs | 31 +++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/src/EFCore.Relational/Extensions/RelationalModelExtensions.cs b/src/EFCore.Relational/Extensions/RelationalModelExtensions.cs index 8a8aa96694d..be88e2d00ba 100644 --- a/src/EFCore.Relational/Extensions/RelationalModelExtensions.cs +++ b/src/EFCore.Relational/Extensions/RelationalModelExtensions.cs @@ -70,8 +70,14 @@ public static IRelationalModel GetRelationalModel(this IModel model) if (relationalModel == null) { var relationalModelFactory = (Func?)model.FindRuntimeAnnotationValue( - RelationalAnnotationNames.RelationalModelFactory) - ?? throw new InvalidOperationException(CoreStrings.ModelNotFinalized(nameof(GetRelationalModel))); + RelationalAnnotationNames.RelationalModelFactory); + if (relationalModelFactory == null) + { + // The factory is removed after the relational model is created, which could have happened on another thread + return (IRelationalModel?)model.FindRuntimeAnnotationValue(RelationalAnnotationNames.RelationalModel) + ?? throw new InvalidOperationException(CoreStrings.ModelNotFinalized(nameof(GetRelationalModel))); + } + lock (relationalModelFactory) { relationalModel = model.GetOrAddRuntimeAnnotationValue( diff --git a/test/EFCore.Relational.Tests/Metadata/RelationalModelTest.cs b/test/EFCore.Relational.Tests/Metadata/RelationalModelTest.cs index ef756bd56ed..5726b3133e0 100644 --- a/test/EFCore.Relational.Tests/Metadata/RelationalModelTest.cs +++ b/test/EFCore.Relational.Tests/Metadata/RelationalModelTest.cs @@ -20,6 +20,17 @@ public void GetRelationalModel_throws_if_convention_has_not_run() Assert.Throws(() => ((IModel)modelBuilder.Model).GetRelationalModel()).Message); } + [ConditionalFact] + public void GetRelationalModel_does_not_throw_if_relational_model_is_created_concurrently() + { + var model = new ConcurrentlyInitializedModel(); + var relationalModel = new RelationalModel(model); + model.AddRuntimeAnnotation( + RelationalAnnotationNames.RelationalModelFactory, (Func)(() => relationalModel)); + + Assert.Same(relationalModel, model.GetRelationalModel()); + } + [ConditionalFact] public void Both_design_and_runtime_RelationalModels_are_built_for_external_model() { @@ -3234,6 +3245,26 @@ protected virtual TestHelpers.TestModelBuilder CreateConventionModelBuilder() public static void AssertEqual(IRelationalModel expectedModel, IRelationalModel actualModel) => RelationalModelAsserter.Instance.AssertEqual(expectedModel, actualModel); + private class ConcurrentlyInitializedModel() : RuntimeModel(skipDetectChanges: false, modelId: Guid.Empty, entityTypeCount: 0) + { + private bool _concurrentCallMade; + + public override Annotation FindRuntimeAnnotation(string name) + { + var annotation = base.FindRuntimeAnnotation(name); + if (name == RelationalAnnotationNames.RelationalModel + && annotation == null + && !_concurrentCallMade) + { + // Simulates another thread creating the relational model right after this lookup didn't find it + _concurrentCallMade = true; + this.GetRelationalModel(); + } + + return annotation; + } + } + public enum Mapping { TPH,