Fix task resource unmarshal error case #2098
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
petderek
reviewed
Jun 26, 2019
agent/taskresource/types/types.go
Outdated
| func unmarshalResource(key string, value json.RawMessage, result map[string][]taskresource.TaskResource) error { | ||
| switch key { | ||
| case CgroupKey: | ||
| if err := unmarshlCgroup(key, value, result); err != nil { |
There was a problem hiding this comment.
these could all be simplified to:
return umarshalThing(key,value,result)
// this...
if err != nil {
return err
} else {
return nil
}
// ...is the same as
return err
petderek
reviewed
Jun 26, 2019
| @@ -113,12 +113,12 @@ func (c *CgroupResource) GetTerminalReason() string { | |||
|
|
|||
| // MarshalJSON marshals CgroupResource object | |||
| func (c *CgroupResource) MarshalJSON() ([]byte, error) { | |||
| return nil, errors.New("unsupported platform") | |||
There was a problem hiding this comment.
We'd want this to fail loudly on windows if this path got crossed, right?
There was a problem hiding this comment.
yeah. keeping the error and fixes the state file instead
fenxiong
force-pushed
the
fix-unmarshal
branch
2 times, most recently
from
c13f6a9
to
256538a
Compare
Previously task resource unmarshal error was ignored. This PR fixes it. Also fixes unit tests that start failing on mac after exposing the error.
yhlee-aws
approved these changes
Jun 26, 2019
suneyz
approved these changes
Jun 26, 2019
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
Previously task resource unmarshal error was ignored rather than returned. This PR fixes it.
Also fixes unit tests that start failing on mac after exposing the error. I had to fix a lot of state files used in state manager unit tests because they were using cgroup, but cgroup is not supported on non-linux platform.
Implementation details
Testing
New tests cover the changes:
Description for the changelog
Licensing
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.