Skip to content

release-2.1: gossip: infoStore.mostDistant should never return the local node-id#29413

Merged
craig[bot] merged 2 commits intocockroachdb:release-2.1from
petermattis:backport2.1-29398
Aug 31, 2018
Merged

release-2.1: gossip: infoStore.mostDistant should never return the local node-id#29413
craig[bot] merged 2 commits intocockroachdb:release-2.1from
petermattis:backport2.1-29398

Conversation

@petermattis
Copy link
Copy Markdown
Collaborator

Backport 2/2 commits from #29398.

/cc @cockroachdb/release


Fixes #28517

Release note: None

When adding infos from a remote node, skip any info which originated on
the local node.

Release note: None
@petermattis petermattis requested review from a team and a-robinson August 31, 2018 01:38
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

Copy link
Copy Markdown
Contributor

@a-robinson a-robinson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@petermattis
Copy link
Copy Markdown
Collaborator Author

bors r=a-robinson

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Aug 31, 2018

Build failed

@petermattis
Copy link
Copy Markdown
Collaborator Author

TestBuildInfo failure. I've disabled the problematic agent. Trying again.

bors r=a-robinson

craig bot pushed a commit that referenced this pull request Aug 31, 2018
29413: release-2.1: gossip: infoStore.mostDistant should never return the local node-id r=a-robinson a=petermattis

Backport 2/2 commits from #29398.

/cc @cockroachdb/release

---

Fixes #28517

Release note: None


Co-authored-by: Peter Mattis <petermattis@gmail.com>
@craig
Copy link
Copy Markdown
Contributor

craig bot commented Aug 31, 2018

Build succeeded

@craig craig bot merged commit 46d576a into cockroachdb:release-2.1 Aug 31, 2018
@petermattis petermattis deleted the backport2.1-29398 branch August 31, 2018 18:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants