chore(mysql): improve tests (#769)

netdata · Aug 18, 2022 · 6ff8777 · 6ff8777
1 parent dee191d
commit 6ff8777
Show file tree

Hide file tree

Showing 48 changed files with 3,689 additions and 10,831 deletions.
diff --git a/modules/mysql/charts.go b/modules/mysql/charts.go
@@ -94,9 +94,6 @@ var baseCharts = module.Charts{
 	chartInnoDBIOOperations.Copy(),
 	chartInnoDBPendingIOOperations.Copy(),
 	chartInnoDBLogOperations.Copy(),
-	chartInnoDBOSLogPendingOperations.Copy(),
-	chartInnoDBOSLogOperations.Copy(),
-	chartInnoDBOSLogIO.Copy(),
 	chartInnoDBCurrentRowLocks.Copy(),
 	chartInnoDBRowsOperations.Copy(),
 	chartInnoDBBufferPoolPages.Copy(),
@@ -348,41 +345,6 @@ var (
 			{ID: "innodb_log_writes", Name: "writes", Algo: module.Incremental, Mul: -1},
 		},
 	}
-	chartInnoDBOSLogPendingOperations = module.Chart{
-		ID:       "innodb_os_log",
-		Title:    "InnoDB OS Log Pending Operations",
-		Units:    "operations",
-		Fam:      "innodb",
-		Ctx:      "mysql.innodb_os_log",
-		Priority: prioInnoDBOSLog,
-		Dims: module.Dims{
-			{ID: "innodb_os_log_pending_fsyncs", Name: "fsyncs"},
-			{ID: "innodb_os_log_pending_writes", Name: "writes", Mul: -1},
-		},
-	}
-	chartInnoDBOSLogOperations = module.Chart{
-		ID:       "innodb_os_log_fsync_writes",
-		Title:    "InnoDB OS Log Operations",
-		Units:    "operations/s",
-		Fam:      "innodb",
-		Ctx:      "mysql.innodb_os_log_fsync_writes",
-		Priority: prioInnoDBOSLogFsyncWrites,
-		Dims: module.Dims{
-			{ID: "innodb_os_log_fsyncs", Name: "fsyncs", Algo: module.Incremental},
-		},
-	}
-	chartInnoDBOSLogIO = module.Chart{
-		ID:       "innodb_os_log_io",
-		Title:    "InnoDB OS Log Bandwidth",
-		Units:    "KiB/s",
-		Fam:      "innodb",
-		Ctx:      "mysql.innodb_os_log_io",
-		Type:     module.Area,
-		Priority: prioInnoDBOSLogIO,
-		Dims: module.Dims{
-			{ID: "innodb_os_log_written", Name: "write", Algo: module.Incremental, Mul: -1, Div: 1024},
-		},
-	}
 	chartInnoDBCurrentRowLocks = module.Chart{
 		ID:       "innodb_cur_row_lock",
 		Title:    "InnoDB Current Row Locks",
@@ -585,6 +547,50 @@ var (
 	}
 )
 
+var chartsInnoDBOSLog = module.Charts{
+	chartInnoDBOSLogPendingOperations.Copy(),
+	chartInnoDBOSLogOperations.Copy(),
+	chartInnoDBOSLogIO.Copy(),
+}
+
+var (
+	chartInnoDBOSLogPendingOperations = module.Chart{
+		ID:       "innodb_os_log",
+		Title:    "InnoDB OS Log Pending Operations",
+		Units:    "operations",
+		Fam:      "innodb",
+		Ctx:      "mysql.innodb_os_log",
+		Priority: prioInnoDBOSLog,
+		Dims: module.Dims{
+			{ID: "innodb_os_log_pending_fsyncs", Name: "fsyncs"},
+			{ID: "innodb_os_log_pending_writes", Name: "writes", Mul: -1},
+		},
+	}
+	chartInnoDBOSLogOperations = module.Chart{
+		ID:       "innodb_os_log_fsync_writes",
+		Title:    "InnoDB OS Log Operations",
+		Units:    "operations/s",
+		Fam:      "innodb",
+		Ctx:      "mysql.innodb_os_log_fsync_writes",
+		Priority: prioInnoDBOSLogFsyncWrites,
+		Dims: module.Dims{
+			{ID: "innodb_os_log_fsyncs", Name: "fsyncs", Algo: module.Incremental},
+		},
+	}
+	chartInnoDBOSLogIO = module.Chart{
+		ID:       "innodb_os_log_io",
+		Title:    "InnoDB OS Log Bandwidth",
+		Units:    "KiB/s",
+		Fam:      "innodb",
+		Ctx:      "mysql.innodb_os_log_io",
+		Type:     module.Area,
+		Priority: prioInnoDBOSLogIO,
+		Dims: module.Dims{
+			{ID: "innodb_os_log_written", Name: "write", Algo: module.Incremental, Mul: -1, Div: 1024},
+		},
+	}
+)
+
 var chartInnoDBDeadlocks = module.Chart{
 	ID:       "innodb_deadlocks",
 	Title:    "InnoDB Deadlocks",
@@ -1046,6 +1052,12 @@ func (m *MySQL) addUserStatisticsCharts(user string) {
 	}
 }
 
+func (m *MySQL) addInnoDBOSLogCharts() {
+	if err := m.Charts().Add(*chartsInnoDBOSLog.Copy()...); err != nil {
+		m.Warning(err)
+	}
+}
+
 func (m *MySQL) addMyISAMCharts() {
 	if err := m.Charts().Add(*chartsMyISAM.Copy()...); err != nil {
 		m.Warning(err)

diff --git a/modules/mysql/collect.go b/modules/mysql/collect.go
@@ -38,6 +38,9 @@ func (m *MySQL) collect() (map[string]int64, error) {
 		return nil, fmt.Errorf("error on collecting global status: %v", err)
 	}
 
+	if hasInnodbOSLog(mx) {
+		m.addInnoDBOSLogOnce.Do(m.addInnoDBOSLogCharts)
+	}
 	if hasInnodbDeadlocks(mx) {
 		m.addInnodbDeadlocksOnce.Do(m.addInnodbDeadlocksChart)
 	}
@@ -64,6 +67,7 @@ func (m *MySQL) collect() (map[string]int64, error) {
 		m.addBinlogOnce.Do(m.addBinlogCharts)
 	}
 
+	// TODO: perhaps make a decisions based on privileges? (SHOW GRANTS FOR CURRENT_USER();)
 	if m.doSlaveStatus {
 		if err := m.collectSlaveStatus(mx); err != nil {
 			m.Errorf("error on collecting slave status: %v", err)
@@ -117,6 +121,12 @@ func calcThreadCacheMisses(collected map[string]int64) {
 	}
 }
 
+func hasInnodbOSLog(collected map[string]int64) bool {
+	// removed in MariaDB 10.8 (https://mariadb.com/kb/en/innodb-status-variables/#innodb_os_log_fsyncs)
+	_, ok := collected["innodb_os_log_fsyncs"]
+	return ok
+}
+
 func hasInnodbDeadlocks(collected map[string]int64) bool {
 	_, ok := collected["innodb_deadlocks"]
 	return ok