Skip to content

archive/diff: fix consecutive directory removal bug#2126

Merged
crosbymichael merged 2 commits intocontainerd:masterfrom
dmcgowan:fix-2119
Feb 12, 2018
Merged

archive/diff: fix consecutive directory removal bug#2126
crosbymichael merged 2 commits intocontainerd:masterfrom
dmcgowan:fix-2119

Conversation

@dmcgowan
Copy link
Copy Markdown
Member

Ensures the remove directory marker gets updated when a new directly delete is found right after an old one. This was causing a bug where deletion events were being sent under a removed directory, causing the archiver to error when attempting to include the parent of a removed file.

fixes #2119

Picks up fix for consecutive directory deletion

Signed-off-by: Derek McGowan <[email protected]>
@stevvooe
Copy link
Copy Markdown
Member

Lgtm

@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #2126 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #2126   +/-   ##
=======================================
  Coverage   45.53%   45.53%           
=======================================
  Files          80       80           
  Lines        8726     8726           
=======================================
  Hits         3973     3973           
  Misses       4107     4107           
  Partials      646      646
Flag Coverage Δ
#linux 50.24% <ø> (ø) ⬆️
#windows 41.09% <ø> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7022a19...ca3eb74. Read the comment docs.

@crosbymichael
Copy link
Copy Markdown
Member

LGTM

@crosbymichael crosbymichael merged commit efb813f into containerd:master Feb 12, 2018
@dmcgowan dmcgowan deleted the fix-2119 branch June 5, 2018 18:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

differ fails after latest whiteout parent directories fix

4 participants