lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fixing migration isolation and sessions lifetime

Browse Source
This commit is contained in:
Sebastien Ros
2014-09-15 17:27:44 -07:00
parent 0e1c0c567e
commit 85159d8728
2 changed files with 23 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard/Data/Migration/DataMigrationManager.cs
View File

@@ -90,6 +90,8 @@ namespace Orchard.Data.Migration {
// apply update methods to each migration class for the module
foreach (var migration in migrations) {
_transactionManager.RequireNew();
// copy the object for the Linq query
var tempMigration = migration;
@@ -102,8 +104,6 @@ namespace Orchard.Data.Migration {
}
try {
_transactionManager.RequireNew();
// do we need to call Create() ?
if (current == 0) {
// try to resolve a Create method

89
src/Orchard/Data/SessionLocator.cs
View File

@@ -15,8 +15,6 @@ namespace Orchard.Data {
private readonly ISessionFactoryHolder _sessionFactoryHolder;
private readonly IEnumerable<ISessionInterceptor> _interceptors;
private ISession _session;
private ITransaction _transaction;
private bool _cancelled;
public SessionLocator(
ISessionFactoryHolder sessionFactoryHolder,
@@ -32,19 +30,13 @@ namespace Orchard.Data {
public ISession For(Type entityType) {
Logger.Debug("Acquiring session for {0}", entityType);
((ITransactionManager)this).Demand();
Demand();
return _session;
}
public void Demand() {
EnsureSession();
if (_transaction == null) {
Logger.Debug("Creating transaction on Demand");
_transaction = _session.BeginTransaction(IsolationLevel);
}
EnsureSession(IsolationLevel);
}
public void RequireNew() {
@@ -52,78 +44,38 @@ namespace Orchard.Data {
}
public void RequireNew(IsolationLevel level) {
if (_transaction != null) {
Logger.Debug("New transaction required");
if (_cancelled) {
if (_transaction != null) {
Logger.Debug("Reverting operations from transaction");
_transaction.Rollback();
_transaction.Dispose();
Logger.Debug("Transaction disposed");
_transaction = null;
}
_cancelled = false;
}
else {
if (_transaction != null) {
Logger.Debug("Marking transaction as complete");
_transaction.Commit();
}
}
DisposeSession();
}
EnsureSession();
Logger.Debug("Creating new transaction with isolation level {0}", level);
_transaction = _session.BeginTransaction(level);
DisposeSession();
EnsureSession(level);
}
public void Cancel() {
Logger.Debug("Transaction cancelled flag set");
_cancelled = true;
Logger.Debug("Rolling back transaction");
_session.Transaction.Rollback();
}
public void Dispose() {
if (_transaction != null) {
try {
if (!_cancelled) {
Logger.Debug("Marking transaction as complete");
_transaction.Commit();
}
else {
Logger.Debug("Reverting operations from transaction");
_transaction.Rollback();
}
}
catch (Exception e) {
Logger.Error(e, "Error while disposing the transaction.");
}
finally {
_transaction.Dispose();
Logger.Debug("Transaction disposed");
_transaction = null;
_cancelled = false;
}
}
DisposeSession();
}
private void DisposeSession() {
if (_session != null) {
Logger.Debug("Disposing NHibernate session");
_session.Dispose();
_session = null;
try {
if (!_session.Transaction.WasRolledBack && _session.Transaction.IsActive) {
Logger.Debug("Committing transaction");
_session.Transaction.Commit();
}
}
finally {
Logger.Debug("Disposing session");
_session.Close();
_session.Dispose();
_session = null;
}
}
}
private void EnsureSession() {
private void EnsureSession(IsolationLevel level) {
if (_session != null) {
return;
}
@@ -131,6 +83,7 @@ namespace Orchard.Data {
var sessionFactory = _sessionFactoryHolder.GetSessionFactory();
Logger.Debug("Opening NHibernate session");
_session = sessionFactory.OpenSession(new OrchardSessionInterceptor(_interceptors.ToArray(), Logger));
_session.BeginTransaction(level);
}
class OrchardSessionInterceptor : IInterceptor {