0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make sure that layers are removed from layerdb after succefull layer removal

Browse source 
Signed-off-by: Olli Janatuinen <olli.janatuinen@gmail.com>
This commit is contained in:
Olli Janatuinen 2019-11-28 15:13:04 +02:00
parent 3152f94362
commit 446fe7f263
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
integration/image/remove_unix_test.go
View file

@ -110,4 +110,10 @@ func TestRemoveImageGarbageCollector(t *testing.T) {
i.Cleanup()
_, err = os.Stat(data["UpperDir"])
assert.Assert(t, os.IsNotExist(err))
// Make sure that removal pending layers does not exist on layerdb either
layerdbItems, _ := ioutil.ReadDir(filepath.Join(d.RootDir(), "/image/overlay2/layerdb/sha256"))
for _, folder := range layerdbItems {
assert.Equal(t, false, strings.HasSuffix(folder.Name(), "-removing"))
}
}

2
layer/filestore.go
View file

@ -403,7 +403,7 @@ func (fms *fileMetadataStore) Remove(layer ChainID, cache string) error {
return err
}
for _, f := range files {
if !strings.HasSuffix(f.Name(), "-removing") || !strings.HasPrefix(f.Name(), dgst.String()) {
if !strings.HasSuffix(f.Name(), "-removing") || !strings.HasPrefix(f.Name(), dgst.Encoded()) {
continue
}

4
layer/layer_store.go
View file

@ -419,11 +419,11 @@ func (ls *layerStore) Map() map[ChainID]Layer {
func (ls *layerStore) deleteLayer(layer *roLayer, metadata *Metadata) error {
// Rename layer digest folder first so we detect orphan layer(s)
// if ls.driver.Remove fails
dir := ls.store.getLayerDirectory(layer.chainID)
var dir string
for {
dgst := digest.Digest(layer.chainID)
tmpID := fmt.Sprintf("%s-%s-removing", dgst.Hex(), stringid.GenerateRandomID())
dir := filepath.Join(ls.store.root, string(dgst.Algorithm()), tmpID)
dir = filepath.Join(ls.store.root, string(dgst.Algorithm()), tmpID)
err := os.Rename(ls.store.getLayerDirectory(layer.chainID), dir)
if os.IsExist(err) {
continue