Cleanup docker tmp dir on start #31741
Conversation
daemon/daemon.go
Outdated
| var tmpDir string | ||
| if tmpDir = os.Getenv("DOCKER_TMPDIR"); tmpDir == "" { | ||
| tmpDir = filepath.Join(rootDir, "tmp") | ||
| os.RemoveAll(tmpDir) |
There was a problem hiding this comment.
We should have the Docker for Mac team have a look as well; IIRC they store other data in this directory, and I don't know if that can be removed; IIRC, we use specific prefixes for partial pulls, and build contexts, so we could be more specific and just remove those directories
In addition, we recently merged a PR for scenarios where docker when running dind (see #31265); which also removed the content instead of the directory itself would that make sense?
There was a problem hiding this comment.
👌 for waiting on D4M (ping @justincormack ?) to have a look. Although, it's a temp directory, nothing is there should be assumed to survive be valid after a restart ;-)
Regarding the second point, I'm not sure I understand. If you remove the directory, you also remove its content.
There was a problem hiding this comment.
second point is for a case where you'd bind mount /var/run/docker/tmp in that case, removing the directory itself would fail
There was a problem hiding this comment.
oh, I see I typed an also sorry, I see the confusion
There was a problem hiding this comment.
@thaJeztah I only delete if the path is /var/lib/docker/tmp though. If the user specified a different path, I let it be.
|
I'm not sure how large the tmpdir would be 😅 , but if it can be large, we could call |
|
@AkihiroSuda mine was 2/3 GB, I'll update the PR with your suggestion :) |
mlaventure
force-pushed
the
cleanup-tmp-on-start
branch
from
f7f47e2
to
84bb85d
Compare
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
mlaventure
force-pushed
the
cleanup-tmp-on-start
branch
from
84bb85d
to
9c451ad
Compare
|
ping @thaJeztah @AkihiroSuda 👼 |
| var tmpDir string | ||
| if tmpDir = os.Getenv("DOCKER_TMPDIR"); tmpDir == "" { | ||
| tmpDir = filepath.Join(rootDir, "tmp") | ||
| newName := tmpDir + "-old" |
There was a problem hiding this comment.
If a daemon crashes before completely removing tmpDir + "-old", the next daemon execution fails to execute os.Rename(tmpDir, tmpDir+"-old"), and hence the old tmpDir + "-old" will be left alone.
So I think we need os.RemoveAll(tmpDir + "-old") here.
There was a problem hiding this comment.
and what if that one fails? ;-)
(backport from moby#31741) Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com> Signed-off-by: Wentao Zhang <zhangwentao234@huawei.com> (cherry-pick from 9c451ad) Conflicts: daemon/daemon.go
Signed-off-by: Kenfe-Mickael Laventure mickael.laventure@gmail.com
--
This should free up some space by removing old build contexts.