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.

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

ZOOKEEPER-2307: ZooKeeper not starting because acceptedEpoch is less than the currentEpoch #1613

Closed
wants to merge 1 commit into from

Conversation

symat
Copy link
Contributor

@symat symat commented Feb 24, 2021

Update acceptedEpoch and currentEpoch in file first then in memory.

Closes #1145 from arshadmohammad/ZOOKEEPER-2307-epochUpdate and squashes the following commits:

b05bc1f [Mohammad Arshad] review comment fix
c8d620f [Mohammad Arshad] ZOOKEEPER-2307:ZooKeeper not starting because acceptedEpoch is less than the currentEpoch

(cherry picked from commit 19d8567)

…than the currentEpoch

Update acceptedEpoch and currentEpoch in file first then in memory.

Author: Mohammad Arshad <arshad@apache.org>

Reviewers: andor@apache.org

Closes apache#1145 from arshadmohammad/ZOOKEEPER-2307-epochUpdate and squashes the following commits:

b05bc1f [Mohammad Arshad] review comment fix
c8d620f [Mohammad Arshad] ZOOKEEPER-2307:ZooKeeper not starting because acceptedEpoch is less than the currentEpoch

(cherry picked from commit 19d8567)
@symat
Copy link
Contributor Author

symat commented Feb 24, 2021

@anmolnar , @maoling , this is a fix you already reviewed (#1145), and I was merging it to master and branch-3.5 back then, but it wasn't merged to branch-3.6 for some reason (this happened around the branching of RC1 of 3.6.0). See ZOOKEEPER-4222.

Please take a look. I think we should submit this to the current branch-3.6 if CI is OK with it.

@symat
Copy link
Contributor Author

symat commented Feb 24, 2021

CI failed, we hit one timeout in test ReadOnlyModeTest. My local re-run succeeded ( mvn test -Dtest=ReadOnlyModeTest -DfailIfNoTests=false), most probably this is only an infra / flaky CI issue. Given that this was a clean cherry-pick, I think it is OK to go ahead and merge it.

Copy link
Contributor

@nkalmar nkalmar left a comment

Choose a reason for hiding this comment

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

+1, same changes as on master/3.5

@symat
Copy link
Contributor Author

symat commented Feb 25, 2021

thanks @nkalmar !
I'll merge this (after lunch... let's keep the priorities :p :) )

Copy link
Contributor

@anmolnar anmolnar left a comment

Choose a reason for hiding this comment

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

lgtm. I restarted the CI build.

@symat
Copy link
Contributor Author

symat commented Feb 25, 2021

thanks @anmolnar !
it succeeded this time

asfgit pushed a commit that referenced this pull request Feb 25, 2021
…than the currentEpoch

Update acceptedEpoch and currentEpoch in file first then in memory.

Author: Mohammad Arshad <arshadapache.org>

Reviewers: andorapache.org

Closes #1145 from arshadmohammad/ZOOKEEPER-2307-epochUpdate and squashes the following commits:

b05bc1f [Mohammad Arshad] review comment fix
c8d620f [Mohammad Arshad] ZOOKEEPER-2307:ZooKeeper not starting because acceptedEpoch is less than the currentEpoch

(cherry picked from commit 19d8567)

Author: Mohammad Arshad <arshad@apache.org>

Reviewers: Andor Molnar <andor@apache.org>, Norbert Kalmar <nkalmar@apache.org>

Closes #1613 from symat/ZOOKEEPER-4222
@symat symat closed this Feb 25, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants