Skip to content

ZOOKEEPER-5088: Initialize ObserverMaster with pending follower proposals #2454

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

Open
JHSUYU wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ZOOKEEPER-5088: Initialize ObserverMaster with pending follower proposals #2454

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
6 changes: 6 additions & 0 deletions zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/Follower.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,12 @@ void followLeader() throws InterruptedException {
LOG.info("Starting ObserverMaster");

om = new ObserverMaster(self, fzk, self.getObserverMasterPort());
// Proposals received during synchronization are added directly to
// pendingTxns and do not pass through processPacket(). Seed the
// ObserverMaster before it starts accepting observers.
for (Request request : fzk.pendingTxns) {
om.proposalReceived(request);
}
om.start();
} else {
om = null;
Expand Down
4 changes: 4 additions & 0 deletions zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/ObserverMaster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,10 @@ void proposalReceived(QuorumPacket qp) {
proposedPkts.add(new QuorumPacket(Leader.INFORM, qp.getZxid(), qp.getData(), null));
}

void proposalReceived(Request request) {
proposedPkts.add(new QuorumPacket(Leader.INFORM, request.zxid, request.getSerializeData(), null));
}

private synchronized QuorumPacket removeProposedPacket(long zxid) {
QuorumPacket pkt = proposedPkts.peek();
if (pkt == null || pkt.getZxid() > zxid) {
Expand Down
Loading
Loading