Retry more errors

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [v0.1.4]
+
+### Changed
+
+- Retry queries that error with `query processing would load too many samples into memory`
+  using a smaller time range.
+
 ## [v0.1.3]
 
 ### Added

internal/promapi/range.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"net"
+	"strings"
 	"time"
 
 	"github.com/prometheus/client_golang/api"
@@ -64,7 +65,7 @@ func RangeQuery(uri string, timeout time.Duration, expr string, start, end time.
 		Msg("Range query completed")
 	if err != nil {
 		log.Error().Err(err).Str("uri", uri).Str("query", expr).Msg("Range query failed")
-		if err, ok := err.(net.Error); ok && err.Timeout() {
+		if isRetryable(err) {
 			delta := end.Sub(start) / 2
 			log.Warn().Str("delta", HumanizeDuration(delta)).Msg("Retrying request with smaller range")
 			b, _ := start.MarshalText()
@@ -95,3 +96,13 @@ func RangeQuery(uri string, timeout time.Duration, expr string, start, end time.
 
 	return &qr, nil
 }
+
+func isRetryable(err error) bool {
+	if err, ok := err.(net.Error); ok && err.Timeout() {
+		return true
+	}
+	if strings.Contains(err.Error(), "query processing would load too many samples into memory in ") {
+		return true
+	}
+	return false
+}