Improve the error message when reserved memory is larger than the available memory #897
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
aaithal
reviewed
Jul 19, 2017
agent/api/ecsclient/client.go
Outdated
| mem = mem - int64(client.config.ReservedMemory) | ||
| registeredMem := mem - int64(client.config.ReservedMemory) | ||
| if registeredMem < 0 { | ||
| return "", fmt.Errorf("Resource memory is less than reserved, total memory: %d, reserved: %d", mem, client.config.ReservedMemory) |
There was a problem hiding this comment.
Can you modify the error string to be of the "context: message" format?
"api register-container-instance: reserved memory higher than available memory on the host ..."
vsiddharth
reviewed
Jul 19, 2017
agent/api/ecsclient/client.go
Outdated
| registeredMem := mem - int64(client.config.ReservedMemory) | ||
| if registeredMem < 0 { | ||
| return "", fmt.Errorf( | ||
| "api register-container-instance: reserved memory is higher than available memory on the hos, total memory: %d, reserved: %d", |
richardpen
force-pushed
the
fix-888
branch
3 times, most recently
from
c0c62ea
to
c9b51ac
Compare
petderek
approved these changes
Jul 20, 2017
agent/api/ecsclient/client.go
Outdated
| @@ -172,7 +173,12 @@ func (client *APIECSClient) registerContainerInstance(clusterRef string, contain | |||
| integerStr := "INTEGER" | |||
|
|
|||
| cpu, mem := getCpuAndMemory() | |||
| mem = mem - int64(client.config.ReservedMemory) | |||
| registeredMem := mem - int64(client.config.ReservedMemory) | |||
There was a problem hiding this comment.
Would 'remainingMem' be more appropriate?
aaithal
approved these changes
Jul 20, 2017
added 2 commits
July 20, 2017 19:42
… reserved memory value is greater than available memory on the instance
Merged
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.
Summary
Fix #888
Implementation details
Check the value of memory trying to registered before calling ecs RegisterContainerInstance. And if the value is negative then just emit an error and exit the agent.
Testing
make release)go build -out amazon-ecs-agent.exe ./agent)make test) passgo test -timeout=25s ./agent/...) passmake run-integ-tests) pass.\scripts\run-integ-tests.ps1) passmake run-functional-tests) pass.\scripts\run-functional-tests.ps1) passNew tests cover the changes:
yes
Description for the changelog
Licensing
This contribution is under the terms of the Apache 2.0 License:
yes