forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-18 09:53:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

swarm/storage: more error logging for Read and ReadAt

Browse source
This commit is contained in:
Anton Evangelatov 2018-04-22 13:10:08 +02:00
parent 726ab4893b
commit 09713314c7
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
swarm/storage/chunker.go
View file

@ -393,7 +393,7 @@ type LazyChunkReader struct {
} }
// implements the Joiner interface // implements the Joiner interface
func (self *TreeChunker) Join() LazySectionReader { func (self *TreeChunker) Join() *LazyChunkReader {
return &LazyChunkReader{ return &LazyChunkReader{
key: self.key, key: self.key,
chunkSize: self.chunkSize, chunkSize: self.chunkSize,
@ -436,6 +436,7 @@ func (self *LazyChunkReader) ReadAt(b []byte, off int64) (read int, err error) {
quitC := make(chan bool) quitC := make(chan bool)
size, err := self.Size(quitC) size, err := self.Size(quitC)
if err != nil { if err != nil {
log.Error("lazychunkreader.readat.size", "size", size, "err", err)
return 0, err return 0, err
} }
@ -464,6 +465,7 @@ func (self *LazyChunkReader) ReadAt(b []byte, off int64) (read int, err error) {
err = <-errC err = <-errC
if err != nil { if err != nil {
log.Error("lazychunkreader.readat.errc", "err", err)
close(quitC) close(quitC)
return 0, err return 0, err
} }
@ -517,6 +519,7 @@ func (self *LazyChunkReader) join(b []byte, off int64, eoff int64, depth int, tr
childKey := chunkData[8+j*self.hashSize : 8+(j+1)*self.hashSize] childKey := chunkData[8+j*self.hashSize : 8+(j+1)*self.hashSize]
chunkData, err := self.getter.Get(Reference(childKey)) chunkData, err := self.getter.Get(Reference(childKey))
if err != nil { if err != nil {
log.Error("lazychunkreader.join", "key", childKey, "err", err)
select { select {
case errC <- fmt.Errorf("chunk %v-%v not found", off, off+treeSize): case errC <- fmt.Errorf("chunk %v-%v not found", off, off+treeSize):
case <-quitC: case <-quitC:
@ -535,6 +538,9 @@ func (self *LazyChunkReader) join(b []byte, off int64, eoff int64, depth int, tr
func (self *LazyChunkReader) Read(b []byte) (read int, err error) { func (self *LazyChunkReader) Read(b []byte) (read int, err error) {
log.Debug("lazychunkreader.read", "key", self.key) log.Debug("lazychunkreader.read", "key", self.key)
read, err = self.ReadAt(b, self.off) read, err = self.ReadAt(b, self.off)
if err != nil {
log.Error("lazychunkreader.readat", "read", read, "err", err)
}
self.off += int64(read) self.off += int64(read)
return return