replication: handle null from pg_wal functions

coroot · Aug 10, 2022 · 1579703 · 1579703
1 parent 0115d8d
commit 1579703
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/collector/collector.go b/collector/collector.go
@@ -287,8 +287,12 @@ func (c *Collector) Collect(ch chan<- prometheus.Metric) {
 	if c.replicationStatus != nil {
 		rs := c.replicationStatus
 		if rs.isInRecovery {
-			ch <- counter(dWalReceiveLsn, float64(rs.receiveLsn))
-			ch <- counter(dWalReplyLsn, float64(rs.replyLsn))
+			if rs.receiveLsn.Valid {
+				ch <- counter(dWalReceiveLsn, float64(rs.receiveLsn.Int64))
+			}
+			if rs.replyLsn.Valid {
+				ch <- counter(dWalReplyLsn, float64(rs.replyLsn.Int64))
+			}
 			isReplayPaused := 0.0
 			if rs.isReplayPaused {
 				isReplayPaused = 1.0
@@ -300,7 +304,9 @@ func (c *Collector) Collect(ch chan<- prometheus.Metric) {
 			}
 			ch <- gauge(dWalReceiverStatus, float64(rs.walReceiverStatus), host, port)
 		} else {
-			ch <- counter(dWalCurrentLsn, float64(rs.currentLsn))
+			if rs.currentLsn.Valid {
+				ch <- counter(dWalCurrentLsn, float64(rs.currentLsn.Int64))
+			}
 		}
 	}
 }

diff --git a/collector/pg_replication.go b/collector/pg_replication.go
@@ -28,9 +28,9 @@ func findValue(src string, re *regexp.Regexp) string {
 type replicationStatus struct {
 	isInRecovery bool
 
-	currentLsn int64
-	receiveLsn int64
-	replyLsn   int64
+	currentLsn sql.NullInt64
+	receiveLsn sql.NullInt64
+	replyLsn   sql.NullInt64
 
 	isReplayPaused bool