Updated to handle Buffer pool size, bytes 5575016448 and individual buffer pool info not overwriting the totals. This may only exist in percona, but the changes are backwards compat with what was existing

David Nguyen · David Nguyen · commit 9b4ac97a2362 · 2013-06-18T22:45:43.000-07:00
diff --git a/mysqld/conf.d/mysql.pyconf b/mysqld/conf.d/mysql.pyconf
@@ -181,6 +181,10 @@ collection_group {
     name = "mysql_innodb_rows_deleted"
   }
 
+  metric {
+    name = "mysql_innodb_buffer_pool_pages_bytes"
+  }
+
   metric {
     name = "mysql_innodb_buffer_pool_pages_total"
   }
diff --git a/mysqld/python_modules/DBUtil.py b/mysqld/python_modules/DBUtil.py
@@ -92,6 +92,7 @@ def new(*idxs):
 
 	innodb_status = defaultdict(int)
 	innodb_status['active_transactions']
+	individual_buffer_pool_info = False
 	
 	for line in innodb_status_raw:
 		istatus = line.split()
@@ -204,19 +205,27 @@ def new(*idxs):
 				innodb_status['log_bytes_flushed'] = isum(4,5)
 
 		# BUFFER POOL AND MEMORY
-		elif "Buffer pool size" in line:
+		elif "INDIVIDUAL BUFFER POOL INFO" in line:
+			# individual pools section.  We only want to record the totals 
+			# rather than each individual pool clobbering the totals
+			individual_buffer_pool_info = True
+
+		elif "Buffer pool size, bytes" in line and not individual_buffer_pool_info:
+			innodb_status['buffer_pool_pages_bytes'] = longish(istatus[4])
+
+		elif "Buffer pool size" in line and not individual_buffer_pool_info:
 			innodb_status['buffer_pool_pages_total'] = longish(istatus[3])
 		
-		elif "Free buffers" in line:
+		elif "Free buffers" in line and not individual_buffer_pool_info:
 			innodb_status['buffer_pool_pages_free'] = longish(istatus[2])
 		
-		elif "Database pages" in line:
+		elif "Database pages" in line and not individual_buffer_pool_info:
 			innodb_status['buffer_pool_pages_data'] = longish(istatus[2])
 		
-		elif "Modified db pages" in line:
+		elif "Modified db pages" in line and not individual_buffer_pool_info:
 			innodb_status['buffer_pool_pages_dirty'] = longish(istatus[3])
 		
-		elif "Pages read" in line and "ahead" not in line:
+		elif "Pages read" in line and "ahead" not in line and not individual_buffer_pool_info:
 				innodb_status['pages_read'] = longish(istatus[2])
 				innodb_status['pages_created'] = longish(istatus[4])
 				innodb_status['pages_written'] = longish(istatus[6])
diff --git a/mysqld/python_modules/mysql.py b/mysqld/python_modules/mysql.py
@@ -999,6 +999,13 @@ def metric_init(params):
 				'units': 'writes',
 			},
 
+			innodb_buffer_pool_pages_bytes = {
+				'description': "The total size of buffer pool, in bytes",
+				'value_type':'uint',
+				'units': 'bytes',
+				'slope': 'both',
+			},
+
 			innodb_buffer_pool_pages_total = {
 				'description': "The total size of buffer pool, in pages",
 				'value_type':'uint',

Original file line number	Diff line number	Diff line change
`@@ -181,6 +181,10 @@ collection_group {`
`181`	`181`	`name = "mysql_innodb_rows_deleted"`
`182`	`182`	`}`
`183`	`183`
	`184`	`+ metric {`
	`185`	`+ name = "mysql_innodb_buffer_pool_pages_bytes"`
	`186`	`+ }`
	`187`	`+`
`184`	`188`	`metric {`
`185`	`189`	`name = "mysql_innodb_buffer_pool_pages_total"`
`186`	`190`	`}`