kvserver: improve TestMultiSSTWriterInitSST

Make it use echotest, so that it doesn't need to manually create the expected
SSTs.

Author: tbg

pkg/kv/kvserver/replica_sst_snapshot_storage_test.go

@@ -8,6 +8,7 @@ package kvserver
 import (
 	"context"
 	"encoding/binary"
+	"fmt"
 	"io"
 	"path/filepath"
 	"strconv"
@@ -21,6 +22,9 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/storage/fs"
 	"github.com/cockroachdb/cockroach/pkg/storage/mvccencoding"
 	"github.com/cockroachdb/cockroach/pkg/testutils"
+	"github.com/cockroachdb/cockroach/pkg/testutils/datapathutils"
+	"github.com/cockroachdb/cockroach/pkg/testutils/echotest"
+	"github.com/cockroachdb/cockroach/pkg/testutils/storageutils"
 	"github.com/cockroachdb/cockroach/pkg/util/hlc"
 	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
@@ -30,6 +34,7 @@ import (
 	"github.com/cockroachdb/errors/oserror"
 	"github.com/cockroachdb/pebble/sstable"
 	"github.com/cockroachdb/pebble/vfs"
+	"github.com/cockroachdb/redact"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/time/rate"
 )
@@ -252,9 +257,10 @@ func TestSSTSnapshotStorageContextCancellation(t *testing.T) {
 	require.ErrorIs(t, err, context.Canceled)
 }
 
-// TestMultiSSTWriterInitSST tests that multiSSTWriter initializes each of the
-// SST files associated with the replicated key ranges by writing a range
-// deletion tombstone that spans the entire range of each respectively.
+// TestMultiSSTWriterInitSST tests the SSTS that multiSSTWriter generates.
+// In particular, certain SST files must contain range key deletes as well
+// as range deletes to make sure that ingesting the SST clears any existing
+// data.
 func TestMultiSSTWriterInitSST(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
@@ -294,26 +300,13 @@ func TestMultiSSTWriterInitSST(t *testing.T) {
 		actualSSTs = append(actualSSTs, sst)
 	}
 
-	// Construct an SST file for each of the key ranges and write a rangedel
-	// tombstone that spans from Start to End.
-	var expectedSSTs [][]byte
-	for _, s := range keySpans {
-		func() {
-			sstFile := &storage.MemObject{}
-			sst := storage.MakeIngestionSSTWriter(ctx, cluster.MakeTestingClusterSettings(), sstFile)
-			defer sst.Close()
-			err := sst.ClearRawRange(s.Key, s.EndKey, true, true)
-			require.NoError(t, err)
-			err = sst.Finish()
-			require.NoError(t, err)
-			expectedSSTs = append(expectedSSTs, sstFile.Data())
-		}()
-	}
+	var buf redact.StringBuilder
 
-	require.Equal(t, len(actualSSTs), len(expectedSSTs))
 	for i := range fileNames {
-		require.Equal(t, actualSSTs[i], expectedSSTs[i])
+		name := fmt.Sprintf("sst%d", i)
+		require.NoError(t, storageutils.ReportSSTEntries(&buf, name, actualSSTs[i]))
 	}
+	echotest.Require(t, buf.String(), filepath.Join(datapathutils.TestDataPath(t, "echotest", t.Name())))
 }
 
 func buildIterForScratch(

pkg/kv/kvserver/testdata/echotest/TestMultiSSTWriterInitSST

@@ -0,0 +1,17 @@
+echo
+----
+>> sst0:
+rangedel: /Local/RangeID/0/{r""-s""}
+rangekeydel: /Local/RangeID/0/{r""-s""}
+>> sst1:
+rangedel: /Local/Range{"d"-/Max}
+rangekeydel: /Local/Range{"d"-/Max}
+>> sst2:
+rangedel: /Local/Lock/Local/Range{"d"-/Max}
+rangekeydel: /Local/Lock/Local/Range{"d"-/Max}
+>> sst3:
+rangedel: /Local/Lock{"d"-/Max}
+rangekeydel: /Local/Lock{"d"-/Max}
+>> sst4:
+rangedel: {d-/Max}
+rangekeydel: {d-/Max}