Skip to content

Start containerd ALAP with respect to cloud-init's boot stages#113

Merged
k8s-ci-robot merged 1 commit intokubernetes-sigs:masterfrom
figo:master
Dec 21, 2019
Merged

Start containerd ALAP with respect to cloud-init's boot stages#113
k8s-ci-robot merged 1 commit intokubernetes-sigs:masterfrom
figo:master

Conversation

@figo
Copy link
Copy Markdown
Contributor

@figo figo commented Dec 20, 2019

Add drop in unit configure file for containerd, Start
containerd as late as possible with respect to cloud-init's
boot stages. This ensures that cloud-init modules such as
write-files may be used to configure containerd prior to it
starting

Tested with change.
Run systemd-analyze critical-chain, got

multi-user.target @47.324s
`-vmtoolsd.service @47.324s
  `-cloud-final.service @4.645s +42.677s
    `-containerd.service @4.642s +1ms
      `-cloud-config.service @4.224s +417ms
        `-network-online.target @4.224s
          `-cloud-init.service @3.456s +765ms
            `-systemd-networkd-wait-online.service @1.767s +1.688s
              `-systemd-networkd.service @1.756s +10ms
                `-network-pre.target @1.756s
                  `-cloud-init-local.service @420ms +1.335s
                    `-basic.target @412ms

Run systemctl show containerd.service
make sure, service settings exist

Signed-off-by: Hui Luo [email protected]

Thanks to @akutz @detiber for the great help.

This is to fix #1714

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Dec 20, 2019
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: figo

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 20, 2019
@figo
Copy link
Copy Markdown
Contributor Author

figo commented Dec 20, 2019

/assign @akutz @detiber

@detiber
Copy link
Copy Markdown
Contributor

detiber commented Dec 20, 2019

lgtm, but I think @akutz was suggesting two separate drop-in files, not sure if that is a blocker from his perspective.

@detiber
Copy link
Copy Markdown
Contributor

detiber commented Dec 20, 2019

/cc @dims @ncdc for visibility wrt the oom settings.

@detiber
Copy link
Copy Markdown
Contributor

detiber commented Dec 20, 2019

This is to fix #1714

I think this should link to kubernetes-sigs/cluster-api#1714

@figo
Copy link
Copy Markdown
Contributor Author

figo commented Dec 20, 2019

lgtm, but I think @akutz was suggesting two separate drop-in files, not sure if that is a blocker from his perspective.

Thanks, i don't have strong opinion, use one drop-in file for simplicity. cc @akutz

@detiber
Copy link
Copy Markdown
Contributor

detiber commented Dec 20, 2019

This would also fix #112

@dims
Copy link
Copy Markdown
Member

dims commented Dec 20, 2019

LGTM 👍

@akutz
Copy link
Copy Markdown
Contributor

akutz commented Dec 20, 2019

/lgtm
/hold

I don't view it as a blocker. I just like keeping the two changes organized. One thing I would like fixed if @figo has time is to reintroduce the comments I had written. The current version only has the remarks about the cloud-config service, not cloud-final.

Hui, if you're in a hurry, remove the hold and we can address the comments in a follow-up. I'm good either way for now. Thanks again!

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Dec 20, 2019
@akutz
Copy link
Copy Markdown
Contributor

akutz commented Dec 20, 2019

Thanks, i don't have strong opinion, use one drop-in file for simplicity.

FWIW, the purpose of drop-ins is to keep them small and discreet, hence the reason for the original two instead of one. But again, I don't feel strongly about it.

Add drop in unit configure file for containerd, Start
containerd as late as possible with respect to cloud-init's
boot stages. This ensures that cloud-init modules such as
write-files may be used to configure containerd prior to it
starting

Signed-off-by: Hui Luo <[email protected]>
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 21, 2019
@akutz
Copy link
Copy Markdown
Contributor

akutz commented Dec 21, 2019

/hold cancel
/lgtm

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Dec 21, 2019
@k8s-ci-robot k8s-ci-robot merged commit d2d644e into kubernetes-sigs:master Dec 21, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants