jobs: dump debug files date first

Previously we suffixed files with the time they were made. This meant
that if you requested new files, you needed do look through all the files, including the old ones, to find those your request made. Instead, all files produced by one request now sort together.

Release note: none.
Epic: none.

Author: dt

pkg/jobs/adopt.go

@@ -76,7 +76,7 @@ func (r *Registry) maybeDumpTrace(resumerCtx context.Context, resumer Resumer, j
 	}
 
 	resumerTraceFilename := fmt.Sprintf("%s/resumer-trace/%s",
-		r.ID().String(), timeutil.Now().Format("20060102_150405.00"))
+		timeutil.Now().Format("20060102_150405.00"), r.ID().String())
 	td := jobspb.TraceData{CollectedSpans: sp.GetConfiguredRecording()}
 	if err := r.db.Txn(dumpCtx, func(ctx context.Context, txn isql.Txn) error {
 		return WriteProtobinExecutionDetailFile(dumpCtx, resumerTraceFilename, &td, txn, jobID)

pkg/server/job_profiler.go

@@ -127,7 +127,7 @@ func (e *executionDetailsBuilder) addLabelledGoroutines(ctx context.Context) {
 		log.Errorf(ctx, "failed to collect goroutines for job %d: %v", e.jobID, err.Error())
 		return
 	}
-	filename := fmt.Sprintf("goroutines.%s.txt", timeutil.Now().Format("20060102_150405.00"))
+	filename := fmt.Sprintf("%s/job-goroutines.txt", timeutil.Now().Format("20060102_150405.00"))
 	if err := e.db.Txn(ctx, func(ctx context.Context, txn isql.Txn) error {
 		return jobs.WriteExecutionDetailFile(ctx, filename, resp.Data, txn, e.jobID)
 	}); err != nil {
@@ -146,7 +146,7 @@ func (e *executionDetailsBuilder) addDistSQLDiagram(ctx context.Context) {
 	}
 	if row != nil && row[0] != tree.DNull {
 		dspDiagramURL := string(tree.MustBeDString(row[0]))
-		filename := fmt.Sprintf("distsql.%s.html", timeutil.Now().Format("20060102_150405.00"))
+		filename := fmt.Sprintf("%s/distsql-plan.html", timeutil.Now().Format("20060102_150405.00"))
 		if err := e.db.Txn(ctx, func(ctx context.Context, txn isql.Txn) error {
 			return jobs.WriteExecutionDetailFile(ctx, filename,
 				[]byte(fmt.Sprintf(`<meta http-equiv="Refresh" content="0; url=%s">`, dspDiagramURL)),
@@ -172,7 +172,7 @@ func (e *executionDetailsBuilder) addClusterWideTraces(ctx context.Context) {
 		return
 	}
 
-	filename := fmt.Sprintf("trace.%s.zip", timeutil.Now().Format("20060102_150405.00"))
+	filename := fmt.Sprintf("%s/trace.zip", timeutil.Now().Format("20060102_150405.00"))
 	if err := e.db.Txn(ctx, func(ctx context.Context, txn isql.Txn) error {
 		return jobs.WriteExecutionDetailFile(ctx, filename, zippedTrace, txn, e.jobID)
 	}); err != nil {

pkg/sql/jobs_profiler_execution_details_test.go

@@ -378,12 +378,12 @@ func TestListProfilerExecutionDetails(t *testing.T) {
 		files := listExecutionDetails(t, s, jobspb.JobID(importJobID))
 
 		patterns := []string{
-			"distsql\\..*\\.html",
+			".*/distsql-plan.html",
 		}
 		if !s.DeploymentMode().IsExternal() {
-			patterns = append(patterns, "goroutines\\..*\\.txt")
+			patterns = append(patterns, ".*/job-goroutines.txt")
 		}
-		patterns = append(patterns, "trace\\..*\\.zip")
+		patterns = append(patterns, ".*/trace.zip")
 
 		require.Len(t, files, len(patterns))
 		for i, pattern := range patterns {
@@ -426,17 +426,19 @@ func TestListProfilerExecutionDetails(t *testing.T) {
 			return nil
 		})
 		patterns = []string{
-			"[0-9]/resumer-trace/.*~cockroach\\.sql\\.jobs\\.jobspb\\.TraceData\\.binpb",
-			"[0-9]/resumer-trace/.*~cockroach\\.sql\\.jobs\\.jobspb\\.TraceData\\.binpb.txt",
-			"[0-9]/resumer-trace/.*~cockroach\\.sql\\.jobs\\.jobspb\\.TraceData\\.binpb",
-			"[0-9]/resumer-trace/.*~cockroach\\.sql\\.jobs\\.jobspb\\.TraceData\\.binpb.txt",
-			"distsql\\..*\\.html",
-			"distsql\\..*\\.html",
+			".*/distsql-plan.html",
+			".*/distsql-plan.html",
 		}
 		if !s.DeploymentMode().IsExternal() {
-			patterns = append(patterns, "goroutines\\..*\\.txt", "goroutines\\..*\\.txt")
+			patterns = append(patterns, ".*/job-goroutines.txt", ".*/job-goroutines.txt")
 		}
-		patterns = append(patterns, "trace\\..*\\.zip", "trace\\..*\\.zip")
+		patterns = append(patterns,
+			"[0-9_.]*/resumer-trace/.*~cockroach\\.sql\\.jobs\\.jobspb\\.TraceData\\.binpb",
+			"[0-9_.]*/resumer-trace/.*~cockroach\\.sql\\.jobs\\.jobspb\\.TraceData\\.binpb",
+			"[0-9_.]*/resumer-trace/.*~cockroach\\.sql\\.jobs\\.jobspb\\.TraceData\\.binpb.txt",
+			"[0-9_.]*/resumer-trace/.*~cockroach\\.sql\\.jobs\\.jobspb\\.TraceData\\.binpb.txt",
+		)
+		patterns = append(patterns, ".*/trace.zip", ".*/trace.zip")
 		for i, pattern := range patterns {
 			require.Regexp(t, pattern, files[i])
 		}
@@ -465,8 +467,9 @@ func listExecutionDetails(
 
 	edResp := serverpb.ListJobProfilerExecutionDetailsResponse{}
 	require.NoError(t, protoutil.Unmarshal(body, &edResp))
+	// Sort the responses with the variable date/time digits in the prefix removed.
 	sort.Slice(edResp.Files, func(i, j int) bool {
-		return edResp.Files[i] < edResp.Files[j]
+		return strings.TrimLeft(edResp.Files[i], "0123456789_.") < strings.TrimLeft(edResp.Files[j], "0123456789_.")
 	})
 	return edResp.Files
 }