Skip to content
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

Jump to bottom

mimic: mon: paxos: introduce new reset_pending_committing_finishers for safety #28540

Merged
merged 1 commit into from
Jul 1, 2019
Merged

mimic: mon: paxos: introduce new reset_pending_committing_finishers for safety #28540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 8 additions & 6 deletions src/mon/Paxos.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1343,8 +1343,7 @@ void Paxos::leader_init()
// discard pending transaction
pending_proposal.reset();

finish_contexts(g_ceph_context, pending_finishers, -EAGAIN);
finish_contexts(g_ceph_context, committing_finishers, -EAGAIN);
reset_pending_committing_finishers();

logger->inc(l_paxos_start_leader);

Expand Down Expand Up @@ -1375,9 +1374,8 @@ void Paxos::peon_init()
pending_proposal.reset();

// no chance to write now!
reset_pending_committing_finishers();
finish_contexts(g_ceph_context, waiting_for_writeable, -EAGAIN);
finish_contexts(g_ceph_context, pending_finishers, -EAGAIN);
finish_contexts(g_ceph_context, committing_finishers, -EAGAIN);

logger->inc(l_paxos_start_peon);
}
Expand All @@ -1400,13 +1398,17 @@ void Paxos::restart()
// discard pending transaction
pending_proposal.reset();

finish_contexts(g_ceph_context, committing_finishers, -EAGAIN);
finish_contexts(g_ceph_context, pending_finishers, -EAGAIN);
reset_pending_committing_finishers();
finish_contexts(g_ceph_context, waiting_for_active, -EAGAIN);

logger->inc(l_paxos_restart);
}

void Paxos::reset_pending_committing_finishers()
{
committing_finishers.splice(committing_finishers.end(), pending_finishers);
finish_contexts(g_ceph_context, committing_finishers, -EAGAIN);
}

void Paxos::dispatch(MonOpRequestRef op)
{
Expand Down
9 changes: 9 additions & 0 deletions src/mon/Paxos.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,6 +597,15 @@ class Paxos {
* this list. When it commits, these finishers are notified.
*/
list<Context*> committing_finishers;
/**
* This function re-triggers pending_ and committing_finishers
* safely, so as to maintain existing system invariants. In particular
* we maintain ordering by triggering committing before pending, and
* we clear out pending_finishers prior to any triggers so that
* we don't trigger asserts on them being empty. You should
* use it instead of sending -EAGAIN to them with finish_contexts.
*/
void reset_pending_committing_finishers();

/**
* @defgroup Paxos_h_sync_warns Synchronization warnings
Expand Down