forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-23 05:06:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

introduce dbStored lock to make sure chunk not removed from memory store before written to disk

Browse source
This commit is contained in:
zelig 2015-05-14 13:16:22 +02:00
parent 438195842c
commit c14c85f03b
6 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
bzz/chunker.go
View file

@ -318,16 +318,16 @@ func (self *LazyChunkReader) ReadAt(b []byte, off int64) (read int, err error) {
dpaLogger.Debugf("quit") dpaLogger.Debugf("quit")
return return
case <-chunk.C: // bells are ringing, data have been delivered case <-chunk.C: // bells are ringing, data have been delivered
dpaLogger.Debugf("chunk data received for %x", chunk.Key[:4]) // dpaLogger.Debugf("chunk data received for %x", chunk.Key[:4])
} }
if len(chunk.SData) == 0 { if len(chunk.SData) == 0 {
dpaLogger.Debugf("No payload in %x.", chunk.Key) // dpaLogger.Debugf("No payload in %x", chunk.Key)
return 0, notFound return 0, notFound
} }
chunk.Size = int64(binary.LittleEndian.Uint64(chunk.SData[0:8])) chunk.Size = int64(binary.LittleEndian.Uint64(chunk.SData[0:8]))
self.size = chunk.Size self.size = chunk.Size
if b == nil { if b == nil {
dpaLogger.Debugf("Size query for %x.", chunk.Key[:4]) // dpaLogger.Debugf("Size query for %x", chunk.Key[:4])
return return
} }
want := int64(len(b)) want := int64(len(b))
@ -350,14 +350,14 @@ func (self *LazyChunkReader) ReadAt(b []byte, off int64) (read int, err error) {
}() }()
select { select {
case err = <-self.errC: case err = <-self.errC:
dpaLogger.Debugf("ReadAt received %v.", err) dpaLogger.Debugf("ReadAt received %v", err)
read = len(b) read = len(b)
if off+int64(read) == self.size { if off+int64(read) == self.size {
err = io.EOF err = io.EOF
} }
dpaLogger.Debugf("ReadAt returning with %d, %v.", read, err) dpaLogger.Debugf("ReadAt returning with %d, %v", read, err)
case <-self.quitC: case <-self.quitC:
dpaLogger.Debugf("ReadAt aborted with %d, %v.", read, err) dpaLogger.Debugf("ReadAt aborted with %d, %v", read, err)
} }
return return
} }
@ -365,7 +365,7 @@ func (self *LazyChunkReader) ReadAt(b []byte, off int64) (read int, err error) {
func (self *LazyChunkReader) join(b []byte, off int64, eoff int64, depth int, treeSize int64, chunk *Chunk, parentWg *sync.WaitGroup) { func (self *LazyChunkReader) join(b []byte, off int64, eoff int64, depth int, treeSize int64, chunk *Chunk, parentWg *sync.WaitGroup) {
defer parentWg.Done() defer parentWg.Done()
dpaLogger.Debugf("depth: %v, loff: %v, eoff: %v, chunk.Size: %v, treeSize: %v", depth, off, eoff, chunk.Size, treeSize) // dpaLogger.Debugf("depth: %v, loff: %v, eoff: %v, chunk.Size: %v, treeSize: %v", depth, off, eoff, chunk.Size, treeSize)
chunk.Size = int64(binary.LittleEndian.Uint64(chunk.SData[0:8])) chunk.Size = int64(binary.LittleEndian.Uint64(chunk.SData[0:8]))
@ -376,7 +376,7 @@ func (self *LazyChunkReader) join(b []byte, off int64, eoff int64, depth int, tr
} }
if depth == 0 { if depth == 0 {
dpaLogger.Debugf("len(b): %v, off: %v, eoff: %v, chunk.Size: %v, treeSize: %v", depth, len(b), off, eoff, chunk.Size, treeSize) // dpaLogger.Debugf("depth: %v, len(b): %v, off: %v, eoff: %v, chunk.Size: %v, treeSize: %v", depth, len(b), off, eoff, chunk.Size, treeSize)
if int64(len(b)) != eoff-off { if int64(len(b)) != eoff-off {
//fmt.Printf("len(b) = %v off = %v eoff = %v", len(b), off, eoff) //fmt.Printf("len(b) = %v off = %v eoff = %v", len(b), off, eoff)
panic("len(b) does not match") panic("len(b) does not match")

5
bzz/dbstore.go
View file

@ -259,6 +259,7 @@ func (s *dbStore) Put(chunk *Chunk) {
var index dpaDBIndex var index dpaDBIndex
if s.tryAccessIdx(ikey, &index) { if s.tryAccessIdx(ikey, &index) {
chunk.dbStored.Unlock()
return // already exists, only update access return // already exists, only update access
} }
@ -287,9 +288,7 @@ func (s *dbStore) Put(chunk *Chunk) {
batch.Put(ikey, idata) batch.Put(ikey, idata)
s.db.Write(batch) s.db.Write(batch)
if chunk.dbStored != nil { chunk.dbStored.Unlock()
close(chunk.dbStored)
}
} }
// try to find index; if found, update access cnt and return true // try to find index; if found, update access cnt and return true

2
bzz/dpa.go
View file

@ -60,7 +60,7 @@ type Chunk struct {
C chan bool // to signal data delivery by the dpa C chan bool // to signal data delivery by the dpa
req *requestStatus // req *requestStatus //
wg *sync.WaitGroup wg *sync.WaitGroup
dbStored chan bool dbStored sync.Mutex
source *peer source *peer
} }

2
bzz/localstore.go
View file

@ -9,7 +9,7 @@ type localStore struct {
// localStore is itself a chunk store , to stores a chunk only // localStore is itself a chunk store , to stores a chunk only
// its integrity is checked ? // its integrity is checked ?
func (self *localStore) Put(chunk *Chunk) { func (self *localStore) Put(chunk *Chunk) {
chunk.dbStored = make(chan bool) chunk.dbStored.Lock()
self.memStore.Put(chunk) self.memStore.Put(chunk)
if chunk.wg != nil { if chunk.wg != nil {
chunk.wg.Add(1) chunk.wg.Add(1)

6
bzz/memstore.go
View file

@ -314,9 +314,9 @@ func (s *memStore) removeOldest() {
} }
if node.entry.dbStored != nil { node.entry.dbStored.Lock()
<-node.entry.dbStored node.entry.dbStored.Unlock()
}
if node.entry.SData != nil { if node.entry.SData != nil {
node.entry = nil node.entry = nil
s.entryCnt-- s.entryCnt--

4
bzz/protocol.go
View file

@ -136,6 +136,10 @@ type retrieveRequestMsgData struct {
peer peer // protocol registers the requester peer peer // protocol registers the requester
} }
func (self *retrieveRequestMsgData) String() string {
return fmt.Sprintf("From: %v, Key: %x; ID: %v, MaxSize: %v, MaxPeers: %v", self.peer.Addr(), self.Key[:4], self.Id, self.MaxSize, self.MaxPeers)
}
type peerAddr struct { type peerAddr struct {
IP net.IP IP net.IP
Port uint16 Port uint16