8000 Bug fix/agency restart after compaction and holes in log by kvahed · Pull Request #3413 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

Bug fix/agency restart after compaction and holes in log #3413

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 8 commits into from
Oct 13, 2017
Merged

Bug fix/agency restart after compaction and holes in log #3413

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
57a8d38
Agent restarting from persistence after compaction kept sending 0-100…
kvahed Oct 13, 2017
e251d66
State fixes holes in RAFT index range
kvahed Oct 13, 2017
4d43a87
Agent restarting from persistence after compaction kept sending 0-100…
kvahed Oct 13, 2017
a45f7b1
removed the bogus code from sendAppendEntries
kvahed Oct 13, 2017
449d115
Avoid application of entries older than compaction index _cur and gua…
kvahed Oct 13, 2017
0d70579
both locks need be acquired for setting _confirmed to _commitIndex
kvahed Oct 13, 2017
317f83c
lastIndex must be cur
kvahed Oct 13, 2017
52d990b
Fix loadRemaining.
neunhoef Oct 13, 2017
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
both locks need be acquired for setting _confirmed to _commitIndex
  • Loading branch information
@kvahed
kvahed committed Oct 13, 2017
commit 0d705791a5fc8089968275c16c7d4892fa6413a6
1 change: 1 addition & 0 deletions arangod/Agency/Agent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1262,6 +1262,7 @@ void Agent::lead() {
// Any missing indices before _commitIndex were compacted.
// DO NOT EDIT without understanding the consequences for sendAppendEntries!
CONDITION_LOCKER(guard, _waitForCV);
MUTEX_LOCKER(tiLocker, _tiLock);
for (auto& i : _confirmed) {
if (i.first != id()) {
i.second = _commitIndex;
Expand Down
4 changes: 2 additions & 2 deletions arangod/Agency/Agent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,8 +390,8 @@ class Agent : public arangodb::Thread,

/// Rules for the locks: This covers the following locks:
/// _ioLock (here)
/// _logLock (in State)
/// _tiLock (here)
/// _logLock (in State) _waiForCV (here)
/// _tiLock (here) _tiLock (here)
/// One may never acquire a log in this list whilst holding another one
/// that appears further down on this list. This is to prevent deadlock.
/// For _logLock: This is local to State and we make sure that the few
Expand Down
0