Destroy the temporary export layer before removing it

Fix: microsoft#696 Signed-off-by: Pierre Tardy <[email protected]>
TBBle · Feb 11, 2021 · 70082f6 · 70082f6
1 parent 811c3fc
commit 70082f6
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/internal/wclayer/exportlayer.go b/internal/wclayer/exportlayer.go
@@ -101,6 +101,10 @@ func (r *legacyLayerReaderWrapper) Close() (err error) {
 	defer func() { oc.SetSpanStatus(r.s, err) }()
 
 	err = r.legacyLayerReader.Close()
+	// if the layer is not Destroyed at hcs level before removing
+	// we might enter in a race-condition for large containers
+	// which end-up in a hang of the os.RemoveAll() call
+	DestroyLayer(r.ctx, r.root)
 	os.RemoveAll(r.root)
 	return err
 }