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

Fail AppInitMain if either disk space check fails #15124

Merged
merged 1 commit into from Jan 9, 2019

Conversation

Projects
None yet
6 participants
@Empact
Copy link
Member

commented Jan 7, 2019

Rather than both.

Introduced in 386a6b6, #12653

@Empact Empact changed the title Fail if either disk space check fails Fail AppInitMain if either disk space check fails Jan 7, 2019

@promag

This comment has been minimized.

Copy link
Member

commented Jan 7, 2019

I think it's reasonable to split the expression to log which directory needs more space.

@jimpo

This comment has been minimized.

Copy link
Contributor

commented Jan 8, 2019

utACK 11e85ca

Show resolved Hide resolved src/init.cpp Outdated
@MarcoFalke

This comment has been minimized.

Copy link
Member

commented Jan 8, 2019

utACK 11e85ca

@Empact Empact force-pushed the Empact:disk-space-check branch 2 times, most recently Jan 8, 2019

Show resolved Hide resolved src/init.cpp Outdated
@jamesob

This comment has been minimized.

Copy link
Member

commented Jan 8, 2019

Agree with @promag: while we're in the neighborhood, we should specify which disk is full.

@Empact Empact force-pushed the Empact:disk-space-check branch Jan 9, 2019

Fail if either disk space check fails
Rather than both.

Introduced in 386a6b6

@Empact Empact force-pushed the Empact:disk-space-check branch to ba8c8b2 Jan 9, 2019

@Empact

This comment has been minimized.

Copy link
Member Author

commented Jan 9, 2019

Updated to address feedback.

@promag

This comment has been minimized.

Copy link
Member

commented Jan 9, 2019

utACK ba8c8b2, thanks!

@laanwj

This comment has been minimized.

Copy link
Member

commented Jan 9, 2019

utACK ba8c8b2

@laanwj laanwj merged commit ba8c8b2 into bitcoin:master Jan 9, 2019

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

laanwj added a commit that referenced this pull request Jan 9, 2019

Merge #15124: Fail AppInitMain if either disk space check fails
ba8c8b2 Fail if either disk space check fails (Ben Woosley)

Pull request description:

  Rather than both.

  Introduced in 386a6b6, #12653

Tree-SHA512: 24765dd3c62b742c491d7d9a751917c2ce6f3819a8764a7725ce84910ef69bffca07f4c0dfbeed8c4f978a12c4b04a2ac3b8c2ff59602330a8a3e8a68878c41b

@Empact Empact deleted the Empact:disk-space-check branch Jan 9, 2019

@MarcoFalke

This comment has been minimized.

Copy link
Member

commented Jan 9, 2019

Could add a test, if possible somehow?

@Empact

This comment has been minimized.

Copy link
Member Author

commented Jan 10, 2019

I don't know of any way to set up the scenario as-is - could refactor for more testability with stubbing/mocking.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.