From ac821f2446628a9151587038f1d377f57985a452 Mon Sep 17 00:00:00 2001 From: unclejack Date: Sat, 19 Oct 2013 04:17:00 +0300 Subject: [PATCH] fix layer size computation: handle hard links This change makes docker compute layer size correctly. The old code isn't taking hard links into account. Layers could seem like they're up to 1-1.5x larger than they really were. --- image.go | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/image.go b/image.go index c600273c1..f2d1b3e7e 100644 --- a/image.go +++ b/image.go @@ -16,6 +16,7 @@ import ( "path/filepath" "strconv" "strings" + "syscall" "time" ) @@ -114,10 +115,22 @@ func StoreImage(img *Image, jsonData []byte, layerData archive.Archive, root str func StoreSize(img *Image, root string) error { layer := layerPath(root) + data := make(map[uint64]bool) var totalSize int64 = 0 filepath.Walk(layer, func(path string, fileInfo os.FileInfo, err error) error { - totalSize += fileInfo.Size() + 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 + + totalSize += size return nil }) img.Size = totalSize