Merge pull request #1307 from mrjana/networkdb

Retain deleted entries for longer time
This commit is contained in:
Alessandro Boch 2016-06-30 22:58:58 -07:00 committed by GitHub
commit 370cd93a86
2 changed files with 6 additions and 1 deletions

View File

@ -14,7 +14,7 @@ import (
"github.com/hashicorp/memberlist"
)
const reapInterval = 2 * time.Second
const reapInterval = 30 * time.Second
type logWriter struct{}

View File

@ -130,6 +130,11 @@ func (nDB *NetworkDB) handleTableMessage(buf []byte, isBulkSync bool) {
return
}
// Ignore messages that this node generated.
if tEvent.NodeName == nDB.config.NodeName {
return
}
// Do not rebroadcast a bulk sync
if rebroadcast := nDB.handleTableEvent(&tEvent); rebroadcast && !isBulkSync {
var err error