Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2025-01-02 18:39:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix blockstore panic (#1570)

Browse Source
This commit is contained in:
Mike Sawka 2024-12-19 10:35:50 -08:00 committed by GitHub
parent 0925af5300
commit 8ae6e47d9b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/filestore/blockstore_cache.go
View File

@ -227,6 +227,9 @@ func (entry *CacheEntry) readAt(ctx context.Context, offset int64, size int64, r
offset += truncateAmt offset += truncateAmt
size -= truncateAmt size -= truncateAmt
} }
if size <= 0 {
return realDataOffset, nil, nil
}
} }
partMap := file.computePartMap(offset, size) partMap := file.computePartMap(offset, size)
dataEntryMap, err := entry.loadDataPartsForRead(ctx, getPartIdxsFromMap(partMap)) dataEntryMap, err := entry.loadDataPartsForRead(ctx, getPartIdxsFromMap(partMap))

5
pkg/wshutil/wshrpc.go
View File

@ -342,7 +342,10 @@ func (w *WshRpc) runServer() {
continue continue
} }
if msg.IsRpcRequest() { if msg.IsRpcRequest() {
go w.handleRequest(&msg) go func() {
defer panichandler.PanicHandler("handleRequest:goroutine")
w.handleRequest(&msg)
}()
} else { } else {
respCh := w.getResponseCh(msg.ResId) respCh := w.getResponseCh(msg.ResId)
if respCh == nil { if respCh == nil {