From 8cfcf51305284f2b647a5b3fbe7f037b1ea4aa5d Mon Sep 17 00:00:00 2001
From: dimitr <dimitr@users.sourceforge.net>
Date: Wed, 4 Sep 2013 17:44:52 +0000
Subject: [PATCH] Cleanup and use the explicit rollback via TIP for all kinds
 of forced disconnections.

---
 src/jrd/jrd.cpp | 47 +++++++++++++++++------------------------------
 src/jrd/jrd.h   |  2 +-
 2 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/src/jrd/jrd.cpp b/src/jrd/jrd.cpp
index 5cf675263b..b74c15d18c 100644
--- a/src/jrd/jrd.cpp
+++ b/src/jrd/jrd.cpp
@@ -655,7 +655,7 @@ static void			init_monitoring_lock(thread_db*);
 static ISC_STATUS	handle_error(ISC_STATUS*, ISC_STATUS);
 static void			run_commit_triggers(thread_db* tdbb, jrd_tra* transaction);
 static void			verify_request_synchronization(jrd_req*& request, SSHORT level);
-static unsigned int purge_transactions(thread_db*, Attachment*, const bool, const ULONG);
+static void			purge_transactions(thread_db*, Attachment*, const bool);
 namespace {
 	enum VdnResult {VDN_FAIL, VDN_OK, VDN_SECURITY};
 }
@@ -2442,8 +2442,13 @@ ISC_STATUS GDS_DETACH(ISC_STATUS* user_status, Attachment** handle)
 		AttachmentHolder attHolder(tdbb, attachment, "GDS_DETACH");
 
 		DatabaseContextHolder dbbHolder(tdbb);
+		Database* const dbb = tdbb->getDatabase();
 
-		purge_attachment(tdbb, attachment, false);
+		const bool force = engineShutdown ||
+			(dbb->dbb_ast_flags & DBB_shutdown) ||
+			(attachment->att_flags & ATT_shutdown);
+
+		purge_attachment(tdbb, attachment, force);
 		*handle = NULL;
 	}
 	catch (const Exception& ex)
@@ -2518,7 +2523,7 @@ ISC_STATUS GDS_DROP_DATABASE(ISC_STATUS* user_status, Attachment** handle)
 				}
 
 				// Forced release of all transactions
-				purge_transactions(tdbb, attachment, true, attachment->att_flags);
+				purge_transactions(tdbb, attachment, true);
 
 				tdbb->tdbb_flags |= TDBB_detaching;
 
@@ -6204,10 +6209,7 @@ static void ExtractDriveLetter(const TEXT* file_name, ULONG* drive_mask)
 #endif
 
 
-static unsigned int purge_transactions(thread_db*	tdbb,
-									   Attachment*	attachment,
-									   const bool	force_flag,
-									   const ULONG	att_flags)
+static void purge_transactions(thread_db* tdbb, Attachment* attachment, const bool force_flag)
 {
 /**************************************
  *
@@ -6220,8 +6222,8 @@ static unsigned int purge_transactions(thread_db*	tdbb,
  *	from an attachment
  *
  **************************************/
-	Database* dbb = attachment->att_database;
-	jrd_tra* trans_dbk = attachment->att_dbkey_trans;
+	Database* const dbb = attachment->att_database;
+	jrd_tra* const trans_dbk = attachment->att_dbkey_trans;
 
 	unsigned int count = 0;
 	jrd_tra* next;
@@ -6231,8 +6233,7 @@ static unsigned int purge_transactions(thread_db*	tdbb,
 		next = transaction->tra_next;
 		if (transaction != trans_dbk)
 		{
-			if ((transaction->tra_flags & TRA_prepared) || (dbb->dbb_ast_flags & DBB_shutdown) ||
-				(att_flags & ATT_shutdown))
+			if (transaction->tra_flags & TRA_prepared)
 			{
 				TraceTransactionEnd trace(transaction, false, false);
 				EDS::Transaction::jrdTransactionEnd(tdbb, transaction, false, false, true);
@@ -6247,25 +6248,15 @@ static unsigned int purge_transactions(thread_db*	tdbb,
 
 	if (count)
 	{
-		return count;
+		ERR_post(Arg::Gds(isc_open_trans) << Arg::Num(count));
 	}
 
 	// If there's a side transaction for db-key scope, get rid of it
 	if (trans_dbk)
 	{
 		attachment->att_dbkey_trans = NULL;
-		if ((dbb->dbb_ast_flags & DBB_shutdown) || (att_flags & ATT_shutdown))
-		{
-			TraceTransactionEnd trace(trans_dbk, false, false);
-			TRA_release_transaction(tdbb, trans_dbk, &trace);
-		}
-		else
-		{
-			TRA_commit(tdbb, trans_dbk, false);
-		}
+		TRA_commit(tdbb, trans_dbk, false);
 	}
-
-	return 0;
 }
 
 
@@ -6345,7 +6336,7 @@ static void purge_attachment(thread_db* tdbb, Attachment* attachment, const bool
 		{
 			if (!force_flag)
 			{
-				attachment->att_flags |= (ATT_shutdown | ATT_purge_error);
+				attachment->att_flags |= ATT_shutdown;
 				throw;
 			}
 		}
@@ -6362,18 +6353,14 @@ static void purge_attachment(thread_db* tdbb, Attachment* attachment, const bool
 		if (!(dbb->dbb_flags & DBB_bugcheck))
 		{
 			// Check for any pending transactions
-			unsigned int count = purge_transactions(tdbb, attachment, force_flag, att_flags);
-			if (count)
-			{
-				ERR_post(Arg::Gds(isc_open_trans) << Arg::Num(count));
-			}
+			purge_transactions(tdbb, attachment, force_flag);
 		}
 	}
 	catch (const Exception&)
 	{
 		if (!force_flag)
 		{
-			attachment->att_flags |= (ATT_shutdown | ATT_purge_error);
+			attachment->att_flags |= ATT_shutdown;
 			throw;
 		}
 	}
diff --git a/src/jrd/jrd.h b/src/jrd/jrd.h
index 477278822d..2081ce5999 100644
--- a/src/jrd/jrd.h
+++ b/src/jrd/jrd.h
@@ -353,7 +353,7 @@ private:
 
 const ULONG ATT_no_cleanup			= 0x1;		// Don't expunge, purge, or garbage collect
 const ULONG ATT_shutdown			= 0x2;		// attachment has been shutdown
-const ULONG ATT_purge_error			= 0x4;		// trouble happened in purge attachment
+//const ULONG ATT_purge_error			= 0x4;		// trouble happened in purge attachment
 const ULONG ATT_shutdown_manager	= 0x8;		// attachment requesting shutdown
 const ULONG ATT_lck_init_done		= 0x10;		// LCK_init() called for the attachment
 const ULONG ATT_exclusive			= 0x20;		// attachment wants exclusive database access