Retain deleted entries for longer time

When deleting entries or when learning about deleted entries remember
then for a longer time to avoid excessive delete duplicates in the
gossip cluster. Also added code changes to ignore event messages
originated from the source node so that it doesn't get added into the
rebroadcast queue.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
This commit is contained in:
Jana Radhakrishnan 2016-06-30 18:24:13 -07:00
parent e942cb3dd6
commit 8936daab5e
2 changed files with 6 additions and 1 deletions

View File

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

View File

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