Fix missing synchronization of the shared monitoring data

dyemanov · dyemanov · commit 5581ea6ff6bd · 2024-10-29T11:32:43.000+03:00
diff --git a/src/jrd/Monitoring.cpp b/src/jrd/Monitoring.cpp
@@ -507,7 +507,10 @@ MonitoringSnapshot::MonitoringSnapshot(thread_db* tdbb, MemoryPool& pool)
 		if (LCK_lock(tdbb, lock, LCK_EX, LCK_NO_WAIT))
 		{
 			LCK_release(tdbb, lock);
+
+			MonitoringData::Guard guard(dbb->dbb_monitoring_data);
 			dbb->dbb_monitoring_data->cleanup(attId);
+
 			continue;
 		}
 
@@ -541,7 +544,6 @@ MonitoringSnapshot::MonitoringSnapshot(thread_db* tdbb, MemoryPool& pool)
 	{ // scope for the guard
 
 		MonitoringData::Guard guard(dbb->dbb_monitoring_data);
-
 		dbb->dbb_monitoring_data->read(userNamePtr, temp_space);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -507,7 +507,10 @@ MonitoringSnapshot::MonitoringSnapshot(thread_db* tdbb, MemoryPool& pool)`
`507`	`507`	`if (LCK_lock(tdbb, lock, LCK_EX, LCK_NO_WAIT))`
`508`	`508`	`{`
`509`	`509`	`LCK_release(tdbb, lock);`
	`510`	`+`
	`511`	`+ MonitoringData::Guard guard(dbb->dbb_monitoring_data);`
`510`	`512`	`dbb->dbb_monitoring_data->cleanup(attId);`
	`513`	`+`
`511`	`514`	`continue;`
`512`	`515`	`}`
`513`	`516`
`@@ -541,7 +544,6 @@ MonitoringSnapshot::MonitoringSnapshot(thread_db* tdbb, MemoryPool& pool)`
`541`	`544`	`{ // scope for the guard`
`542`	`545`
`543`	`546`	`MonitoringData::Guard guard(dbb->dbb_monitoring_data);`
`544`		`-`
`545`	`547`	`dbb->dbb_monitoring_data->read(userNamePtr, temp_space);`
`546`	`548`	`}`
`547`	`549`