Merge pull request #104246 from cockroachdb/blathers/backport-release…

…-23.1-104128
cockroachdb · Jun 26, 2023 · bcbc49f · bcbc49f
2 parents dbf6ce8 + e32b529
commit bcbc49f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/pkg/util/startup/BUILD.bazel b/pkg/util/startup/BUILD.bazel
@@ -8,6 +8,8 @@ go_library(
     visibility = ["//visibility:public"],
     deps = [
         "//pkg/kv/kvpb",
+        "//pkg/sql/pgwire/pgcode",
+        "//pkg/sql/pgwire/pgerror",
         "//pkg/util",
         "//pkg/util/log",
         "//pkg/util/retry",

diff --git a/pkg/util/startup/retry.go b/pkg/util/startup/retry.go
@@ -60,6 +60,8 @@ import (
 	"time"
 
 	"github.com/cockroachdb/cockroach/pkg/kv/kvpb"
+	"github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgcode"
+	"github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgerror"
 	"github.com/cockroachdb/cockroach/pkg/util"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
 	"github.com/cockroachdb/cockroach/pkg/util/retry"
@@ -206,5 +208,8 @@ func inStartup() bool {
 
 // IsRetryableReplicaError returns true for replica availability errors.
 func IsRetryableReplicaError(err error) bool {
-	return errors.HasType(err, (*kvpb.ReplicaUnavailableError)(nil)) || errors.HasType(err, (*kvpb.AmbiguousResultError)(nil))
+	return errors.HasType(err, (*kvpb.ReplicaUnavailableError)(nil)) ||
+		errors.HasType(err, (*kvpb.AmbiguousResultError)(nil)) ||
+		// See https://github.com/cockroachdb/cockroach/issues/104016#issuecomment-1569719273.
+		pgerror.GetPGCode(err) == pgcode.RangeUnavailable
 }