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-3701: Split brain on log disk full (3.5) #1237

Closed
wants to merge 2 commits into from

Conversation

anmolnar
Copy link
Contributor

Backport of #1233

Unfortunately the unit test cannot be backported, because 3.5 doesn't have the abstract requestSystemExit feature.

Issue described here:
https://issues.apache.org/jira/browse/ZOOKEEPER-3701

Proposing a fix with catching `IOException` within the truncate method to properly return with `false` if truncate fails.

Author: Andor Molnar <andor@apache.org>
Author: Andor Molnar <andor@cloudera.com>

Reviewers: Ivan Kelly <ivank@apache.org>, Enrico Olivelli <eolivelli@apache.org>, Norbert Kalmar <nkalmar@apache.org>

Closes apache#1233 from anmolnar/ZOOKEEPER-3701

(cherry picked from commit a4bc985)
Signed-off-by: Norbert Kalmar <nkalmar@apache.org>
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.

LGTM, same as master patch minus the tests (learner/truncate) that couldn't be backported to 3.5.

@nkalmar
Copy link
Contributor

nkalmar commented Jan 29, 2020

Soo... the build failed because releaseaudit just realised https://github.com/apache/zookeeper/blob/branch-3.5/zookeeper-server/src/test/java/org/apache/zookeeper/common/NetUtilsTest.java does not have an Apache header, which was committed in December?!
Can you please add one @anmolnar ? I think it's easier to just add with this patch.
Or just commit as is, and will fix it later? (Tests pass)

Edit: I guess 3.5 has been failing since December.

asfgit pushed a commit that referenced this pull request Jan 30, 2020
Backport of #1233

Unfortunately the unit test cannot be backported, because 3.5 doesn't have the abstract `requestSystemExit` feature.

Author: Andor Molnar <andor@apache.org>

Reviewers: Norbert Kalmar <nkalmar@apache.org>

Closes #1237 from anmolnar/ZOOKEEPER-3701_35
@nkalmar
Copy link
Contributor

nkalmar commented Jan 30, 2020

Merged to 3.5, thanks @anmolnar

@nkalmar nkalmar closed this Jan 30, 2020
@anmolnar anmolnar deleted the ZOOKEEPER-3701_35 branch January 31, 2020 16:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants