Merge #92606

92606: config: acquire write lock when overwriting the map r=yuzefovich a=yuzefovich Previously, by mistake we were acquiring a read lock even though we do write operations in `PurgeZoneConfigCache`. Fixes: #92519. Release note: None Co-authored-by: Yahor Yuzefovich <[email protected]>
cockroachdb · Nov 29, 2022 · 5632043 · 5632043
2 parents 305b01e + a69ffb5
commit 5632043
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkg/config/system.go b/pkg/config/system.go
@@ -408,8 +408,8 @@ func (s *SystemConfig) GetZoneConfigForObject(
 // requested. Note, this function is only intended to be called during test
 // execution, such as logic tests.
 func (s *SystemConfig) PurgeZoneConfigCache() {
-	s.mu.RLock()
-	defer s.mu.RUnlock()
+	s.mu.Lock()
+	defer s.mu.Unlock()
 	if len(s.mu.zoneCache) != 0 {
 		s.mu.zoneCache = map[ObjectID]zoneEntry{}
 	}