Support sighup reload configuration files #7311

QiWang19 · 2020-08-12T23:12:22Z

Support podman service sighup reload configuration files(containers.conf, registries.conf, storage.conf).

mheon · 2020-08-13T00:52:31Z

This also needs to reload the Libpod state to account for potential changed storage/database paths. We also potentially loaded a fresh database, so we need to re-do the Libpod initialization process (checking if the alive file is created and refreshing the state + creating it if it is not present).

…

On Wed, Aug 12, 2020 at 7:12 PM OpenShift CI Robot ***@***.***> wrote: [APPROVALNOTIFIER] This PR is *NOT APPROVED* This pull-request has been approved by: *QiWang19 <#7311#>* To complete the pull request process <https://git.k8s.io/community/contributors/guide/owners.md#the-code-review-process>, please assign *rhatdan* You can assign the PR to them by writing /assign @rhatdan in a comment when ready. The full list of commands accepted by this bot can be found here <https://go.k8s.io/bot-commands?repo=containers%2Fpodman>. Needs approval from an approver in each of these files: - *OWNERS <https://github.com/containers/podman/blob/master/OWNERS>* Approvers can indicate their approval by writing /approve in a comment Approvers can cancel approval by writing /approve cancel in a comment — You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub <#7311 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AB3AOCB4ILHJHDRX2DIQZP3SAMOW3ANCNFSM4P5NX4XQ> .

mheon · 2020-08-13T00:53:29Z

Also, the configured and default OCI runtimes may have changed, so we need to refresh those as well.

…

On Wed, Aug 12, 2020 at 8:52 PM Matthew Heon ***@***.***> wrote: This also needs to reload the Libpod state to account for potential changed storage/database paths. We also potentially loaded a fresh database, so we need to re-do the Libpod initialization process (checking if the alive file is created and refreshing the state + creating it if it is not present). On Wed, Aug 12, 2020 at 7:12 PM OpenShift CI Robot < ***@***.***> wrote: > [APPROVALNOTIFIER] This PR is *NOT APPROVED* > > This pull-request has been approved by: *QiWang19 > <#7311#>* > To complete the pull request process > <https://git.k8s.io/community/contributors/guide/owners.md#the-code-review-process>, > please assign *rhatdan* > You can assign the PR to them by writing /assign @rhatdan in a comment > when ready. > > The full list of commands accepted by this bot can be found here > <https://go.k8s.io/bot-commands?repo=containers%2Fpodman>. > Needs approval from an approver in each of these files: > > - *OWNERS <https://github.com/containers/podman/blob/master/OWNERS>* > > Approvers can indicate their approval by writing /approve in a comment > Approvers can cancel approval by writing /approve cancel in a comment > > — > You are receiving this because you are subscribed to this thread. > Reply to this email directly, view it on GitHub > <#7311 (comment)>, > or unsubscribe > <https://github.com/notifications/unsubscribe-auth/AB3AOCB4ILHJHDRX2DIQZP3SAMOW3ANCNFSM4P5NX4XQ> > . >

vrothberg

Nice work, @QiWang19!

Only minor nits

vrothberg · 2020-08-13T08:38:04Z

cmd/podman/system/service_abi.go

