diff options
| author | Chris Lu <chris.lu@gmail.com> | 2020-06-08 08:12:59 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2020-06-08 08:12:59 -0700 |
| commit | bdbe5ddbe9cd46ec7a931407e0bc33a2f8d0c9b1 (patch) | |
| tree | a28194779e962724d01a2c9175dedf737d3d4c14 | |
| parent | b8e346cc86e4e2b23110bb3fd106567c2ea8686d (diff) | |
| download | seaweedfs-bdbe5ddbe9cd46ec7a931407e0bc33a2f8d0c9b1.tar.xz seaweedfs-bdbe5ddbe9cd46ec7a931407e0bc33a2f8d0c9b1.zip | |
volume server: add a fix for dead lock
https://github.com/chrislusf/seaweedfs/issues/1353
| -rw-r--r-- | weed/storage/volume_read_write.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/weed/storage/volume_read_write.go b/weed/storage/volume_read_write.go index dce800242..edb5f48d8 100644 --- a/weed/storage/volume_read_write.go +++ b/weed/storage/volume_read_write.go @@ -76,7 +76,7 @@ func (v *Volume) syncWrite(n *needle.Needle) (offset uint64, size uint32, isUnch defer v.dataFileAccessLock.Unlock() if MaxPossibleVolumeSize < v.nm.ContentSize()+uint64(actualSize) { - err = fmt.Errorf("volume size limit %d exceeded! current size is %d", MaxPossibleVolumeSize, v.ContentSize()) + err = fmt.Errorf("volume size limit %d exceeded! current size is %d", MaxPossibleVolumeSize, v.nm.ContentSize()) return } if v.isFileUnchanged(n) { @@ -190,7 +190,7 @@ func (v *Volume) syncDelete(n *needle.Needle) (uint32, error) { defer v.dataFileAccessLock.Unlock() if MaxPossibleVolumeSize < v.nm.ContentSize()+uint64(actualSize) { - err := fmt.Errorf("volume size limit %d exceeded! current size is %d", MaxPossibleVolumeSize, v.ContentSize()) + err := fmt.Errorf("volume size limit %d exceeded! current size is %d", MaxPossibleVolumeSize, v.nm.ContentSize()) return 0, err } |