Skip to content
This repository was archived by the owner on May 12, 2021. It is now read-only.

tmp: Add tmp.mount to kata-containers.target#564

Merged
jodh-intel merged 1 commit intokata-containers:masterfrom
amshinde:start-tmp-mount-unit
Jun 11, 2019
Merged

tmp: Add tmp.mount to kata-containers.target#564
jodh-intel merged 1 commit intokata-containers:masterfrom
amshinde:start-tmp-mount-unit

Conversation

@amshinde
Copy link
Member

Invoke tmp.mount by adding it to kata-containers.target.
This is not invoked by systemd with current rootfs setup we have
as one of the dependencies for tmp.mount is systemd-remount-fs.service
which depends on /etc/fstab file being present(it is currenty missing)
Instead of adding that file, start the tmp.mount unit by including
it in kata-containers.target

With this and change in os-builder to not delete the tmp.mount unit,
(kata-containers/osbuilder#301) /tmp should now
be writeable for systemd based images.
For initrd this is handled by the agent itself.

Fixes #kata-containers/osbuilder#300

Signed-off-by: Archana Shinde [email protected]

[Unit]
Description=Kata Containers Agent Target
Requires=basic.target
Requires=tmp.mount

Choose a reason for hiding this comment

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

Choose a reason for hiding this comment

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

Ah - and now I find that we did, but we're re-adding it on kata-containers/osbuilder#301 :)

Copy link

@jodh-intel jodh-intel left a comment

Choose a reason for hiding this comment

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

lgtm.

But we need to block on kata-containers/osbuilder#301 so I'll add a dnm label for now...

Copy link
Contributor

@grahamwhaley grahamwhaley left a comment

Choose a reason for hiding this comment

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

lgtm

@grahamwhaley
Copy link
Contributor

I think the CI fixes check is not happy parsing your fixes line. I think we've seen this before eh @jodh-intel - @amshinde , you probably have to have an Issue in this repo to link to.

Fixes #kata-containers/osbuilder#300

@jodh-intel
Copy link

Yep - please just specify Fixes: #XXX (or raise a PR on https://github.com/kata-containers/tests/tree/master/cmd/checkcommits to support the alternative syntax ;)

Invoke tmp.mount by adding it to kata-containers.target.
This is not invoked by systemd with current rootfs setup we have
as one of the dependencies for tmp.mount is systemd-remount-fs.service
which depends on /etc/fstab file being present(it is currenty missing)
Instead of adding that file, start the tmp.mount unit by including
it in kata-containers.target

With this and change in os-builder to not delete the tmp.mount unit,
(kata-containers/osbuilder#301) /tmp should now
be writeable for systemd based images.
For initrd this is handled by the agent itself.

Fixes kata-containers#565

Signed-off-by: Archana Shinde <[email protected]>
@amshinde amshinde force-pushed the start-tmp-mount-unit branch from e445336 to 06a0743 Compare May 31, 2019 17:07
@amshinde
Copy link
Member Author

/test

@codecov
Copy link

codecov bot commented May 31, 2019

Codecov Report

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

@@           Coverage Diff           @@
##           master     #564   +/-   ##
=======================================
  Coverage   50.48%   50.48%           
=======================================
  Files          17       17           
  Lines        2385     2385           
=======================================
  Hits         1204     1204           
  Misses       1025     1025           
  Partials      156      156

@jodh-intel
Copy link

18.04 CI is failing with:

[3] check dmesg logs errors
[3] /tmp/jenkins/workspace/kata-containers-agent-ubuntu-18-04-PR/go/src/github.com/kata-containers/tests/integration/docker/run_test.go:277
[3]   Run to check dmesg log errors
[3]   /tmp/jenkins/workspace/kata-containers-agent-ubuntu-18-04-PR/go/src/github.com/kata-containers/tests/integration/docker/run_test.go:294
[3]     should be empty [It]
[3]     /tmp/jenkins/workspace/kata-containers-agent-ubuntu-18-04-PR/go/src/github.com/kata-containers/tests/integration/docker/run_test.go:295
[3] 
[3]     Expected
[3]         <string>: [    0.931156] systemd[71]: tmp.mount: Failed to execute command: No such file or directory
[3]         [    0.932756] systemd[71]: tmp.mount: Failed at step EXEC spawning /usr/bin/mount: No such file or directory
[3]     to be empty
[3] 
[3]     /tmp/jenkins/workspace/kata-containers-agent-ubuntu-18-04-PR/go/src/github.com/kata-containers/tests/integration/docker/run_test.go:305

@amshinde
Copy link
Member Author

amshinde commented Jun 3, 2019

/test

@amshinde
Copy link
Member Author

amshinde commented Jun 7, 2019

@GabyCT I know the fedora tests were failing the other day. Are the vsocks tests supposed to pass ?

@GabyCT
Copy link
Contributor

GabyCT commented Jun 7, 2019

@amshinde the reason why vsocks is failing is because is using fedora which currently has issues

@amshinde
Copy link
Member Author

@jodh-intel @kata-containers/agent PTAL. I think this can be merged.

@jodh-intel
Copy link

Agreed...

@jodh-intel jodh-intel merged commit 0f8f8f3 into kata-containers:master Jun 11, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants