syncutil: add AssertRHeld methods to RWMutex implementations

pkg/storage/client_lease_test.go

@@ -14,7 +14,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"reflect"
 	"testing"
 
 	"github.com/cockroachdb/cockroach/pkg/config"
@@ -192,7 +191,7 @@ func TestStoreGossipSystemData(t *testing.T) {
 		t.Fatal(err)
 	}
 	testutils.SucceedsSoon(t, func() error {
-		if !reflect.DeepEqual(getSystemConfig(), config.NewSystemConfig(sc.DefaultZoneConfig)) {
+		if !getSystemConfig().DefaultZoneConfig.Equal(sc.DefaultZoneConfig) {
 			return errors.New("system config not empty")
 		}
 		if getNodeLiveness() != (storagepb.Liveness{}) {
@@ -205,7 +204,7 @@ func TestStoreGossipSystemData(t *testing.T) {
 	// data is gossiped.
 	mtc.restartStore(0)
 	testutils.SucceedsSoon(t, func() error {
-		if reflect.DeepEqual(getSystemConfig(), config.NewSystemConfig(sc.DefaultZoneConfig)) {
+		if !getSystemConfig().DefaultZoneConfig.Equal(sc.DefaultZoneConfig) {
 			return errors.New("system config not gossiped")
 		}
 		if getNodeLiveness() == (storagepb.Liveness{}) {

pkg/storage/replica.go

@@ -675,6 +675,7 @@ func (r *Replica) Desc() *roachpb.RangeDescriptor {
 }
 
 func (r *Replica) descRLocked() *roachpb.RangeDescriptor {
+	r.mu.AssertRHeld()
 	return r.mu.state.Desc
 }
 

pkg/util/syncutil/mutex_deadlock.go

@@ -37,5 +37,9 @@ type RWMutex struct {
 }
 
 // AssertHeld is a no-op for deadlock mutexes.
-func (m *RWMutex) AssertHeld() {
+func (rw *RWMutex) AssertHeld() {
+}
+
+// AssertRHeld is a no-op for deadlock mutexes.
+func (rw *RWMutex) AssertRHeld() {
 }

pkg/util/syncutil/mutex_sync.go

@@ -41,8 +41,22 @@ type RWMutex struct {
 // particular lock may use this to enforce this requirement more directly than
 // relying on the race detector.
 //
-// Note that we do not require the lock to be held by any particular thread,
-// just that some thread holds the lock. This is both more efficient and allows
-// for rare cases where a mutex is locked in one thread and used in another.
-func (m *RWMutex) AssertHeld() {
+// Note that we do not require the exclusive lock to be held by any particular
+// thread, just that some thread holds the lock. This is both more efficient
+// and allows for rare cases where a mutex is locked in one thread and used in
+// another.
+func (rw *RWMutex) AssertHeld() {
+}
+
+// AssertRHeld may panic if the mutex is not locked for reading (but it is not
+// required to do so). If the mutex is locked for writing, it is also considered
+// to be locked for reading. Functions which require that their callers hold a
+// particular lock may use this to enforce this requirement more directly than
+// relying on the race detector.
+//
+// Note that we do not require the shared lock to be held by any particular
+// thread, just that some thread holds the lock. This is both more efficient
+// and allows for rare cases where a mutex is locked in one thread and used in
+// another.
+func (rw *RWMutex) AssertRHeld() {
 }

pkg/util/syncutil/mutex_sync_race.go

@@ -20,19 +20,19 @@ import (
 
 // A Mutex is a mutual exclusion lock.
 type Mutex struct {
-	mu       sync.Mutex
-	isLocked int32 // updated atomically
+	mu      sync.Mutex
+	wLocked int32 // updated atomically
 }
 
-// Lock implements sync.Locker.
+// Lock locks m.
 func (m *Mutex) Lock() {
 	m.mu.Lock()
-	atomic.StoreInt32(&m.isLocked, 1)
+	atomic.StoreInt32(&m.wLocked, 1)
 }
 
-// Unlock implements sync.Locker.
+// Unlock unlocks m.
 func (m *Mutex) Unlock() {
-	atomic.StoreInt32(&m.isLocked, 0)
+	atomic.StoreInt32(&m.wLocked, 0)
 	m.mu.Unlock()
 }
 
@@ -45,39 +45,80 @@ func (m *Mutex) Unlock() {
 // just that some thread holds the lock. This is both more efficient and allows
 // for rare cases where a mutex is locked in one thread and used in another.
 func (m *Mutex) AssertHeld() {
-	if atomic.LoadInt32(&m.isLocked) == 0 {
-		panic("mutex is not locked")
+	if atomic.LoadInt32(&m.wLocked) == 0 {
+		panic("mutex is not write locked")
 	}
 }
 
 // An RWMutex is a reader/writer mutual exclusion lock.
 type RWMutex struct {
 	sync.RWMutex
-	isLocked int32 // updated atomically
+	wLocked int32 // updated atomically
+	rLocked int32 // updated atomically
 }
 
-// Lock implements sync.Locker.
-func (m *RWMutex) Lock() {
-	m.RWMutex.Lock()
-	atomic.StoreInt32(&m.isLocked, 1)
+// Lock locks rw for writing.
+func (rw *RWMutex) Lock() {
+	rw.RWMutex.Lock()
+	atomic.StoreInt32(&rw.wLocked, 1)
 }
 
-// Unlock implements sync.Locker.
-func (m *RWMutex) Unlock() {
-	atomic.StoreInt32(&m.isLocked, 0)
-	m.RWMutex.Unlock()
+// Unlock unlocks rw for writing.
+func (rw *RWMutex) Unlock() {
+	atomic.StoreInt32(&rw.wLocked, 0)
+	rw.RWMutex.Unlock()
 }
 
+// RLock locks m for reading.
+func (rw *RWMutex) RLock() {
+	rw.RWMutex.RLock()
+	atomic.AddInt32(&rw.rLocked, 1)
+}
+
+// RUnlock undoes a single RLock call.
+func (rw *RWMutex) RUnlock() {
+	atomic.AddInt32(&rw.rLocked, -1)
+	rw.RWMutex.RUnlock()
+}
+
+// RLocker returns a Locker interface that implements
+// the Lock and Unlock methods by calling rw.RLock and rw.RUnlock.
+func (rw *RWMutex) RLocker() sync.Locker {
+	return (*rlocker)(rw)
+}
+
+type rlocker RWMutex
+
+func (r *rlocker) Lock()   { (*RWMutex)(r).RLock() }
+func (r *rlocker) Unlock() { (*RWMutex)(r).RUnlock() }
+
 // AssertHeld may panic if the mutex is not locked for writing (but it is not
 // required to do so). Functions which require that their callers hold a
 // particular lock may use this to enforce this requirement more directly than
 // relying on the race detector.
 //
-// Note that we do not require the lock to be held by any particular thread,
-// just that some thread holds the lock. This is both more efficient and allows
-// for rare cases where a mutex is locked in one thread and used in another.
-func (m *RWMutex) AssertHeld() {
-	if atomic.LoadInt32(&m.isLocked) == 0 {
-		panic("mutex is not locked")
+// Note that we do not require the exclusive lock to be held by any particular
+// thread, just that some thread holds the lock. This is both more efficient
+// and allows for rare cases where a mutex is locked in one thread and used in
+// another.
+func (rw *RWMutex) AssertHeld() {
+	if atomic.LoadInt32(&rw.wLocked) == 0 {
+		panic("mutex is not write locked")
+	}
+}
+
+// AssertRHeld may panic if the mutex is not locked for reading (but it is not
+// required to do so). If the mutex is locked for writing, it is also considered
+// to be locked for reading. Functions which require that their callers hold a
+// particular lock may use this to enforce this requirement more directly than
+// relying on the race detector.
+//
+// Note that we do not require the shared lock to be held by any particular
+// thread, just that some thread holds the lock. This is both more efficient
+// and allows for rare cases where a mutex is locked in one thread and used in
+// another.
+func (rw *RWMutex) AssertRHeld() {
+	if atomic.LoadInt32(&rw.wLocked) == 0 && atomic.LoadInt32(&rw.rLocked) == 0 {
+		panic("mutex is not read locked")
 	}
 }

pkg/util/syncutil/mutex_sync_race_test.go

@@ -13,7 +13,11 @@
 
 package syncutil
 
-import "testing"
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
 
 func TestAssertHeld(t *testing.T) {
 	type mutex interface {
@@ -34,15 +38,31 @@ func TestAssertHeld(t *testing.T) {
 		c.m.AssertHeld()
 		c.m.Unlock()
 
-		func() {
-			defer func() {
-				if r := recover(); r == nil {
-					t.Fatal("did not get expected panic")
-				} else if a, e := r.(string), "mutex is not locked"; a != e {
-					t.Fatalf("got %q, expected %q", a, e)
-				}
-			}()
-			c.m.AssertHeld()
-		}()
+		// The unsuccessful case.
+		require.PanicsWithValue(t, "mutex is not write locked", c.m.AssertHeld)
 	}
 }
+
+func TestAssertRHeld(t *testing.T) {
+	var m RWMutex
+
+	// The normal, successful case.
+	m.RLock()
+	m.AssertRHeld()
+	m.RUnlock()
+
+	// The normal case with two readers.
+	m.RLock()
+	m.RLock()
+	m.AssertRHeld()
+	m.RUnlock()
+	m.RUnlock()
+
+	// The case where a write lock is held.
+	m.Lock()
+	m.AssertRHeld()
+	m.Unlock()
+
+	// The unsuccessful case with no readers.
+	require.PanicsWithValue(t, "mutex is not read locked", m.AssertRHeld)
+}