Extend monitoring with per-tablespace I/O statistics

Author: dyemanov

src/jrd/Monitoring.cpp

@@ -466,6 +466,7 @@ MonitoringSnapshot::MonitoringSnapshot(thread_db* tdbb, MemoryPool& pool)
 	const auto ctx_var_buffer = allocBuffer(tdbb, pool, rel_mon_ctx_vars);
 	const auto mem_usage_buffer = allocBuffer(tdbb, pool, rel_mon_mem_usage);
 	const auto tab_stat_buffer = allocBuffer(tdbb, pool, rel_mon_tab_stats);
+	const auto ts_stat_buffer = allocBuffer(tdbb, pool, rel_mon_ts_stats);
 
 	// Increment the global monitor generation
 
@@ -601,6 +602,9 @@ MonitoringSnapshot::MonitoringSnapshot(thread_db* tdbb, MemoryPool& pool)
 		case rel_mon_tab_stats:
 			buffer = tab_stat_buffer;
 			break;
+		case rel_mon_ts_stats:
+			buffer = ts_stat_buffer;
+			break;
 		default:
 			fb_assert(false);
 		}
@@ -862,6 +866,32 @@ void SnapshotData::putField(thread_db* tdbb, Record* record, const DumpField& fi
 		from_desc.makeBoolean(&value);
 		MOV_move(tdbb, &from_desc, &to_desc);
 	}
