Relax disk space checking #275
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bsideup
reviewed
Jan 21, 2017
| @@ -157,7 +157,7 @@ private void checkDiskSpace(DockerClient client) { | |||
| df.usedPercent.map(x -> x.toString() + "%").orElse("unknown"), | |||
| df.availableMB.map(x -> x.toString() + " MB available").orElse("unknown available")); | |||
|
|
|||
| if (df.availableMB.orElseThrow(NotAbleToGetDiskSpaceUsageException::new) < 2048) { | |||
| if (df.availableMB.isPresent() && df.availableMB.get() < 2048) { | |||
There was a problem hiding this comment.
if (df.availableMB.map(it -> it < 2048).orElse(false)) { :)
rnorth
force-pushed
the
relax-disk-space-check
branch
from
85cfc30
to
5665c19
Compare
…ws no available volumes (see #273). While the cause is not known, and Docker may yet fail, relaxing this constraint at least lets Docker try without aborting prematurely. Use functional operation to compare disk space if not null
rnorth
force-pushed
the
relax-disk-space-check
branch
from
5665c19
to
1467b2e
Compare
bsideup
approved these changes
Jan 22, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…to not abort in cases where
dfoutput shows no available volumes (see #273). While the cause is not known, and Docker may yet fail, relaxing this constraint at least lets Docker try without aborting prematurely.