Merge #153285 #153287

153285: storage: use minimum supported version for TransportSSTWriter r=RaduBerinde a=RaduBerinde

MakeTransportSSTWriter is used when evaluating export requests. These
requests can be issued by non-system tenants which can run older
binaries. Since we have currently have no way of knowing what binary
version that is, we must emit at the minimum supported version.

Fixes #152723

This reverts one aspect of #151176

153287: authors: add jasonlmfong to authors r=jasonlmfong a=jasonlmfong

Epic: None
Release note: None

Co-authored-by: Radu Berinde <[email protected]>
Co-authored-by: Jason Fong <[email protected]>

Author: 3 people

AUTHORS

@@ -241,6 +241,7 @@ Jasmine Sun <[email protected]> <[email protected]>
 Jason Chan <[email protected]> <[email protected]>
 Jason Chen <[email protected]>
 Jason E. Aten <[email protected]>
+Jason Fong <[email protected]> <[email protected]>
 Jason Young <[email protected]>
 Jay Harris <[email protected]> <[email protected]>
 Jay Kominek <[email protected]>

pkg/storage/sst_writer.go

@@ -117,7 +117,13 @@ func makeSSTRewriteOptions(
 // scanned and their keys inserted into new sstables (NB: constructed using
 // MakeIngestionSSTWriter) that ultimately are uploaded to object storage.
 func MakeTransportSSTWriter(ctx context.Context, cs *cluster.Settings, f io.Writer) SSTWriter {
-	format := minPebbleFormatVersionInCluster(cs.Version.ActiveVersion(ctx).Version).MaxTableFormat()
+	// MakeTransportSSTWriter is used to evaluate export requests. The export
+	// requests could be issued by a non-system tenant with an older binary, so we
+	// must emit at the minimum supported version.
+	//
+	// TODO(radu): ideally the tenant would be able to specify the desired format
+	// version (#153283).
+	format := MinimumSupportedFormatVersion.MaxTableFormat()
 
 	opts := DefaultPebbleOptions().MakeWriterOptions(0, format)