Merge pull request #9171 from FirebirdSQL/work/gh-9169

Fixed bug #9169 : SuperServer: no attachment to ANY database can proceed while two or more attachments wait for a database under exclusive validation

Author: hvlad

src/jrd/Database.h

@@ -485,6 +485,7 @@ class Database : public pool_alloc<type_dbb>
 	USHORT dbb_dp_per_pp;				// data pages per pointer page
 	USHORT dbb_max_records;				// max record per data page
 	USHORT dbb_max_idx;					// max number of indexes on a root page
+	ULONG dbb_rdb_pages;				// cached number of first PP of RDB$PAGES relation, see hdr_PAGES
 
 #ifdef SUPERSERVER_V2
 	USHORT dbb_prefetch_sequence;		// sequence to pace frequency of prefetch requests

src/jrd/dpm.epp

@@ -596,6 +596,7 @@ void DPM_create_relation_pages(thread_db* tdbb, jrd_rel* relation, RelationPages
 		header_page* header = (header_page*) CCH_FETCH(tdbb, &root_window, LCK_write, pag_header);
 		CCH_MARK(tdbb, &root_window);
 		header->hdr_PAGES = window.win_page.getPageNum();
+		dbb->dbb_rdb_pages = header->hdr_PAGES;
 
 		CCH_RELEASE(tdbb, &root_window);
 	}

src/jrd/ini.epp

@@ -733,6 +733,17 @@ void INI_init(thread_db* tdbb)
 			field->fld_name = names[fld[RFLD_F_NAME]];
 		}
 	}
+
+	if (dbb->dbb_rdb_pages)
+	{
+		jrd_rel* relation = MET_relation(tdbb, 0);
+		RelationPages* relPages = relation->getBasePages();
+		fb_assert(!relPages->rel_pages);
+
+		vcl* vector = vcl::newVector(*relation->rel_pool, 1);
+		relPages->rel_pages = vector;
+		(*vector)[0] = dbb->dbb_rdb_pages;
+	}
 }
 
 

src/jrd/jrd.cpp

@@ -1825,9 +1825,9 @@ JAttachment* JProvider::internalAttach(CheckStatusWrapper* user_status, const ch
 
 				jAtt->getStable()->manualAsyncUnlock(attachment->att_flags);
 
+				PAG_header_init(tdbb);
 				INI_init(tdbb);
 				SHUT_init(tdbb);
-				PAG_header_init(tdbb);
 				INI_init2(tdbb);
 				PAG_init(tdbb);
 
@@ -1888,7 +1888,6 @@ JAttachment* JProvider::internalAttach(CheckStatusWrapper* user_status, const ch
 
 				INI_init(tdbb);
 				INI_init2(tdbb);
-				PAG_header(tdbb, true);
 				dbb->dbb_crypto_manager->attach(tdbb, attachment);
 			}
 

src/jrd/pag.cpp

@@ -1122,17 +1122,6 @@ void PAG_header(thread_db* tdbb, bool info)
 	if (header->hdr_flags & hdr_SQL_dialect_3)
 		dbb->dbb_flags |= DBB_DB_SQL_dialect_3;
 
-	jrd_rel* relation = MET_relation(tdbb, 0);
-	RelationPages* relPages = relation->getBasePages();
-	if (!relPages->rel_pages)
-	{
-		// NS: There's no need to reassign first page for RDB$PAGES relation since
-		// current code cannot change its location after database creation.
-		vcl* vector = vcl::newVector(*relation->rel_pool, 1);
-		relPages->rel_pages = vector;
-		(*vector)[0] = header->hdr_PAGES;
-	}
-
 	dbb->dbb_next_transaction = next_transaction;
 
 	if (!info || dbb->dbb_oldest_transaction < oldest_transaction)
@@ -1334,6 +1323,7 @@ void PAG_header_init(thread_db* tdbb)
 
 	dbb->dbb_page_size = header->hdr_page_size;
 	dbb->dbb_page_buffers = header->hdr_page_buffers;
+	dbb->dbb_rdb_pages = header->hdr_PAGES;
 }