firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 22:03:03 +01:00
Code Issues

Better fix for CORE-2183 : Error in ExtDS when server shutdown started with opened Execute Statement.

Browse Source 
Make EDS handle broken connection properly
This commit is contained in:
hvlad 2009-03-13 13:17:20 +00:00
parent 5d067d3574
commit 4e0807690f
3 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/jrd/extds/InternalDS.cpp
View File

@ -168,7 +168,13 @@ void InternalConnection::doDetach(thread_db *tdbb)
m_attachment = att;
}
if (status[1]) {
if (status[1] == isc_att_shutdown)
{
m_attachment = 0;
fb_utils::init_status(status);
}
if (status[1])
{
raise(status, tdbb, "detach");
}
}
@ -283,6 +289,12 @@ void InternalTransaction::doRollback(ISC_STATUS* status, thread_db *tdbb, bool r
else
jrd8_rollback_transaction(status, &m_transaction);
}
if (status[1] == isc_att_shutdown && !retain)
{
m_transaction = 0;
fb_utils::init_status(status);
}
}

34
src/jrd/extds/IscDS.cpp
View File

@ -60,6 +60,7 @@ public:
static RegisterFBProvider reg;
static bool isConnectionBrokenError(ISC_STATUS status);
static void parseSQLDA(XSQLDA *xsqlda, UCharBuffer &buff, Firebird::Array<dsc> &descs);
static UCHAR sqlTypeToDscType(SSHORT sqlType);
@ -167,19 +168,8 @@ void IscConnection::doDetach(thread_db *tdbb)
m_handle = h;
}
switch (status[1])
{
case 0: // nothing to do
break;
case isc_att_shutdown:
case isc_network_error:
case isc_net_read_err:
case isc_net_write_err:
m_handle = 0;
break;
default:
if (status[1] && !isConnectionBrokenError(status[1]))
raise(status, tdbb, "detach");
}
}
bool IscConnection::cancelExecution(thread_db *tdbb)
@ -268,6 +258,12 @@ void IscTransaction::doRollback(ISC_STATUS* status, thread_db *tdbb, bool retain
else
m_iscProvider.isc_rollback_transaction(status, &m_handle);
if (status[1] && isConnectionBrokenError(status[1]) && !retain)
{
m_handle = 0;
fb_utils::init_status(status);
}
fb_assert(retain && m_handle || !retain && !m_handle || status[1] && m_handle);
}
@ -1505,6 +1501,20 @@ void FBProvider::loadAPI()
}
static bool isConnectionBrokenError(ISC_STATUS status)
{
switch (status)
{
case isc_att_shutdown:
case isc_network_error:
case isc_net_read_err:
case isc_net_write_err:
return true;
}
return false;
};
static void parseSQLDA(XSQLDA *xsqlda, UCharBuffer &buff, Firebird::Array<dsc> &descs)
{
size_t offset = 0;

6
src/jrd/jrd.cpp
View File

@ -512,9 +512,9 @@ static THREAD_ENTRY_DECLARE shutdown_thread(THREAD_ENTRY_PARAM);
static void cancel_attachments()
{
MutexLockGuard guard(databases_mutex);
engineShuttingDown = true;
MutexLockGuard guard(databases_mutex);
for (Database* dbb = databases; dbb; dbb = dbb->dbb_next)
{
if ( !(dbb->dbb_flags & (DBB_bugcheck | DBB_not_in_use | DBB_security_db)) )
@ -5733,13 +5733,10 @@ static void purge_attachment(thread_db* tdbb,
}
}
const bool wasShuttingDown = engineShuttingDown;
try
{
// allow to free resources used by dynamic statements
engineShuttingDown = false;
EDS::Manager::jrdAttachmentEnd(tdbb, attachment);
engineShuttingDown = wasShuttingDown;
const ULONG att_flags = attachment->att_flags;
attachment->att_flags |= ATT_shutdown;
@ -5758,7 +5755,6 @@ static void purge_attachment(thread_db* tdbb,
}
catch (const Exception&)
{
engineShuttingDown = wasShuttingDown;
attachment->att_flags |= (ATT_shutdown | ATT_purge_error);
throw;
}