Merge pull request #58259 from pbardea/backport20.2-58219

release-20.2: storageccl: tolerate rewriting span keys ending in interleaved sentinel

pkg/ccl/storageccl/key_rewriter.go

@@ -223,6 +223,11 @@ func (kr *KeyRewriter) RewriteKey(key []byte, isFromSpan bool) ([]byte, bool, er
 	if !ok {
 		return key, true, nil
 	}
+	if len(k) == 0 {
+		// We have seen some span keys end in an interleaved sentinel.
+		// Check if we ran out of key before getting to an interleave child?
+		return key, true, nil
+	}
 	prefix := key[:len(key)-len(k)]
 	k, ok, err = kr.RewriteKey(k, isFromSpan)
 	if err != nil {