+	else if (field.type == VALUE_TABLESPACE_ID)
+	{
+		// special case: translate tablespace ID into name
+		fb_assert(field.length == sizeof(ULONG));
+		ULONG pageSpaceId;
+		memcpy(&pageSpaceId, field.data, field.length);
+
+		MetaName name;
+
+		if (pageSpaceId == 0)
+			name = TEMP_TABLESPACE_NAME;
+		else if (pageSpaceId == DB_PAGE_SPACE)
+			name = PRIMARY_TABLESPACE_NAME;
+		else if (PageSpace::isTablespace(pageSpaceId))
+		{
+			if (const auto tablespace = MET_tablespace_id(tdbb, pageSpaceId))
+				name = tablespace->name;
+		}
+
+		if (name.hasData())
+		{
+			dsc from_desc;
+			from_desc.makeText(name.length(), CS_METADATA, (UCHAR*) name.c_str());
+			MOV_move(tdbb, &from_desc, &to_desc);
+		}
+	}
 	else
 	{
 		fb_assert(false);
@@ -1449,7 +1479,33 @@ void Monitoring::putStatistics(SnapshotData::DumpRecord& record, const RuntimeSt
 	record.storeInteger(f_mon_rec_imgc, statistics[RecordStatType::IMGC]);
 	record.write();
 
-	// logical I/O statistics (table wise)
+	// physical I/O statistics (per tablespace)
+
+	for (const auto& counts : statistics.getPageCounters())
+	{
+		if (counts.isEmpty())
+			continue;
+
+		const auto io_stat_id = getGlobalId(fb_utils::genUniqueId());
+
+		record.reset(rel_mon_ts_stats);
+		record.storeGlobalId(f_mon_ts_stat_id, id);
+		record.storeInteger(f_mon_ts_stat_group, stat_group);
+		record.storeTablespaceId(f_mon_ts_name, counts.getGroupId());
+		record.storeGlobalId(f_mon_tab_io_stat_id, io_stat_id);
+		record.write();
+
+		record.reset(rel_mon_io_stats);
+		record.storeGlobalId(f_mon_io_stat_id, io_stat_id);
+		record.storeInteger(f_mon_io_stat_group, stat_group);
+		record.storeInteger(f_mon_io_page_reads, counts[PageStatType::READS]);
+		record.storeInteger(f_mon_io_page_writes, counts[PageStatType::WRITES]);
+		record.storeInteger(f_mon_io_page_fetches, counts[PageStatType::FETCHES]);
+		record.storeInteger(f_mon_io_page_marks, counts[PageStatType::MARKS]);
+		record.write();
+	}
+
+	// logical I/O statistics (per table)
 
 	for (const auto& counts : statistics.getTableCounters())
 	{

src/jrd/Monitoring.h

@@ -60,6 +60,7 @@ class SnapshotData
 		VALUE_STRING,
 		VALUE_BOOLEAN,
 		VALUE_TABLE_ID_SCHEMA_NAME,
+		VALUE_TABLESPACE_ID,
 		VALUE_LAST_MARKER	// Should be last item
 	};
 
@@ -134,6 +135,11 @@ class SnapshotData
 			storeField(field_id, VALUE_TABLE_ID_SCHEMA_NAME, sizeof(SLONG), &value);
 		}
 
+		void storeTablespaceId(int field_id, ULONG value)
+		{
+			storeField(field_id, VALUE_TABLESPACE_ID, sizeof(ULONG), &value);
+		}
+
 		void storeInteger(int field_id, SINT64 value)
 		{
 			storeField(field_id, VALUE_INTEGER, sizeof(SINT64), &value);

src/jrd/constants.h

@@ -513,5 +513,6 @@ inline constexpr USHORT MAX_ERROR_MSG_LENGTH = 1024 * METADATA_BYTES_PER_CHAR; /
 
 // Tablespaces
 const char* const PRIMARY_TABLESPACE_NAME = "PRIMARY";
+const char* const TEMP_TABLESPACE_NAME = "TEMPORARY";
 
 #endif // JRD_CONSTANTS_H

src/jrd/names.h

@@ -499,3 +499,7 @@ NAME("RDB$TABLE_SCHEMA_NAME", nam_tab_sch_name)
 NAME("RDB$CONST_SCHEMA_NAME_UQ", nam_con_sch_name_uq)
 NAME("MON$SEARCH_PATH", nam_mon_search_path)
 NAME("RDB$TEXT_MAX", nam_text_max)
+
+NAME("MON$TABLESPACE_STATS", nam_mon_ts_stats)
+NAME("MON$IO_STAT_ID", nam_mon_io_stat_id)
+NAME("MON$TABLESPACE_NAME", nam_mon_ts_name)

src/jrd/relations.h

@@ -829,3 +829,11 @@ RELATION(nam_tablespaces, rel_tablespaces, ODS_14_0, rel_persistent)
 	FIELD(f_ts_offline, nam_ts_offline, fld_bool, 1, ODS_14_0)
 	FIELD(f_ts_readonly, nam_ts_readonly, fld_bool, 1, ODS_14_0)
 END_RELATION
+
+// Relation 57 (MON$TABLESPACE_STATS)
+RELATION(nam_mon_ts_stats, rel_mon_ts_stats, ODS_14_0, rel_virtual)
+	FIELD(f_mon_ts_stat_id, nam_mon_stat_id, fld_stat_id, 0, ODS_14_0)
+	FIELD(f_mon_ts_stat_group, nam_mon_stat_group, fld_stat_group, 0, ODS_14_0)
+	FIELD(f_mon_ts_name, nam_mon_ts_name, fld_ts_name, 0, ODS_14_0)
+	FIELD(f_mon_tab_io_stat_id, nam_mon_io_stat_id, fld_stat_id, 0, ODS_14_0)
+END_RELATION

src/jrd/trace/TraceObjects.cpp

@@ -643,7 +643,19 @@ TraceRuntimeStats::TraceRuntimeStats(Attachment* attachment,
 
 		auto getTablespaceName = [&](unsigned id) -> Firebird::string
 		{
-			return ""; // TODO
+			if (id == 0)
+				return TEMP_TABLESPACE_NAME;
+
+			if (id == DB_PAGE_SPACE)
+				return PRIMARY_TABLESPACE_NAME;
+
+			if (PageSpace::isTablespace(id))
+			{
+				if (const auto tablespace = attachment->getTablespace(id))
+					return tablespace->name.c_str();
+			}
+
+			return "";
 		};
 
 		m_pageCounters.reset(&baseline->getPageCounters(), getTablespaceName);