It should fix bug CORE-5685 : Sometime it is impossible to cancel\kil…

…l connection executing external query
FirebirdSQL · Dec 20, 2017 · 257c5c4 · 257c5c4
1 parent 5a633f5
commit 257c5c4
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 10 deletions.
diff --git a/src/jrd/extds/ExtDS.cpp b/src/jrd/extds/ExtDS.cpp
@@ -277,7 +277,7 @@ void Provider::cancelConnections(thread_db* tdbb)
 	Connection** end = m_connections.end();
 
 	for (; ptr < end; ptr++) {
-		(*ptr)->cancelExecution(tdbb);
+		(*ptr)->cancelExecution(tdbb, true);
 	}
 }
 

diff --git a/src/jrd/extds/ExtDS.h b/src/jrd/extds/ExtDS.h
@@ -162,7 +162,7 @@ class Connection : public Firebird::PermanentStorage
 		const Firebird::string& role) = 0;
 	virtual void detach(Jrd::thread_db* tdbb);
 
-	virtual bool cancelExecution(Jrd::thread_db* tdbb) = 0;
+	virtual bool cancelExecution(Jrd::thread_db* tdbb, bool forced) = 0;
 
 	int getSqlDialect() const { return m_sqlDialect; }
 

diff --git a/src/jrd/extds/InternalDS.cpp b/src/jrd/extds/InternalDS.cpp
@@ -188,7 +188,7 @@ void InternalConnection::doDetach(thread_db* tdbb)
 	fb_assert(!m_attachment);
 }
 
-bool InternalConnection::cancelExecution(thread_db* tdbb)
+bool InternalConnection::cancelExecution(thread_db* tdbb, bool /*forced*/)
 {
 	if (m_isCurrent)
 		return true;

diff --git a/src/jrd/extds/InternalDS.h b/src/jrd/extds/InternalDS.h
@@ -67,7 +67,7 @@ class InternalConnection : public Connection
 		const Firebird::string& user, const Firebird::string& pwd,
 		const Firebird::string& role);
 
-	virtual bool cancelExecution(Jrd::thread_db* tdbb);
+	virtual bool cancelExecution(Jrd::thread_db* tdbb, bool forced);
 
 	virtual bool isAvailable(Jrd::thread_db* tdbb, TraScope traScope) const;
 

diff --git a/src/jrd/extds/IscDS.cpp b/src/jrd/extds/IscDS.cpp
@@ -193,14 +193,15 @@ void IscConnection::doDetach(thread_db* tdbb)
 		raise(status, tdbb, "detach");
 }
 
-bool IscConnection::cancelExecution(thread_db* /*tdbb*/)
+bool IscConnection::cancelExecution(thread_db* /*tdbb*/, bool forced)
 {
 	ISC_STATUS_ARRAY status = {0, 0, 0};
 	if (m_handle)
 	{
-		m_iscProvider.fb_cancel_operation(status, &m_handle, fb_cancel_raise);
+		m_iscProvider.fb_cancel_operation(status, &m_handle, 
+			forced ? fb_cancel_abort : fb_cancel_raise);
 
-		if (m_handle && status[1] == isc_wish_list)
+		if (!forced && m_handle && status[1] != FB_SUCCESS && status[1] != isc_bad_db_handle)
 		{
 			fb_utils::init_status(status);
 			m_iscProvider.fb_cancel_operation(status, &m_handle, fb_cancel_abort);

diff --git a/src/jrd/extds/IscDS.h b/src/jrd/extds/IscDS.h
@@ -514,7 +514,7 @@ class IscConnection : public Connection
 		const Firebird::string& user, const Firebird::string& pwd,
 		const Firebird::string& role);
 
-	virtual bool cancelExecution(Jrd::thread_db* tdbb);
+	virtual bool cancelExecution(Jrd::thread_db* tdbb, bool forced);
 
 	virtual bool isAvailable(Jrd::thread_db* tdbb, TraScope traScope) const;
 

diff --git a/src/jrd/jrd.cpp b/src/jrd/jrd.cpp
@@ -1728,6 +1728,11 @@ ISC_STATUS FB_CANCEL_OPERATION(ISC_STATUS* user_status, Attachment** handle, USH
 				attachment->signalCancel(tdbb);
 			break;
 
+		case fb_cancel_abort:
+			if (!(attachment->att_flags & ATT_shutdown))
+				attachment->signalShutdown(tdbb);
+			break;
+
 		default:
 			fb_assert(false);
 		}
@@ -5727,7 +5732,7 @@ void Attachment::signalCancel(thread_db* tdbb)
 	att_flags |= ATT_cancel_raise;
 
 	if (att_ext_connection)
-		att_ext_connection->cancelExecution(tdbb);
+		att_ext_connection->cancelExecution(tdbb, false);
 
 	LCK_cancel_wait(this);
 }
@@ -5737,7 +5742,7 @@ void Attachment::signalShutdown(thread_db* tdbb)
 	att_flags |= ATT_shutdown;
 
 	if (att_ext_connection)
-		att_ext_connection->cancelExecution(tdbb);
+		att_ext_connection->cancelExecution(tdbb, true);
 
 	LCK_cancel_wait(this);
 }