mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-01-24 18:59:02 -06:00
Code Issues Packages Projects Releases 123 Wiki Activity

Merge pull request #5472 from dolthub/andy/fix-reentrant-locking

Browse Source 
go/store/nbs: fix re-entrant deadlock in journal_writer
This commit is contained in:
AndyA
2023-03-02 13:44:40 -08:00
committed by GitHub
parent cfe75a23cd 32904dbb58
commit 48a83b4a56
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
go/store/nbs/journal_writer.go
View File

@@ -335,8 +335,6 @@ func (wr *journalWriter) flushIndexRecord(root hash.Hash, end int64) (err error)
// readAt reads len(p) bytes from the journal at offset |off|.
func (wr *journalWriter) readAt(p []byte, off int64) (n int, err error) {
wr.lock.RLock()
defer wr.lock.RUnlock()
var bp []byte
if off < wr.off {
// fill some or all of |p| from |wr.file|