Skip to content

Remove and create workdir if state dir does not exist#2575

Merged
dmcgowan merged 1 commit intocontainerd:masterfrom
crosbymichael:workdir
Aug 27, 2018
Merged

Remove and create workdir if state dir does not exist#2575
dmcgowan merged 1 commit intocontainerd:masterfrom
crosbymichael:workdir

Conversation

@crosbymichael
Copy link
Copy Markdown
Member

This is the case where the work dir could still exist if a machine
reboots, reseting the state dir. On container creation, we should just
clear out the work dir.

Signed-off-by: Michael Crosby [email protected]

@crosbymichael crosbymichael added this to the 1.2 milestone Aug 24, 2018
Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@codecov-io
Copy link
Copy Markdown

Codecov Report

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

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #2575   +/-   ##
=======================================
  Coverage   44.59%   44.59%           
=======================================
  Files          95       95           
  Lines       10007    10007           
=======================================
  Hits         4463     4463           
  Misses       4822     4822           
  Partials      722      722
Flag Coverage Δ
#linux 48.4% <ø> (ø) ⬆️
#windows 41.54% <ø> (ø) ⬆️

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 37a6a91...81d50f3. Read the comment docs.

Comment thread runtime/v2/bundle.go Outdated
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

paths was already initialized with this, is paths supposed to start off empty now?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

empty

This is the case where the work dir could still exist if a machine
reboots, reseting the state dir.  On container creation, we should just
clear out the work dir.

Signed-off-by: Michael Crosby <[email protected]>
Copy link
Copy Markdown
Member

@dmcgowan dmcgowan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #2575 into master will decrease coverage by 3.14%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2575      +/-   ##
==========================================
- Coverage   44.13%   40.98%   -3.15%     
==========================================
  Files          96       68      -28     
  Lines       10120     8347    -1773     
==========================================
- Hits         4466     3421    -1045     
+ Misses       4933     4382     -551     
+ Partials      721      544     -177
Flag Coverage Δ
#linux ?
#windows 40.98% <ø> (-0.04%) ⬇️
Impacted Files Coverage Δ
snapshots/native/native.go 1.78% <0%> (-41.52%) ⬇️
archive/tar.go 16.99% <0%> (-26.15%) ⬇️
metadata/snapshot.go 21.53% <0%> (-24.28%) ⬇️
oci/spec_opts.go 60.24% <0%> (-4.82%) ⬇️
gc/scheduler/scheduler.go 66.34% <0%> (-2.41%) ⬇️
content/local/writer.go 51.57% <0%> (-1.06%) ⬇️
mount/temp_unix.go
sys/reaper_linux.go
services/server/server_linux.go
sys/env.go
... and 24 more

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 0a3f87e...ac78a5b. Read the comment docs.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants