backport-19.2: decider: ignore EnsureSafeSplitKey on error

pkg/storage/split/decider.go

@@ -165,10 +165,16 @@ func (d *Decider) MaybeSplitKey(now time.Time) roachpb.Key {
 		//
 		// We take the risk that the result may sometimes not be a good split
 		// point (or even in this range).
-		var err error
-		key, err = keys.EnsureSafeSplitKey(d.mu.splitFinder.Key())
-		if err != nil {
-			key = nil
+		//
+		// Note that we ignore EnsureSafeSplitKey when it returns an error since
+		// that error only tells us that this key couldn't possibly be a SQL
+		// key. This is more common than one might think since SQL issues plenty
+		// of scans over all column families, meaning that we'll frequently find
+		// a key that has no column family suffix and thus errors out in
+		// EnsureSafeSplitKey.
+		key = d.mu.splitFinder.Key()
+		if safeKey, err := keys.EnsureSafeSplitKey(key); err == nil {
+			key = safeKey
 		}
 	}
 	d.mu.Unlock()

pkg/storage/split/decider_test.go

@@ -11,6 +11,7 @@
 package split
 
 import (
+	"math"
 	"math/rand"
 	"testing"
 	"time"
@@ -206,3 +207,40 @@ func TestDeciderCallsEnsureSafeSplitKey(t *testing.T) {
 
 	require.Equal(t, expK, k)
 }
+
+func TestDeciderIgnoresEnsureSafeSplitKeyOnError(t *testing.T) {
+	defer leaktest.AfterTest(t)()
+	intn := rand.New(rand.NewSource(11)).Intn
+
+	var d Decider
+	Init(&d, intn, func() float64 { return 1.0 })
+
+	baseKey := keys.MakeTablePrefix(51)
+	for i := 0; i < 4; i++ {
+		baseKey = encoding.EncodeUvarintAscending(baseKey, uint64(52+i))
+	}
+	c0 := func() roachpb.Span {
+		return roachpb.Span{Key: append([]byte(nil), encoding.EncodeUvarintAscending(baseKey, math.MaxInt32+1)...)}
+	}
+	c1 := func() roachpb.Span {
+		return roachpb.Span{Key: append([]byte(nil), encoding.EncodeUvarintAscending(baseKey, math.MaxInt32+2)...)}
+	}
+
+	_, err := keys.EnsureSafeSplitKey(c1().Key)
+	require.Error(t, err)
+
+	var k roachpb.Key
+	var now time.Time
+	for i := 0; i < 2*int(minSplitSuggestionInterval/time.Second); i++ {
+		now = now.Add(500 * time.Millisecond)
+		d.Record(now, 1, c0)
+		now = now.Add(500 * time.Millisecond)
+		d.Record(now, 1, c1)
+		k = d.MaybeSplitKey(now)
+		if len(k) != 0 {
+			break
+		}
+	}
+
+	require.Equal(t, c1().Key, k)
+}