Skip to content

Comments

Migrate to Type=notify#866

Merged
dongsupark merged 2 commits intoflatcar:mainfrom
krishjainx:patch-2
Jun 15, 2023
Merged

Migrate to Type=notify#866
dongsupark merged 2 commits intoflatcar:mainfrom
krishjainx:patch-2

Conversation

@krishjainx
Copy link
Contributor

@krishjainx krishjainx commented Jun 1, 2023

[containerd] Migrate to Type=notify in containerd.service

Race condition arises when the containerd service unit assumes services are ready as soon as they start running, rather than when they can actually accept socket requests. To rectify this, changing the unit to Type=notify is required, utilizing the existing containerd support for sd_notify call after socket setup.

References:

CI: http://jenkins.infra.kinvolk.io:8080/job/container/job/packages_all_arches/1993/cldsv/

@jepio
Copy link
Member

jepio commented Jun 2, 2023

Can you check git log sdk_container/src/third_party/coreos-overlay/app-emulation/containerd and then update the commit message to specify the package name in the first line and have a bit more information in the commit body about what is being done and why. Thanks

@github-actions
Copy link

github-actions bot commented Jun 2, 2023

Build action triggered: https://github.com/flatcar/scripts/actions/runs/5280867453

@krishjainx
Copy link
Contributor Author

@jepio Does this work?

@jepio
Copy link
Member

jepio commented Jun 2, 2023

It's better, but if you look at the git log you'll see that most historical commit messages have a summary line starting with:
app-emulation/containerd and we wrap the text in the body at <80 columns.

@krishjainx
Copy link
Contributor Author

This resolves it @jepio

@dongsupark dongsupark added the main label Jun 2, 2023
@krishjainx krishjainx temporarily deployed to development June 2, 2023 14:49 — with Image GitHub Actions Inactive
@krishjainx
Copy link
Contributor Author

@dongsupark Unsure why Kola tests fail

@dongsupark
Copy link
Member

@dongsupark Unsure why Kola tests fail

From a quick look, CI failed with 17 different failures. Those consist of 3 different types:

  • coreos.update.badusr

    • It is expected, an already known issue, please ignore it. That has been always a source of flaky tests, so the kola tests are already trying to retry 5 times at max to get that done. That should be enough mostly in case of (our internal) Jenkins CI runs. With the Github Actions CI, however, somehow it is not enough.
  • kubeadm.v1.24.14.calico.cgroupv1.base, etc

    • Looks like flaky tests, That seems to sometimes happen in other PRs as well. Have not looked into its detail.
  • devcontainer.systemd-nspawn, devcontainer.docker

    • error: pathspec 'c326eab136' did not match any file(s) known to git
    • It is interesting, because that failure seems to happen only when you ran the tests. (Same as Update commonconfig-6.1 to build kernel with TLS module #865) I am wondering if it has something to do with the dev container trying to clone the default flatcar/scripts git repo, and trying to find a wrong commit c326eab, which exists only in your cloned repo.

@krishjainx
Copy link
Contributor Author

I think that would be it, yes

Copy link
Member

@pothos pothos left a comment

Choose a reason for hiding this comment

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

Looks good, I just wonder why we don't have tests
Edit: Ah, found something, I could go to Details and approve something there.

@pothos
Copy link
Member

pothos commented Jun 14, 2023

This needs a rebase. The tests looked good, the failed devcontainer test just has problems because this PR is from another repo.

@krishjainx krishjainx closed this Jun 14, 2023
@krishjainx
Copy link
Contributor Author

krishjainx commented Jun 14, 2023

@pothos Unsure why it says that there are 0 commits here: This is my commit c462c41

@jepio
Copy link
Member

jepio commented Jun 14, 2023

You still need to rebase c462c41 onto current main, and push to patch-2 branch. The ebuild location has also changed (app-containers/containerd now)

@krishjainx krishjainx reopened this Jun 14, 2023
@krishjainx
Copy link
Contributor Author

Good? 01d8eda

@krishjainx krishjainx temporarily deployed to development June 14, 2023 11:11 — with Image GitHub Actions Inactive
@jepio
Copy link
Member

jepio commented Jun 15, 2023

The commit message still says "app-emulation", that should be "app-containers" too

Race condition arises when the containerd service unit assumes services are
ready as soon as they start running, rather than when they can actually accept
socket requests. To rectify this, changing the unit to Type=notify is required,
utilizing the existing containerd support for sd_notify call after socket setup.
In addition to this, the configuration is more aligned with upstream.

https://www.freedesktop.org/software/systemd/man/systemd.service.html#Type=
@dongsupark
Copy link
Member

@dongsupark
Copy link
Member

Jenkins CI passed.

A changelog file is missing here as well, like the other one.

@krishjainx
Copy link
Contributor Author

Added

Copy link
Member

@dongsupark dongsupark left a comment

Choose a reason for hiding this comment

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

Thanks!

@dongsupark dongsupark merged commit 54eb0f2 into flatcar:main Jun 15, 2023
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