fix windows drive volume mounting #1571
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
samuelkarp
approved these changes
Sep 12, 2018
agent/api/task/task_windows.go
Outdated
| @@ -73,8 +73,23 @@ func (task *Task) downcaseAllVolumePaths() { | |||
| } | |||
| } | |||
|
|
|||
| func isBareDrive(path string) bool { | |||
There was a problem hiding this comment.
nit: I tend to prefer having the caller function above the callee function (so getCanonicalPath above isBareDrive) as I find it easier to read (I can understand why the function exists before reading the body of it).
haikuoliu
approved these changes
Sep 12, 2018
fenxiong
force-pushed
the
fix-windows-volume
branch
from
acf3359
to
0011762
Compare
|
moved isBareDrive to be under getCanonicalPath and rebased. |
yhlee-aws
approved these changes
Sep 13, 2018
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
For windows volume task, the agent fails to support a mounting from drive to drive, because when the container path is a bare drive like 'D:', the agent changes it to 'd:.' in the getCanonicalPath function, which is no longer supported by Docker because that is a directory, but container path can only be either a directory in C drive, or another drive. This pr is to fix this issue.
Implementation details
Treat the bare drive path specially in getCanonicalPath.
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:
unit test added; manual test is performed to verify that this fixes the issue; functional test is not added because it seems to be nontrivial to add another drive.
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.