8000 Following term id by neunhoef · Pull Request #14405 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

Following term id #14405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 23 commits into from
Jul 7, 2021
Merged

Following term id #14405

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
e8e551b
First stab at following term id.
neunhoef Jun 25, 2021
79fbdf4
Also handle the planned leader change case.
neunhoef Jun 25, 2021
4fc887c
CHANGELOG.
neunhoef Jun 25, 2021
7c67605
Merge remote-tracking branch 'origin/devel' into bug-fix/following-te…
neunhoef Jun 28, 2021
5be1fd3
Merge remote-tracking branch 'origin/devel' into bug-fix/following-te…
neunhoef Jun 28, 2021
979a956
Remove bug introduced by merge.
neunhoef Jun 28, 2021
df19281
Fix windows compilation issue.
neunhoef Jun 28, 2021
cc931fb
Fix SyncCollectionFinalize.
neunhoef Jun 28, 2021
df4d679
Fix all setTheLeader places.
neunhoef Jun 28, 2021
6aa7a8a
Fix getting in sync.
neunhoef Jun 28, 2021
b66b361
Another try to get configuration of following in shard right.
neunhoef Jun 29, 2021
de5ff72
Merge remote-tracking branch 'origin/devel' into bug-fix/following-te…
neunhoef Jun 29, 2021
304cc67
Apply suggestions from code review
neunhoef Jun 29, 2021
ebf6012
Fix compilation.
neunhoef Jun 29, 2021
0b77428
Improve comments.
neunhoef Jun 29, 2021
45a9336
Merge remote-tracking branch 'origin/devel' into bug-fix/following-te…
neunhoef Jun 30, 2021
8b3e335
Merge remote-tracking branch 'origin/devel' into bug-fix/following-te…
neunhoef Jun 30, 2021
9051010
Merge remote-tracking branch 'origin/devel' into bug-fix/following-te…
neunhoef Jul 1, 2021
aaccae5
Concurrency fixes.
neunhoef Jul 1, 2021
30370c5
Merge branch 'bug-fix/following-term-id' of ssh://github.com/arangodb…
neunhoef Jul 1, 2021
cd3715c 8000
Add test.
neunhoef Jul 1, 2021
e389c23
Merge remote-tracking branch 'origin/devel' into bug-fix/following-te…
neunhoef Jul 5, 2021
d3985e9
Merge branch 'devel' into bug-fix/following-term-id
neunhoef Jul 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove bug introduced by merge.
  • Loading branch information
@neunhoef
neunhoef committed Jun 28, 2021
commit 979a956c12a5c50b2bb9d665877a5e1c54e2f41d
4 changes: 0 additions & 4 deletions arangod/Cluster/SynchronizeShard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1211,10 +1211,6 @@ Result SynchronizeShard::catchupWithExclusiveLock(
return {TRI_ERROR_INTERNAL, errorMessage};
}

// This is necessary to accept replications from the leader which can
// happen as soon as we are in sync.
collection.followers()->setTheLeader(leader);

NetworkFeature& nf = _feature.server().getFeature<NetworkFeature>();
network::ConnectionPool* pool = nf.pool();
res = addShardFollower(pool, ep, getDatabase(), getShard(), lockJobId, clientId,
Expand Down
0