Move RO status before error return

Signed-off-by: Metbog <metbog@gmail.com>
prometheus · Sep 19, 2023 · 9ec9172 · 9ec9172
1 parent f34aaa6
commit 9ec9172
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/collector/filesystem_common.go b/collector/filesystem_common.go
@@ -186,6 +186,11 @@ func (c *filesystemCollector) Update(ch chan<- prometheus.Metric) error {
 			c.deviceErrorDesc, prometheus.GaugeValue,
 			s.deviceError, s.labels.device, s.labels.mountPoint, s.labels.fsType,
 		)
+		ch <- prometheus.MustNewConstMetric(
+			c.roDesc, prometheus.GaugeValue,
+			s.ro, s.labels.device, s.labels.mountPoint, s.labels.fsType,
+		)
+
 		if s.deviceError > 0 {
 			continue
 		}
@@ -210,10 +215,6 @@ func (c *filesystemCollector) Update(ch chan<- prometheus.Metric) error {
 			c.filesFreeDesc, prometheus.GaugeValue,
 			s.filesFree, s.labels.device, s.labels.mountPoint, s.labels.fsType,
 		)
-		ch <- prometheus.MustNewConstMetric(
-			c.roDesc, prometheus.GaugeValue,
-			s.ro, s.labels.device, s.labels.mountPoint, s.labels.fsType,
-		)
 	}
 	return nil
 }
diff --git a/collector/filesystem_linux.go b/collector/filesystem_linux.go
@@ -124,21 +124,23 @@ func (c *filesystemCollector) processStat(labels filesystemLabels) filesystemSta
 	}
 	stuckMountsMtx.Unlock()
 
+	var ro float64
+	for _, option := range strings.Split(labels.options, ",") {
+		if option == "ro" {
+			ro = 1
+			break
+		}
+	}
+
 	if err != nil {
 		level.Debug(c.logger).Log("msg", "Error on statfs() system call", "rootfs", rootfsFilePath(labels.mountPoint), "err", err)
 		return filesystemStats{
 			labels:      labels,
 			deviceError: 1,
+			ro:          ro,
 		}
 	}
 
-	var ro float64
-	for _, option := range strings.Split(labels.options, ",") {
-		if option == "ro" {
-			ro = 1
-			break
-		}
-	}
 	return filesystemStats{
 		labels:    labels,
 		size:      float64(buf.Blocks) * float64(buf.Bsize),