Merge #81734 #81857

81734: ppc64le - fix test failures of TestBoundingBoxFromGeomT/GeographyType r=otan a=prashantkhoje Allow floating point approximation within an epsilon Fixes #81733 81857: sql/catalog/lease: add some event logging around lease acquisition r=ajwerner a=ajwerner Before this, there was a black hole of time when we were acquiring a lease. The singleflight prevents tracing of the actual acquisition. Release note: None Co-authored-by: Prashant Khoje <[email protected]> Co-authored-by: Prashant Khoje <[email protected]> Co-authored-by: Andrew Werner <[email protected]>
cockroachdb · May 27, 2022 · 1047fb0 · 1047fb0
3 parents 78cd75f + 78dd74f + c1b3f2e
commit 1047fb0
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/pkg/geo/bbox_test.go b/pkg/geo/bbox_test.go
@@ -12,6 +12,7 @@ package geo
 
 import (
 	"fmt"
+	"math"
 	"strconv"
 	"testing"
 
@@ -184,6 +185,22 @@ func TestBoundingBoxFromGeomT(t *testing.T) {
 		t.Run(fmt.Sprintf("%s: %#v", tc.soType, tc.g), func(t *testing.T) {
 			bbox, err := boundingBoxFromGeomT(tc.g, tc.soType)
 			require.NoError(t, err)
+			// If bbox is within a small epsilon of expected, use the same values.
+			if bbox != nil && tc.expected != nil {
+				const epsilon = 0.000001
+				if math.Abs(bbox.LoX-tc.expected.LoX) < epsilon {
+					bbox.LoX = tc.expected.LoX
+				}
+				if math.Abs(bbox.HiX-tc.expected.HiX) < epsilon {
+					bbox.HiX = tc.expected.HiX
+				}
+				if math.Abs(bbox.LoY-tc.expected.LoY) < epsilon {
+					bbox.LoY = tc.expected.LoY
+				}
+				if math.Abs(bbox.HiY-tc.expected.HiY) < epsilon {
+					bbox.HiY = tc.expected.HiY
+				}
+			}
 			require.Equal(t, tc.expected, bbox)
 		})
 	}

diff --git a/pkg/sql/catalog/lease/lease.go b/pkg/sql/catalog/lease/lease.go
@@ -470,6 +470,8 @@ func (m *Manager) AcquireFreshestFromStore(ctx context.Context, id descpb.ID) er
 // The boolean returned is true if this call was actually responsible for the
 // lease acquisition.
 func acquireNodeLease(ctx context.Context, m *Manager, id descpb.ID) (bool, error) {
+	start := timeutil.Now()
+	log.VEventf(ctx, 2, "acquiring lease for descriptor %d", id)
 	var toRelease *storedLease
 	resultChan, didAcquire := m.storage.group.DoChan(fmt.Sprintf("acquire%d", id), func() (interface{}, error) {
 		// Note that we use a new `context` here to avoid a situation where a cancellation
@@ -516,6 +518,7 @@ func acquireNodeLease(ctx context.Context, m *Manager, id descpb.ID) (bool, erro
 			return false, result.Err
 		}
 	}
+	log.VEventf(ctx, 2, "acquired lease for descriptor %d, took %v", id, timeutil.Since(start))
 	return didAcquire, nil
 }