memStore chunk protection added, no chunk removed without being written to disk

bzz/dbstore.go

@@ -287,6 +287,9 @@ func (s *dbStore) Put(chunk *Chunk) {
 	batch.Put(ikey, idata)
 
 	s.db.Write(batch)
+	if chunk.dbStored != nil {
+		close(chunk.dbStored)
+	}
 }
 
 // try to find index; if found, update access cnt and return true

bzz/dpa.go

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

bzz/localstore.go

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

bzz/memstore.go

@@ -314,8 +314,14 @@ func (s *memStore) removeOldest() {
 
 	}
 
+	if node.entry.dbStored != nil {
+		<-node.entry.dbStored
+	}
+	if node.entry.SData != nil {
 		node.entry = nil
 		s.entryCnt--
+	}
+
 	node.access[0] = 0
 
 	//---