Discard all data on devicemapper devices when deleting them #3256
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
|
This should help with #3182 |
|
ping @creack |
|
@alexlarsson I'm getting a test failure with this: ++ cd ./graphdriver/devmapper
++ go test -cover -coverprofile /go/src/github.com/dotcloud/docker/bundles/0.7.2-dev/test/coverprofiles/docker-graphdriver-devmapper -ldflags '-X main.GITCOMMIT "d1c
ac07" -X main.VERSION "0.7.2-dev" -w -X github.com/dotcloud/docker/utils.IAMSTATIC true -linkmode external -extldflags "-lpthread -static -Wl,--unresolved-symbols=ig
nore-in-object-files"' -tags netgo -a
--- FAIL: TestDriverRemove (0.00 seconds)
driver_test.go:145: Unexpected keys: map[DmTaskSetCookie:true DmTaskSetTarget:true DmTaskSetAddNode:true DmUdevWait:true]
FAIL
exit status 1
FAIL github.com/dotcloud/docker/graphdriver/devmapper 0.014s
|
|
LGTM |
| @@ -58,3 +58,14 @@ func ioctlBlkGetSize64(fd uintptr) (int64, error) { | |||
| } | |||
| return size, nil | |||
| } | |||
|
|
|||
| func ioctlBlkDiscard(fd uintptr, offset, length uint64) error { | |||
| var r [2]uint64 | |||
There was a problem hiding this comment.
Small detail: you could have used this syntax instead.
var r = [2]uint64{
0: offset,
1: length,
}
|
Tentatively Scheduling for 0.7.6 |
|
@alexlarsson Can you sign the commits, please? |
This works around the fact that deleting a device in a thin pool doesn't discard the free space. Unfortunately even this is not perfect, as it seems discards are respected only for blocks that has never been shared in the thin device code. However, this has been fixed in the upstream kernel device-mapper tree: http://git.kernel.org/cgit/linux/kernel/git/device-mapper/linux-dm.git/commit/?h=for-next&id=0ab1c92ff748b745c1ed7cde31bb37ad2c5f901a When this hits the kernel I belive this will fully return space for removed images/containers to the host FS. For now it only helps partially (which is better than nothing). Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
|
Squashed the commits and signed thm |
|
LGTM |
crosbymichael
added a commit
that referenced
this pull request
Jan 18, 2014
Discard all data on devicemapper devices when deleting them
|
How can i determine if my docker version holds this fix? |
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.
This works around the fact that deleting a device in a thin pool
doesn't discard the free space. Unfortunately even this is not perfect,
as it seems discards are respected only for blocks that has never been
shared in the thin device code. However, this has been fixed in the
upstream kernel device-mapper tree:
http://git.kernel.org/cgit/linux/kernel/git/device-mapper/linux-dm.git/commit/?h=for-next&id=0ab1c92ff748b745c1ed7cde31bb37ad2c5f901a
When this hits the kernel I belive this will fully return space
for removed images/containers to the host FS. For now it only
helps partially (which is better than nothing).