Validate_linux: Modify the returned error #601
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
liangchenye
reviewed
Mar 13, 2018
| @@ -180,7 +180,7 @@ func (v *Validator) CheckLinux() (errs error) { | |||
| } | |||
|
|
|||
| if _, exists := devTypeList[devID]; exists { | |||
| logrus.Warnf("type:%s, major:%d and minor:%d for linux devices is duplicated", device.Type, device.Major, device.Minor) | |||
| logrus.Warnf("%v", specerror.NewError(specerror.DevicesErrorOnDup, fmt.Errorf("type:%s, major:%d and minor:%d for linux devices is duplicated", device.Type, device.Major, device.Minor), rspec.Version)) | |||
liangchenye
reviewed
Mar 13, 2018
validate/validate_linux.go
Outdated
| @@ -94,7 +94,7 @@ func (v *Validator) CheckLinux() (errs error) { | |||
| for index := 0; index < len(v.spec.Linux.Devices); index++ { | |||
| device := v.spec.Linux.Devices[index] | |||
| if !deviceValid(device) { | |||
| errs = multierror.Append(errs, fmt.Errorf("device %v is invalid", device)) | |||
| errs = multierror.Append(errs, specerror.NewError(specerror.DevicesAvailable, fmt.Errorf("device %v is invalid", device), rspec.Version)) | |||
There was a problem hiding this comment.
I think it is not 'DevicesAvailable' error, it is simply 'device is invalid'.
DevicesAvailable is done here: 'https://github.com/opencontainers/runtime-tools/blob/master/cmd/runtimetest/main.go#L437'
There was a problem hiding this comment.
BTW, the 'deviceValid' function should move to validate_linux.go.
It might be in another PR.
Signed-off-by: Zhou Hao <zhouhao@cn.fujitsu.com>
zhouhao3
force-pushed
the
validate-linux-fix
branch
from
58a4266 to
e99b47e
Compare
|
LGTM |
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.
Signed-off-by: Zhou Hao zhouhao@cn.fujitsu.com