bugfix: can't copy data with dr mode #2554
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
Codecov Report
@@ Coverage Diff @@
## master #2554 +/- ##
==========================================
- Coverage 69.15% 69.01% -0.14%
==========================================
Files 278 278
Lines 18574 18581 +7
==========================================
- Hits 12845 12824 -21
- Misses 4260 4279 +19
- Partials 1469 1478 +9
|
|
link to #2200 |
fuweid
reviewed
Dec 12, 2018
daemon/mgr/container_storage_test.go
Outdated
| } | ||
|
|
||
| mounts = sortMountPoint(mounts) | ||
| if mounts[0].Destination != "/opt" || mounts[0].Source != "/pouch/volume5" { |
There was a problem hiding this comment.
I think we can prepare two arrays here. one is out of order, other one is in order. After sortMountPoint, use loop to check each item. WDYT?
fuweid
reviewed
Dec 12, 2018
test/cli_run_volume_test.go
Outdated
| res = command.PouchRun("exec", cname, "ls", "/var/spool") | ||
| res.Assert(c, icmd.Success) | ||
| if !strings.Contains(res.Stdout(), "mail") { | ||
| c.Fatal() |
fuweid
suggested changes
Dec 12, 2018
|
@fuweid I have modified test case, PTAL again. 🍵 ☕️ |
use volume with dr mode, can't copy image's data to parent directory when sub-directory has copied. It causes the volume directory is not empty, so before copy image data, it need to sort mountpoint by the string length of destination directory. Signed-off-by: Rudy Zhang <rudyflyzhang@gmail.com>
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.
Ⅰ. Describe what this PR did
use volume with dr mode, can't copy image's data to parent directory
when sub-directory has copied. It causes the volume directory is not
empty, so before copy image data, it need to sort mountpoint by the
string length of destination directory.
Ⅱ. Does this pull request fix one issue?
NONE
Ⅲ. Why don't you add test cases (unit test/integration test)? (你真的觉得不需要加测试吗？)
add ut:
TestSortMountPointadd integration test:
TestRunCopyDataWithDRⅣ. Describe how to verify it
run test
TestRunCopyDataWithDRpassⅤ. Special notes for reviews
Signed-off-by: Rudy Zhang rudyflyzhang@gmail.com