From 57c6eddd223875b6a1ed04cc87c00b9188f745b7 Mon Sep 17 00:00:00 2001 From: chrislu Date: Mon, 21 Mar 2022 00:04:01 -0700 Subject: [PATCH] avoid possible deadlock if volume layout is used in some logs --- weed/topology/volume_layout.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/weed/topology/volume_layout.go b/weed/topology/volume_layout.go index dbfb439bd..64e196032 100644 --- a/weed/topology/volume_layout.go +++ b/weed/topology/volume_layout.go @@ -140,9 +140,7 @@ func NewVolumeLayout(rp *super_block.ReplicaPlacement, ttl *needle.TTL, diskType } func (vl *VolumeLayout) String() string { - vl.accessLock.RLock() - defer vl.accessLock.RUnlock() - return fmt.Sprintf("rp:%v, ttl:%v, vid2location:%v, writables:%v, volumeSizeLimit:%v", vl.rp, vl.ttl, vl.vid2location, vl.writables, vl.volumeSizeLimit) + return fmt.Sprintf("rp:%v, ttl:%v, writables:%v, volumeSizeLimit:%v", vl.rp, vl.ttl, vl.writables, vl.volumeSizeLimit) } func (vl *VolumeLayout) RegisterVolume(v *storage.VolumeInfo, dn *DataNode) {