Block concurrent runtime model initialization

dotnet · Feb 20, 2021 · b65cfb4 · b65cfb4
1 parent 9b577a4
commit b65cfb4
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 12 deletions.
diff --git a/src/EFCore/Infrastructure/ModelRuntimeInitializer.cs b/src/EFCore/Infrastructure/ModelRuntimeInitializer.cs
@@ -56,22 +56,35 @@ public virtual IModel Initialize(
         {
             if (model.ModelDependencies == null)
             {
-                model.ModelDependencies = Dependencies.ModelDependencies;
+                model = model.GetOrAddRuntimeAnnotationValue(
+                    CoreAnnotationNames.ReadOnlyModel,
+                    static args =>
+                    {
+                        var (initializer, model, validationLogger) = args;
+                        model.ModelDependencies = initializer.Dependencies.ModelDependencies;
 
-                InitializeModel(model, preValidation: true);
+                        initializer.InitializeModel(model, preValidation: true);
 
-                if (validationLogger != null
-                    && model is IConventionModel)
-                {
-                    Dependencies.ModelValidator.Validate(model, validationLogger);
-                }
+                        if (validationLogger != null
+                            && model is IConventionModel)
+                        {
+                            initializer.Dependencies.ModelValidator.Validate(model, validationLogger);
+                        }
 
-                InitializeModel(model, preValidation: false);
+                        initializer.InitializeModel(model, preValidation: false);
 
-                if (model is Model mutableModel)
-                {
-                    model = mutableModel.OnModelFinalized();
-                }
+                        if (model is Model mutableModel)
+                        {
+                            model = mutableModel.OnModelFinalized();
+                        }
+
+                        return model;
+                    },
+                    (this, model, validationLogger));
+            }
+            else
+            {
+                model = (IModel)model.FindRuntimeAnnotationValue(CoreAnnotationNames.ReadOnlyModel)!;
             }
 
             return model;

diff --git a/src/EFCore/Metadata/Internal/CoreAnnotationNames.cs b/src/EFCore/Metadata/Internal/CoreAnnotationNames.cs
@@ -203,6 +203,14 @@ public static class CoreAnnotationNames
         /// </summary>
         public const string ModelDependencies = "ModelDependencies";
 
+        /// <summary>
+        ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
+        ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
+        ///     any release. You should only use it directly in your code with extreme caution and knowing that
+        ///     doing so can result in application failures when updating to a new Entity Framework Core release.
+        /// </summary>
+        public const string ReadOnlyModel = "ReadOnlyModel";
+
         /// <summary>
         ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
         ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
@@ -294,6 +302,7 @@ public static class CoreAnnotationNames
             EagerLoaded,
             ProviderClrType,
             ModelDependencies,
+            ReadOnlyModel,
             InverseNavigations,
             DerivedTypes,
             NavigationCandidates,