Fix two races (#22187)

* core/cmd: use atomic.Value for shutdown race

* core/services/pg: fix log after test race

Author: jmank88

core/cmd/shell_local.go

@@ -12,6 +12,7 @@ import (
 	"path/filepath"
 	"strconv"
 	"strings"
+	"sync/atomic"
 	"time"
 
 	gethCommon "github.com/ethereum/go-ethereum/common"
@@ -394,18 +395,18 @@ func (s *Shell) runNode(c *cli.Context) error {
 
 	// cleanExit is used to skip "fail fast" routine
 	cleanExit := make(chan struct{})
-	var shutdownStartTime time.Time
+	var shutdownStartTime atomic.Value // time.Time
 	defer func() {
 		close(cleanExit)
-		if !shutdownStartTime.IsZero() {
-			log.Printf("Graceful shutdown time: %s", time.Since(shutdownStartTime))
+		if val := shutdownStartTime.Load(); val != nil {
+			log.Printf("Graceful shutdown time: %s", time.Since(val.(time.Time)))
 		}
 	}()
 
 	go shutdown.HandleShutdown(func(sig string) {
 		lggr.Infof("Shutting down due to %s signal received...", sig)
 
-		shutdownStartTime = time.Now()
+		shutdownStartTime.Store(time.Now())
 		cancelRootCtx()
 
 		select {

core/services/pg/lease_lock_test.go

@@ -11,7 +11,6 @@ import (
 
 	"github.com/jmoiron/sqlx"
 
-	"github.com/smartcontractkit/chainlink/v2/core/internal/cltest"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/services/chainlink"
@@ -177,6 +176,7 @@ func Test_LeaseLock(t *testing.T) {
 	})
 
 	t.Run("cancel TakeAndHold with ctx", func(t *testing.T) {
+		ctx := t.Context()
 		cfg := pg.LeaseLockConfig{
 			DefaultQueryTimeout:  cfg.Database().DefaultQueryTimeout(),
 			LeaseDuration:        15 * time.Second,
@@ -185,23 +185,14 @@ func Test_LeaseLock(t *testing.T) {
 		leaseLock1 := newLeaseLock(t, db, cfg)
 		leaseLock2 := newLeaseLock(t, db, cfg)
 
-		err := leaseLock1.TakeAndHold(testutils.Context(t))
+		err := leaseLock1.TakeAndHold(ctx)
 		require.NoError(t, err)
+		t.Cleanup(leaseLock1.Release)
 
-		awaiter := cltest.NewAwaiter()
-		go func() {
-			ctx, cancel := context.WithCancel(testutils.Context(t))
-			go func() {
-				<-time.After(3 * time.Second)
-				cancel()
-			}()
-			err := leaseLock2.TakeAndHold(ctx)
-			require.Error(t, err)
-			awaiter.ItHappened()
-		}()
-
-		awaiter.AwaitOrFail(t)
-		leaseLock1.Release()
+		ctx, cancel := context.WithTimeout(ctx, 3*time.Second)
+		defer cancel()
+		require.Error(t, leaseLock2.TakeAndHold(ctx))
+		t.Cleanup(leaseLock2.Release)
 	})
 
 	require.NoError(t, db.Close())