Fix memory leak in ModelContainer - #1101 #1506
Open
Conversation
This file contains 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
xuzhg
reviewed
Jun 27, 2018
| @@ -521,19 +539,21 @@ public virtual object ApplyQuery(object entity, ODataQueryOptions queryOptions) | |||
| /// <param name="modelFunction">A function to get the model.</param> | |||
| /// <param name="path">The OData path.</param> | |||
| /// <param name="createErrorAction">A function used to generate error response.</param> | |||
| /// <param name="request">The HttpRequest.</param> | |||
| @@ -509,7 +514,20 @@ public virtual object ApplyQuery(object entity, ODataQueryOptions queryOptions) | |||
| throw Error.InvalidOperation(SRResources.QueryGetModelMustNotReturnNull); | |||
| } | |||
|
|
|||
| return new ODataQueryContext(model, elementClrType, path); | |||
| ODataQueryContext queryContext = new ODataQueryContext(model, elementClrType, path); | |||
There was a problem hiding this comment.
In Core version, to use "ODataFeature" to add the Per-request information.
In Classic version, to use "ODataProperties" to add the Per-request information.
| string index = _map.GetOrAdd(model, m => Guid.NewGuid().ToString()); | ||
| _reverseMap.TryAdd(index, model); | ||
| string index = Guid.NewGuid().ToString(); | ||
| _map.TryAdd(index,model); |
There was a problem hiding this comment.
I think TryAdd should be GetOrAdd, maybe i am wrong?
xuzhg
reviewed
Jun 27, 2018
| @@ -483,6 +483,8 @@ public class Microsoft.AspNet.OData.ODataQueryContext { | |||
| Microsoft.OData.Edm.IEdmNavigationSource NavigationSource { public get; } | |||
| ODataPath Path { public get; } | |||
| System.IServiceProvider RequestContainer { public get; } | |||
|
|
|||
| protected virtual void Finalize () | |||
There was a problem hiding this comment.
need to change the Core version publicApi.bsl
This was referenced Jun 27, 2018
…zzo/WebAPI # Conflicts: # src/Microsoft.AspNet.OData.Shared/EnableQueryAttribute.cs # src/Microsoft.AspNet.OData.Shared/Query/Expressions/ModelContainer.cs
AlanWong-MS
reviewed
Jun 28, 2018
| { | ||
| HttpRequestScope httpRequestScope = request.RequestContainer.GetService(typeof(HttpRequestScope)) as HttpRequestScope; | ||
| HttpRequest httpRequest = httpRequestScope == null ? null : httpRequestScope.HttpRequest; | ||
|
|
AlanWong-MS
approved these changes
Jun 28, 2018
|
Are you still exploring the route of adding ModelIds to Request and having Request do the cleanup? |
biaol-odata
reviewed
Jun 28, 2018
| /// <summary> | ||
| /// Destructor called to clean up reference in ModelContainer | ||
| /// </summary> | ||
| ~ODataQueryContext() |
There was a problem hiding this comment.
should we use the IDisposable pattern instead of destructor?
|
@mikepizzo Will this PR be merged eventually, or has the memory leak been solved some other way...? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Issues
This pull request fixes issue #1101.
Description
Explores addressing memory leak by having each QueryContext keep it's own reference to a model and then cleaning it up in finalizer. Adds QueryContext to Request to ensure that the QueryContext is not cleaned up before the request is finished with it.
Checklist (Uncheck if it is not completed)
Additional work necessary
Explore other options. Could add modelIds to Request and have it clean up the modelIds directly.