Merge #158612 #158633

158612: kvserver: deflake TestTenantCtx r=iskettaneh a=iskettaneh

The test waits for a scan request and fails if the tenantID of the request (for a perticular key) didn't equal the tenantID created in the test.

However, upon inspecting the scan request. It was a Meta2 scan, which doesn't seem to carry the tenantID in its context. This commit skips this check for meta2 requests.

Fixes: #158493

Release note: none

158633: sst: fix warnings in .proto files r=spilchen a=spilchen

This fixes the following warnings for fields recently added for the distributed merge work:
```
WARNING: field SSTFileInfo.StartKey is a non-nullable bytes type, nullable=false has no effect
WARNING: field SSTFileInfo.EndKey is a non-nullable bytes type, nullable=false has no effect
WARNING: field SSTFiles.RowSamples is a repeated non-nullable native type, nullable=false has no effect
```

Epic: CRDB-48845
Release notes: none

Co-authored-by: Ibrahim Kettaneh <[email protected]>
Co-authored-by: Matt Spilchen <[email protected]>

Author: 3 people

pkg/kv/kvserver/client_tenant_test.go

@@ -417,11 +417,17 @@ func TestTenantCtx(t *testing.T) {
 						// context looks as expected, and signal their channels.
 
 						tenID, isTenantRequest := roachpb.ClientTenantFromContext(ctx)
-						keyRecognized := strings.Contains(ba.Requests[0].GetInner().Header().Key.String(), magicKey)
+						key := ba.Requests[0].GetInner().Header().Key
+						keyRecognized := strings.Contains(key.String(), magicKey)
 						if !keyRecognized {
 							return nil
 						}
 
+						// Skip meta2 range lookups as they don't carry tenant context.
+						if bytes.HasPrefix(key, keys.Meta2Prefix) {
+							return nil
+						}
+
 						var scanReq *kvpb.ScanRequest
 						var pushReq *kvpb.PushTxnRequest
 						if isSingleScan := ba.IsSingleRequest() && ba.Requests[0].GetInner().Method() == kvpb.Scan; isSingleScan {
@@ -431,6 +437,9 @@ func TestTenantCtx(t *testing.T) {
 							pushReq = ba.Requests[0].GetInner().(*kvpb.PushTxnRequest)
 						}
 
+						t.Logf("received request with key: %s, isTenantRequest: %t, tenID: %d",
+							key.String(), isTenantRequest, tenID)
+
 						switch {
 						case scanReq != nil:
 							var err error

pkg/sql/bulksst/sst_info.proto

@@ -11,14 +11,14 @@ import "gogoproto/gogo.proto";
 
 message SSTFileInfo {
     required string uri = 1 [(gogoproto.nullable) = false, (gogoproto.customname) = "URI"];;
-    required bytes start_key = 2 [(gogoproto.nullable) = false, (gogoproto.casttype) = "github.com/cockroachdb/cockroach/pkg/roachpb.Key"];
-    required bytes end_key = 3 [(gogoproto.nullable) = false, (gogoproto.casttype) = "github.com/cockroachdb/cockroach/pkg/roachpb.Key"];
+    required bytes start_key = 2 [(gogoproto.casttype) = "github.com/cockroachdb/cockroach/pkg/roachpb.Key"];
+    required bytes end_key = 3 [(gogoproto.casttype) = "github.com/cockroachdb/cockroach/pkg/roachpb.Key"];
     required uint64 file_size = 4 [(gogoproto.nullable) = false];
     optional bytes row_sample = 5 [(gogoproto.casttype) = "github.com/cockroachdb/cockroach/pkg/roachpb.Key"];
 }
 
 message SSTFiles {
     repeated SSTFileInfo sst = 1 [(gogoproto.customname) = "SST"];
-    repeated string row_samples = 2 [(gogoproto.nullable) = false];
+    repeated string row_samples = 2;
     required uint64 total_size = 3 [(gogoproto.nullable) = false];
 }