lint: make a smarter mutex lock linter

This commit udpates the lock linter to work by
keeping track of locks and if we find any
if conditions, loops, or function calls before
finding a matching unlock it will report. It will
also report if the matching unlock is >5 lines away
from the lock. It will ignore cases where a
`nolint:deferunlock` is present.

Release note: None

Author: Santamaura

build/bazelutil/nogo_config.json

@@ -475,7 +475,6 @@ func (n *Node) Alive() bool {
 func (n *Node) StatusClient(ctx context.Context) serverpb.StatusClient {
 	n.Lock()
 	existingClient := n.statusClient
-	// nolint:deferunlock
 	n.Unlock()
 
 	if existingClient != nil {
@@ -589,7 +588,6 @@ func (n *Node) startAsyncInnerLocked(ctx context.Context, joins ...string) error
 		_ = errors.As(waitErr, &execErr)
 		n.Lock()
 		n.setNotRunningLocked(execErr)
-		// nolint:deferunlock
 		n.Unlock()
 	}(n.cmd)
 
@@ -697,7 +695,6 @@ func (n *Node) waitUntilLive(dur time.Duration) error {
 		if n.cmd != nil {
 			pid = n.cmd.Process.Pid
 		}
-		// nolint:deferunlock
 		n.Unlock()
 		if pid == 0 {
 			log.Info(ctx, "process already quit")
@@ -720,14 +717,12 @@ func (n *Node) waitUntilLive(dur time.Duration) error {
 		if n.Cfg.RPCPort == 0 {
 			n.Lock()
 			n.rpcPort = pgURL.Port()
-			// nolint:deferunlock
 			n.Unlock()
 		}
 
 		pgURL.Path = n.Cfg.DB
 		n.Lock()
 		n.pgURL = pgURL.String()
-		// nolint:deferunlock
 		n.Unlock()
 
 		var uiURL *url.URL
@@ -744,7 +739,6 @@ func (n *Node) waitUntilLive(dur time.Duration) error {
 		// http port is required but isn't initialized yet.
 		n.Lock()
 		n.db = makeDB(n.pgURL, n.Cfg.NumWorkers, n.Cfg.DB)
-		// nolint:deferunlock
 		n.Unlock()
 
 		{
@@ -775,7 +769,6 @@ func (n *Node) Kill() {
 	for ok := false; !ok; {
 		n.Lock()
 		ok = n.cmd == nil
-		// nolint:deferunlock
 		n.Unlock()
 	}
 }
@@ -811,7 +804,6 @@ func (n *Node) Signal(s os.Signal) {
 func (n *Node) Wait() *exec.ExitError {
 	n.Lock()
 	ch := n.notRunning
-	// nolint:deferunlock
 	n.Unlock()
 	if ch == nil {
 		log.Warning(context.Background(), "(*Node).Wait called when node was not running")

pkg/acceptance/localcluster/cluster.go

@@ -85,7 +85,6 @@ func UpdateAuditConfigOnChange(
 	}
 	acl.Lock()
 	acl.Config = config
-	// nolint:deferunlock
 	acl.Unlock()
 }
 

pkg/ccl/auditloggingccl/audit_log_config.go

@@ -2593,11 +2593,9 @@ func TestBackupRestoreDuringUserDefinedTypeChange(t *testing.T) {
 										if numTypeChangesStarted == len(tc.queries) {
 											close(typeChangesStarted)
 										}
-										// nolint:deferunlock
 										mu.Unlock()
 										<-waitForBackup
 									} else {
-										// nolint:deferunlock
 										mu.Unlock()
 									}
 									return nil
@@ -2626,7 +2624,6 @@ CREATE TYPE d.greeting AS ENUM ('hello', 'howdy', 'hi');
 						if numTypeChangesFinished == totalQueries {
 							close(typeChangesFinished)
 						}
-						// nolint:deferunlock
 						mu.Unlock()
 					}(query, len(tc.queries))
 				}
@@ -6208,7 +6205,6 @@ func TestRestoreErrorPropagates(t *testing.T) {
 
 	jobsTableKey.Lock()
 	jobsTableKey.key = tc.ApplicationLayer(0).Codec().TablePrefix(uint32(systemschema.JobsTable.GetID()))
-	// nolint:deferunlock
 	jobsTableKey.Unlock()
 
 	runner.Exec(t, `SET CLUSTER SETTING jobs.metrics.interval.poll = '30s'`)
@@ -6391,7 +6387,6 @@ INSERT INTO foo.bar VALUES (110), (210), (310), (410), (510)`)
 	startingSpan := mkSpan(id1, "/Tenant/10/Table/:id/1", "/Tenant/10/Table/:id/2")
 	mu.Lock()
 	require.Equal(t, []string{startingSpan.String()}, mu.exportRequestSpans)
-	// nolint:deferunlock
 	mu.Unlock()
 	resetStateVars()
 
@@ -6402,7 +6397,6 @@ INSERT INTO foo.bar VALUES (110), (210), (310), (410), (510)`)
 	resumeSpan := mkSpan(id1, "/Tenant/10/Table/:id/1/510/0", "/Tenant/10/Table/:id/2")
 	mu.Lock()
 	require.Equal(t, []string{startingSpan.String(), resumeSpan.String()}, mu.exportRequestSpans)
-	// nolint:deferunlock
 	mu.Unlock()
 	resetStateVars()
 
@@ -6421,7 +6415,6 @@ INSERT INTO foo.bar VALUES (110), (210), (310), (410), (510)`)
 	}
 	mu.Lock()
 	require.Equal(t, expected, mu.exportRequestSpans)
-	// nolint:deferunlock
 	mu.Unlock()
 	resetStateVars()
 
@@ -6455,7 +6448,6 @@ INSERT INTO baz.bar VALUES (110, 'a'), (210, 'b'), (310, 'c'), (410, 'd'), (510,
 	}
 	mu.Lock()
 	require.Equal(t, expected, mu.exportRequestSpans)
-	// nolint:deferunlock
 	mu.Unlock()
 	resetStateVars()
 

pkg/ccl/backupccl/backup_test.go

@@ -1541,7 +1541,6 @@ func GetBackupManifests(
 				manifests[i] = desc
 			}
 			subMem.Shrink(ctx, size)
-			// nolint:deferunlock
 			memMu.Unlock()
 
 			return err

pkg/ccl/backupccl/backupinfo/manifest_handling.go

@@ -318,7 +318,6 @@ func restore(
 		introducedSpanFrontier,
 		targetRestoreSpanSize.Get(&execCtx.ExecCfg().Settings.SV),
 		progressTracker.useFrontier)
-	// nolint:deferunlock
 	progressTracker.mu.Unlock()
 	if err != nil {
 		return roachpb.RowCount{}, err
@@ -2154,7 +2153,6 @@ func insertStats(
 					mu.completedBatches++
 					remainingBatches := totalNumBatches - mu.completedBatches
 					completedBatches := mu.completedBatches
-					// nolint:deferunlock
 					mu.Unlock()
 					if insertStatsProgress.ShouldLog() {
 						logStatsProgress(remainingBatches, completedBatches)

pkg/ccl/backupccl/restore_job.go

@@ -428,15 +428,13 @@ func (r *randomBackupNemesis) Stop() {
 func (r *randomBackupNemesis) TablesToCheck() []string {
 	r.mu.Lock()
 	ret := append([]string(nil), r.mu.tablesToCheck...)
-	// nolint:deferunlock
 	r.mu.Unlock()
 	return ret
 }
 
 func (r *randomBackupNemesis) addTable(name string) {
 	r.mu.Lock()
 	r.mu.tablesToCheck = append(r.mu.tablesToCheck, name)
-	// nolint:deferunlock
 	r.mu.Unlock()
 }
 

pkg/ccl/backupccl/tenant_backup_nemesis_test.go

@@ -207,7 +207,6 @@ func (r *SchemaRegistry) EncodedAvroToNative(b []byte) (interface{}, error) {
 
 	r.mu.Lock()
 	jsonSchema := r.mu.schemas[id]
-	// nolint:deferunlock
 	r.mu.Unlock()
 	codec, err := goavro.NewCodec(jsonSchema)
 	if err != nil {

pkg/ccl/changefeedccl/cdctest/schema_registry.go

@@ -1187,7 +1187,6 @@ func (cf *changeFrontier) Start(ctx context.Context) {
 	cf.metricsID = cf.metrics.mu.id
 	cf.metrics.mu.id++
 	sli.RunningCount.Inc(1)
-	// nolint:deferunlock
 	cf.metrics.mu.Unlock()
 
 	cf.sliMetricsID = cf.sliMetrics.claimId()
@@ -1230,7 +1229,6 @@ func (cf *changeFrontier) closeMetrics() {
 	}
 	delete(cf.metrics.mu.resolved, cf.metricsID)
 	cf.metricsID = -1
-	// nolint:deferunlock
 	cf.metrics.mu.Unlock()
 
 	cf.sliMetrics.closeId(cf.sliMetricsID)
@@ -1383,7 +1381,6 @@ func (cf *changeFrontier) forwardFrontier(resolved jobspb.ResolvedSpan) error {
 		if cf.metricsID != -1 {
 			cf.metrics.mu.resolved[cf.metricsID] = newResolved
 		}
-		// nolint:deferunlock
 		cf.metrics.mu.Unlock()
 
 		return cf.maybeEmitResolved(newResolved)

pkg/ccl/changefeedccl/changefeed_processors.go

@@ -646,15 +646,13 @@ func (c *parallelEventConsumer) incInFlight() {
 	c.mu.Lock()
 	c.mu.inFlight++
 	c.metrics.ParallelConsumerInFlightEvents.Update(int64(c.mu.inFlight))
-	// nolint:deferunlock
 	c.mu.Unlock()
 }
 
 func (c *parallelEventConsumer) decInFlight() {
 	c.mu.Lock()
 	c.mu.inFlight--
 	notifyFlush := c.mu.waiting && c.mu.inFlight == 0
-	// nolint:deferunlock
 	c.mu.Unlock()
 
 	// If someone is waiting on a flush, signal to them
@@ -708,7 +706,6 @@ func (c *parallelEventConsumer) Flush(ctx context.Context) error {
 		c.mu.Lock()
 		c.mu.waiting = false
 		c.mu.flushFrontier = c.spanFrontier.Frontier()
-		// nolint:deferunlock
 		c.mu.Unlock()
 		return nil
 	}