+	go func() {
+		for {
+			// Block until the signal is received
+			<-ch


Could we add a debug message here as well? This could come in handy for support.

vrothberg · 2020-08-13T08:40:49Z

cmd/podman/utils/signals_linux.go

+
+// Platform specific signal synonyms
+var (
+	Hup os.Signal = unix.SIGHUP


Suggested change

Hup os.Signal = unix.SIGHUP

SIGHUP os.Signal = unix.SIGHUP

Might be easier to understand when the identifier is consistent.

vrothberg · 2020-08-13T08:41:45Z

libpod/runtime.go

@@ -816,3 +818,48 @@ func (r *Runtime) mergeDBConfig(dbConfig *DBConfig) {
 func (r *Runtime) EnableLabeling() bool {
 	return r.config.Containers.EnableLabeling
 }
+
+func (r *Runtime) Reload() error {


Please add a comment.

TomSweeneyRedHat

LGTM once @vrothberg 's concerns are addressed.

Support podman service sighup reload configuration files(containers.conf, registries.conf, storage.conf). Signed-off-by: Qi Wang <qiwan@redhat.com>

rhatdan · 2020-08-18T18:46:32Z

/approve
/lgtm
/hold

openshift-ci-robot · 2020-08-18T18:46:37Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: QiWang19, rhatdan

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

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [rhatdan]

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

rhatdan · 2020-08-19T10:02:14Z

/hold cancel

mheon · 2020-08-19T13:43:46Z

Woah woah woah. Were my comments here ignored? This does not work if anything related to the OCI runtime or storage paths changed.

QiWang19 · 2020-08-19T14:39:42Z

Can I have more details about what is specifically the LIbpod state and storage paths that need to update?
Sorry missed that in this PR, I can set up another PR to fix it.

mheon · 2020-08-19T15:02:23Z

We need to:

Reload the Libpod database to account for potential changed paths
Perform the Libpod initialization process (checking the Alive file, creating it if it does not exist, refreshing containers if it does not exist)
Load new OCI runtimes from the configuration file and set a new default OCI runtime

QiWang19 · 2020-08-23T19:51:29Z

We need to:

* Reload the Libpod database to account for potential changed paths

* Perform the Libpod initialization process (checking the Alive file, creating it if it does not exist, refreshing containers if it does not exist)

* Load new OCI runtimes from the configuration file and set a new default OCI runtime

Does this just need to call makeruntime

podman/libpod/runtime.go

Line 241 in 80d2c01

func makeRuntime(ctx context.Context, runtime *Runtime) (retErr error) {

after reloading the configuration files?

openshift-ci-robot requested review from mrunalp and vrothberg August 12, 2020 23:12

QiWang19 linked an issue Aug 12, 2020 that may be closed by this pull request

podman-system-service: support sighup reload #6255

Closed

vrothberg reviewed Aug 13, 2020

View reviewed changes

TomSweeneyRedHat mentioned this pull request Aug 13, 2020

podman.service: use sdnotify #7312

Merged

TomSweeneyRedHat reviewed Aug 13, 2020

View reviewed changes

QiWang19 force-pushed the service-reload branch 2 times, most recently from 734676f to 01d5695 Compare August 17, 2020 14:22

Support sighup reload configuration files

5b02b69

Support podman service sighup reload configuration files(containers.conf, registries.conf, storage.conf). Signed-off-by: Qi Wang <qiwan@redhat.com>

QiWang19 force-pushed the service-reload branch from 01d5695 to 5b02b69 Compare August 18, 2020 18:42

openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 18, 2020

openshift-ci-robot assigned rhatdan Aug 18, 2020

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 18, 2020

openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 18, 2020

openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 19, 2020

openshift-merge-robot merged commit 7e2a1b3 into containers:master Aug 19, 2020

QiWang19 deleted the service-reload branch August 21, 2020 20:52

github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 24, 2023

github-actions bot locked as resolved and limited conversation to collaborators Sep 24, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support sighup reload configuration files #7311

Support sighup reload configuration files #7311

QiWang19 commented Aug 12, 2020

mheon commented Aug 13, 2020 via email

mheon commented Aug 13, 2020 via email

vrothberg left a comment

vrothberg Aug 13, 2020

vrothberg Aug 13, 2020

vrothberg Aug 13, 2020

TomSweeneyRedHat left a comment

rhatdan commented Aug 18, 2020

openshift-ci-robot commented Aug 18, 2020

rhatdan commented Aug 19, 2020

mheon commented Aug 19, 2020

QiWang19 commented Aug 19, 2020

mheon commented Aug 19, 2020

QiWang19 commented Aug 23, 2020

Support sighup reload configuration files #7311

Support sighup reload configuration files #7311

Conversation

QiWang19 commented Aug 12, 2020

mheon commented Aug 13, 2020 via email

mheon commented Aug 13, 2020 via email

vrothberg left a comment

Choose a reason for hiding this comment

vrothberg Aug 13, 2020

Choose a reason for hiding this comment

vrothberg Aug 13, 2020

Choose a reason for hiding this comment

vrothberg Aug 13, 2020

Choose a reason for hiding this comment

TomSweeneyRedHat left a comment

Choose a reason for hiding this comment

rhatdan commented Aug 18, 2020

openshift-ci-robot commented Aug 18, 2020

rhatdan commented Aug 19, 2020

mheon commented Aug 19, 2020

QiWang19 commented Aug 19, 2020

mheon commented Aug 19, 2020

QiWang19 commented Aug 23, 2020