From 78c843c8eff64da5e12725bdb111b18e51d82606 Mon Sep 17 00:00:00 2001 From: unclejack Date: Tue, 19 Nov 2013 00:13:09 +0200 Subject: [PATCH] fix container size computation: handle hard links This change makes docker compute container size correctly. The old code isn't taking hard links into account. Containers could seem like they're up to 1-1.5x larger than they really were. --- container.go | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/container.go b/container.go index 9dac34544..0686d2f5a 100644 --- a/container.go +++ b/container.go @@ -1559,20 +1559,46 @@ func validateID(id string) error { // GetSize, return real size, virtual size func (container *Container) GetSize() (int64, int64) { var sizeRw, sizeRootfs int64 + data := make(map[uint64]bool) filepath.Walk(container.rwPath(), func(path string, fileInfo os.FileInfo, err error) error { - if fileInfo != nil { - sizeRw += fileInfo.Size() + if fileInfo == nil { + return nil } + size := fileInfo.Size() + if size == 0 { + return nil + } + + inode := fileInfo.Sys().(*syscall.Stat_t).Ino + if _, entryExists := data[inode]; entryExists { + return nil + } + data[inode] = false + + sizeRw += size return nil }) + data = make(map[uint64]bool) _, err := os.Stat(container.RootfsPath()) if err == nil { filepath.Walk(container.RootfsPath(), func(path string, fileInfo os.FileInfo, err error) error { - if fileInfo != nil { - sizeRootfs += fileInfo.Size() + if fileInfo == nil { + return nil } + size := fileInfo.Size() + if size == 0 { + return nil + } + + inode := fileInfo.Sys().(*syscall.Stat_t).Ino + if _, entryExists := data[inode]; entryExists { + return nil + } + data[inode] = false + + sizeRootfs += size return nil }) }