Merge #120578 #120602 #120650 #120651

120578: workflows: fetch extra commit needed for `TestRaftCopyrightHeaders` r=rail a=rickystewart Epic: CRDB-8308 Release note: None 120602: colexecargs: deeply reset monitor registry on Reset r=yuzefovich a=yuzefovich Given some recent issues we've had with leaks around memory monitors, it seems prudent to deeply reset the slice of monitors that is stored in the monitor registry object and is reused. Note that we haven't seen any evidence of leaks related to this registry, but this change might make things easier for GC, so seems worth it. Epic: None Release note: None 120650: bazci: only set extra params if provided on command-line r=rail a=rickystewart This was accidentally regressed in #120352. Epic: CRDB-8308 Release note: None 120651: sql/logictest: skip lookup_join_local under race r=mgartner a=mgartner Fixes #120609 Release note: None Co-authored-by: Ricky Stewart <[email protected]> Co-authored-by: Yahor Yuzefovich <[email protected]> Co-authored-by: Marcus Gartner <[email protected]>
cockroachdb · Mar 18, 2024 · 6681efb · 6681efb
5 parents 690c67f + 635ac0d + 461960f + 5d98a3a + c4a50ae
commit 6681efb
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/.github/workflows/github-actions-essential-ci.yml b/.github/workflows/github-actions-essential-ci.yml
@@ -111,6 +111,8 @@ jobs:
           submodules: true
       - name: compute metadata
         run: echo GITHUB_ACTIONS_BRANCH=${{ github.event.pull_request.number || github.ref_name}} >> "$GITHUB_ENV"
+      # We need this commit for TestRaftCopyrightHeaders.
+      - run: git fetch --depth 1 origin cd6f4f263bd42688096064825dfa668bde2d3720
       - run: ./build/github/get-engflow-keys.sh
       - run: ./build/github/prepare-summarize-build.sh
       - name: run lint tests

diff --git a/pkg/cmd/bazci/process-bep-file/main.go b/pkg/cmd/bazci/process-bep-file/main.go
@@ -131,13 +131,17 @@ func process() error {
 				}
 			}
 			if seenNew {
+				var extraParamsSlice []string
+				if *extraParams != "" {
+					extraParamsSlice = strings.Split(*extraParams, ",")
+				}
 				if err := githubpost.PostFromTestXMLWithFailurePoster(
 					ctx, engflow.FailurePoster(res, engflow.FailurePosterOptions{
 						Sha:            sha,
 						InvocationId:   invocation.InvocationId,
 						ServerName:     *serverName,
 						GithubApiToken: githubApiToken,
-						ExtraParams:    strings.Split(*extraParams, ","),
+						ExtraParams:    extraParamsSlice,
 					}), testXml); err != nil {
 					fmt.Printf("could not post to GitHub: got error %+v", err)
 				}

diff --git a/pkg/sql/colexec/colexecargs/monitor_registry.go b/pkg/sql/colexec/colexecargs/monitor_registry.go
@@ -246,8 +246,12 @@ func (r *MonitorRegistry) Close(ctx context.Context) {
 
 // Reset prepares the registry for reuse.
 func (r *MonitorRegistry) Reset() {
-	// There is no need to deeply reset the memory monitoring infra slices
-	// because these objects are very tiny in the grand scheme of things.
+	for i := range r.accounts {
+		r.accounts[i] = nil
+	}
+	for i := range r.monitors {
+		r.monitors[i] = nil
+	}
 	r.accounts = r.accounts[:0]
 	r.monitors = r.monitors[:0]
 }
diff --git a/pkg/sql/logictest/testdata/logic_test/lookup_join_local b/pkg/sql/logictest/testdata/logic_test/lookup_join_local
@@ -1,5 +1,7 @@
 # LogicTest: local !metamorphic-batch-sizes
 
+skip under race
+
 # This test verifies that the row container used by the join reader spills to
 # disk in order to make room for the non-spillable internal state of the
 # processor.