Fixed #7979: Hang when database with disconnect trigger using MON$ tables is shutting down

AlexPeshkoff · AlexPeshkoff · commit 481863e63225 · 2024-01-28T12:26:01.000+03:00
diff --git a/src/jrd/cch.cpp b/src/jrd/cch.cpp
@@ -590,8 +590,6 @@ bool CCH_exclusive_attachment(thread_db* tdbb, USHORT level, SSHORT wait_flag, S
 	{
 		try
 		{
-			tdbb->checkCancelState();
-
 			bool found = false;
 			for (Jrd::Attachment* other_attachment = attachment->att_next; other_attachment;
 				 other_attachment = other_attachment->att_next)
@@ -642,6 +640,7 @@ bool CCH_exclusive_attachment(thread_db* tdbb, USHORT level, SSHORT wait_flag, S
 			if (remaining >= CCH_EXCLUSIVE_RETRY_INTERVAL)
 			{
 				SyncUnlockGuard unlock(exLock ? (*exGuard) : dsGuard);
+				tdbb->reschedule();
 				Thread::sleep(CCH_EXCLUSIVE_RETRY_INTERVAL);
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -590,8 +590,6 @@ bool CCH_exclusive_attachment(thread_db* tdbb, USHORT level, SSHORT wait_flag, S`
`590`	`590`	`{`
`591`	`591`	`try`
`592`	`592`	`{`
`593`		`- tdbb->checkCancelState();`
`594`		`-`
`595`	`593`	`bool found = false;`
`596`	`594`	`for (Jrd::Attachment* other_attachment = attachment->att_next; other_attachment;`
`597`	`595`	`other_attachment = other_attachment->att_next)`
`@@ -642,6 +640,7 @@ bool CCH_exclusive_attachment(thread_db* tdbb, USHORT level, SSHORT wait_flag, S`
`642`	`640`	`if (remaining >= CCH_EXCLUSIVE_RETRY_INTERVAL)`
`643`	`641`	`{`
`644`	`642`	`SyncUnlockGuard unlock(exLock ? (*exGuard) : dsGuard);`
	`643`	`+ tdbb->reschedule();`
`645`	`644`	`Thread::sleep(CCH_EXCLUSIVE_RETRY_INTERVAL);`
`646`	`645`	`}`
`647`	`646`