Merge cockroachdb#106310 cockroachdb#106765

106310: streamingest: unskip a multi-node c2c test, and skip under deadlock r=lidorcarmel a=lidorcarmel

These tests are slow and flaky under deadlock.

Epic: none
Fixes: cockroachdb#105956
Fixes: cockroachdb#99900

Release note: None

106765: rfcs: rename the filename to adhere to the pattern r=yuzefovich a=yuzefovich

Recently merged RFC on query SST metrics was missing the prepended date in the filename.

Epic: None.

Release note: None

Co-authored-by: Lidor Carmel <[email protected]>
Co-authored-by: Yahor Yuzefovich <[email protected]>

Author: 3 people

docs/RFCS/query_sst_metrics.md renamed to docs/RFCS/20230531_query_sst_metrics.md

@@ -462,8 +462,8 @@ func TestTenantStreamingDropTenantCancelsStream(t *testing.T) {
 func TestTenantStreamingUnavailableStreamAddress(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
-	skip.WithIssue(t, 105956)
 
+	skip.UnderDeadlock(t, "multi-node may time out under deadlock")
 	skip.UnderRace(t, "takes too long with multiple nodes")
 
 	ctx := context.Background()
@@ -510,11 +510,6 @@ func TestTenantStreamingUnavailableStreamAddress(t *testing.T) {
 	defer alternateSrcTenantConn.Close()
 	alternateSrcTenantSQL := sqlutils.MakeSQLRunner(alternateSrcTenantConn)
 
-	cleanUpTenant := c.StartDestTenant(ctx)
-	defer func() {
-		require.NoError(t, cleanUpTenant())
-	}()
-
 	alternateCompareResult := func(query string) {
 		sourceData := alternateSrcTenantSQL.QueryStr(c.T, query)
 		destData := c.DestTenantSQL.QueryStr(c.T, query)
@@ -537,6 +532,11 @@ func TestTenantStreamingUnavailableStreamAddress(t *testing.T) {
 	require.Equal(c.T, cutoverTime, cutoverOutput.GoTime())
 	jobutils.WaitForJobToSucceed(c.T, c.DestSysSQL, jobspb.JobID(ingestionJobID))
 
+	cleanUpTenant := c.StartDestTenant(ctx)
+	defer func() {
+		require.NoError(t, cleanUpTenant())
+	}()
+
 	// The destroyed address should have been removed from the topology
 	progress = jobutils.GetJobProgress(c.T, c.DestSysSQL, jobspb.JobID(ingestionJobID))
 	newStreamAddresses := progress.GetStreamIngest().StreamAddresses
@@ -652,6 +652,7 @@ func TestTenantStreamingMultipleNodes(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
+	skip.UnderDeadlock(t, "multi-node may time out under deadlock")
 	skip.UnderRace(t, "takes too long with multiple nodes")
 
 	ctx := context.Background()