Skip to content

Implements async SingleConnection closing on Domain.DisposeAsync() #83

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

Merged
alex-kulakov merged 2 commits into from
Nov 10, 2020
Merged

Implements async SingleConnection closing on Domain.DisposeAsync() #83

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e3a6f9
Implements async SingleConnection closing on Domain.DisposeAsync()
alex-kulakov Oct 27, 2020
a02bd33
Fixes formatting mistakes
alex-kulakov Oct 30, 2020
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
54 changes: 31 additions & 23 deletions Orm/Xtensive.Orm/Orm/Domain.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,41 +436,49 @@ internal Domain(DomainConfiguration configuration, object upgradeContextCookie,

public ValueTask DisposeAsync() => InnerDispose(true);

public ValueTask InnerDispose(bool isAsync)
public async ValueTask InnerDispose(bool isAsync)
{
lock (disposeGuard) {
if (isDisposed) {
return default;
return;
}

isDisposed = true;
}

if (isDebugEventLoggingEnabled) {
OrmLog.Debug(Strings.LogDomainIsDisposing);
}
if (isDebugEventLoggingEnabled) {
OrmLog.Debug(Strings.LogDomainIsDisposing);
}

NotifyDisposing();
Services.Dispose();
NotifyDisposing();
Services.Dispose();

if (SingleConnection==null) {
return default;
}
if (SingleConnection == null) {
return;
}

// TODO: implement async dispose of the SingleConnection
lock (singleConnectionGuard) {
if (singleConnectionOwner==null) {
var driver = Handlers.StorageDriver;
driver.CloseConnection(null, SingleConnection);
driver.DisposeConnection(null, SingleConnection);
}
else {
OrmLog.Warning(
Strings.LogUnableToCloseSingleAvailableConnectionItIsStillUsedBySessionX,
singleConnectionOwner);
}
SqlConnection singleConnectionLocal;
lock (singleConnectionGuard) {
if (singleConnectionOwner != null) {
OrmLog.Warning(
Strings.LogUnableToCloseSingleAvailableConnectionItIsStillUsedBySessionX,
singleConnectionOwner);
return;
}
else {
singleConnectionLocal = SingleConnection;
SingleConnection = null;
}
}

return default;
var driver = Handlers.StorageDriver;
if (isAsync) {
await driver.CloseConnectionAsync(null, singleConnectionLocal).ConfigureAwait(false);
await driver.DisposeConnectionAsync(null, singleConnectionLocal).ConfigureAwait(false);
}
else {
driver.CloseConnection(null, singleConnectionLocal);
driver.DisposeConnection(null, singleConnectionLocal);
}
}
}
Expand Down