Fix another regression: a crash introduced in commit feb892f #82
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
|
@JessicaLHartog: please review. |
erikdw
changed the title
Commit feb892f (from PR mesos#79) introduced a NullPointerException crash: After the first pass through the `computeResourcesForSlot()` main loop, the `executorCpuResources` and `executorMemResources` variables are not populated, and thus incorreclty null, because `subtractedExecutorResources ` was set to true on the 1st pass. The fix is to unconditionally set them to the requested resource amounts unconditionally, and only subtract the resources out of the offer on the 1st pass. Also an unrelated change: clarify that the reservations that are being skipped in a couple functions are *dynamic* reservations.
erikdw
changed the title
|
LGTM 👍 |
|
Here goes nothing! ;-) Hope this works well for everyone. Definitely need to fix #81 |
erikdw
added a commit
that referenced
this pull request
Dec 10, 2015
Fix another regression: a crash introduced in commit feb892f
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.
Commit feb892f (from PR #79) introduced a NullPointerException crash:
After the first pass through the
computeResourcesForSlot()main loop, theexecutorCpuResourcesandexecutorMemResourcesvariables are not populated,and thus incorreclty null, because
subtractedExecutorResourceswas set totrue on the 1st pass.
The fix is to unconditionally set them to the requested resource amounts
unconditionally, and only subtract the resources out of the offer on the
1st pass.
Also an unrelated change: clarify that the reservations that are being skipped
in a couple functions are dynamic reservations.