recognise read only error returned from Lua script

zhengjilei · zhengjilei · commit d1c26e1fe6d3 · 2023-10-22T22:42:05.000+08:00
diff --git a/error.go b/error.go
@@ -58,7 +58,7 @@ func shouldRetry(err error, retryTimeout bool) bool {
 	if strings.HasPrefix(s, "LOADING ") {
 		return true
 	}
-	if strings.HasPrefix(s, "READONLY ") {
+	if isReadOnlyError(err) {
 		return true
 	}
 	if strings.HasPrefix(s, "CLUSTERDOWN ") {
@@ -137,7 +137,14 @@ func isLoadingError(err error) bool {
 }
 
 func isReadOnlyError(err error) bool {
-	return strings.HasPrefix(err.Error(), "READONLY ")
+	redisError := err.Error()
+	if strings.HasPrefix(redisError, "READONLY ") {
+		return true
+	}
+
+	// For a Lua script that includes a write command, the error string
+	// contains "-READONLY" rather than beginning with "READONLY "
+	return strings.Contains(redisError, "-READONLY")
 }
 
 func isMovedSameConnAddr(err error, addr string) bool {

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ func shouldRetry(err error, retryTimeout bool) bool {`
`58`	`58`	`if strings.HasPrefix(s, "LOADING ") {`
`59`	`59`	`return true`
`60`	`60`	`}`
`61`		`- if strings.HasPrefix(s, "READONLY ") {`
	`61`	`+ if isReadOnlyError(err) {`
`62`	`62`	`return true`
`63`	`63`	`}`
`64`	`64`	`if strings.HasPrefix(s, "CLUSTERDOWN ") {`
`@@ -137,7 +137,14 @@ func isLoadingError(err error) bool {`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`func isReadOnlyError(err error) bool {`
`140`		`- return strings.HasPrefix(err.Error(), "READONLY ")`
	`140`	`+ redisError := err.Error()`
	`141`	`+ if strings.HasPrefix(redisError, "READONLY ") {`
	`142`	`+ return true`
	`143`	`+ }`
	`144`	`+`
	`145`	`+ // For a Lua script that includes a write command, the error string`
	`146`	`+ // contains "-READONLY" rather than beginning with "READONLY "`
	`147`	`+ return strings.Contains(redisError, "-READONLY")`
`141`	`148`	`}`
`142`	`149`
`143`	`150`	`func isMovedSameConnAddr(err error, addr string) bool {`