stage1: propagate app exit code to rkt exit code #2198

iaguis · 2016-02-19T14:48:10Z

If the version of the systemd running in stage1 is >=v227, the command
"systemctl exit STATUS" will set the exit status of the container. See
https://lists.freedesktop.org/archives/systemd-devel/2015-October/034509.html:

The "systemctl exit" command now optionally takes an
additional parameter that sets the exit code to return from
the systemd manager when exiting. This is only relevant when
running the systemd user instance, or when running the
system instance in a container.

If not, we will continue with the previous logic, so we can merge this now
and benefit from it when we actually update to v229.

Closes #1783

krnowak · 2016-02-19T14:54:49Z

CHANGELOG.md


+#### New features and UX changes
+
+- Propagate app exit status to rkt's exit status ([#HEHE](https://github.com/coreos/rkt/pull/HEHE).


Now you know.

alban · 2016-02-19T16:25:26Z

stage1/reaper/reaper.sh

    echo "${status#*=}" > "/rkt/status/$app"
+    if [ "${status#*=}" != 0 ] ; then
+        ${SYSCTL} exit ${status#*=}
+    fi


Can you add a comment?

# The command "systemctl exit $status" is available since systemd-v227. On older # systemd, the command will fail and rkt will just exit with return code 0.

iaguis · 2016-02-22T12:40:18Z

Updated.

krnowak · 2016-02-22T13:26:50Z

tests/rkt_tests.go

 	err := child.Wait()
+	status := getExitStatus(err)
+	if status != expectedStatus {
+		t.Fatalf("rkt terminated with unexpected status %d, expected %d\nOutput:\n%s", status, expectedStatus, child.Collect())


I don't think there is a point in running Collect() here. For this to work, Capture() needs to be called first. So this will most likely print no output at all.

Hm, it looks like it is following what is being done in this function below. Nevermind then.

krnowak · 2016-02-22T14:35:25Z

Will this work with kvm flavor (assuming that there is systemd 229)?

alban · 2016-02-22T14:37:32Z

@krnowak I assume the command systemctl exit will fail when systemd (pid1) is not in a container and it will just continue stopping the VM without problems, but I have not tested it...

iaguis · 2016-02-22T14:59:51Z

We'll recheck when we update to v229.

Any other concerns?

alban · 2016-02-22T15:01:58Z

tests/rkt_exit_test.go

+	// Currently we have systemd v222 in the coreos flavor which doesn't
+	// include the exit status propagation code.
+	// TODO(iaguis): we should expect 5 as the exit status when we update to v229
+	waitOrFail(t, child, 0)


Would this break tests with tests/aws.sh on Fedora-Rawhide with the host flavor (it should have the last systemd)?

I'd like if tests/aws.sh could test the host flavor on all versions of Fedora... this would require something like...?

if systemdVersion() >= 227 { waitOrFail(t, child, 5) } else { waitOrFail(t, child, 0) }

That would be nice but detecting the stage1 systemd version from the tests seems a bit overkill...

iaguis · 2016-02-22T17:39:48Z

This is not finished yet, it works with the src flavor because we copy all the generated unit files to stage1 but it doesn't work otherwise.

I need to figure out which services/targets are needed.

iaguis · 2016-02-23T12:21:58Z

PTAL.

krnowak · 2016-02-23T12:34:25Z

Just one question otherwise LFAD (or fixup the commit message) - the exit.target unit file is for systemctl exit, right?

iaguis · 2016-02-23T12:48:15Z

Just one question otherwise LFAD (or fixup the commit message) - the exit.target unit file is for systemctl exit, right?

Yes, systemctl exit activates exit.target so we need it.

alban · 2016-02-23T14:26:24Z

stage1/init/common/pod.go


+	if err = writeShutdownService(p); err != nil {
+		return errwrap.Wrap(errors.New("failed to write shutdown service"), err)
+	}


Shouldn't this be in PodToSystemd() instead of appToSystemd()? In a pod with several apps, the shutdown service should still be written only one time.

You're very right, no need to write it over and over again.

If the version of the systemd running in stage1 is >=v227, the command "systemctl exit STATUS" will set the exit status of the container. See https://lists.freedesktop.org/archives/systemd-devel/2015-October/034509.html: * The "systemctl exit" command now optionally takes an additional parameter that sets the exit code to return from the systemd manager when exiting. This is only relevant when running the systemd user instance, or when running the system instance in a container. If not, we will continue with the previous logic, so we can merge this now and benefit from it when we actually update to v229.

Modify functions that wait for rkt to expect a particular exit code instead of only success and fail.

Depending on stage1's systemd version, we call "halt" or "exit". In the host flavor, we need to parse the output of "systemctl --version" because there's not systemd version information in stage1.

alban · 2016-02-23T15:27:41Z

LGTM

stage1: propagate app exit code to rkt exit code

yifan-gu · 2016-02-24T01:28:23Z

mikel from samsung is hitting this issue today when he has a service file that requires rkt run to restart on failure.

So when will we import v229?

iaguis added component/stage1 area/usability needs/review priority/P1 technology/systemd labels Feb 19, 2016

iaguis added this to the v1.1.0 milestone Feb 19, 2016

krnowak reviewed Feb 19, 2016
View reviewed changes

iaguis force-pushed the iaguis/exit-code branch from 5c2e16b to 52d36b4 Compare February 19, 2016 14:57

alban reviewed Feb 19, 2016
View reviewed changes

iaguis mentioned this pull request Feb 22, 2016

stage1: propagate app exit code to rkt exit code #2201

Closed

iaguis force-pushed the iaguis/exit-code branch from 52d36b4 to 6e8f834 Compare February 22, 2016 12:40

krnowak reviewed Feb 22, 2016
View reviewed changes

iaguis force-pushed the iaguis/exit-code branch 3 times, most recently from 20c2312 to 616a03c Compare February 22, 2016 14:14

alban assigned iaguis Feb 22, 2016

alban reviewed Feb 22, 2016
View reviewed changes

iaguis force-pushed the iaguis/exit-code branch from a8dd956 to 616a03c Compare February 22, 2016 17:38

iaguis added needs/some-changes and removed needs/review labels Feb 22, 2016

iaguis force-pushed the iaguis/exit-code branch from 8eb9348 to 9e6e9d2 Compare February 23, 2016 11:38

iaguis added needs/review and removed needs/some-changes labels Feb 23, 2016

alban reviewed Feb 23, 2016
View reviewed changes

iaguis force-pushed the iaguis/exit-code branch from 9e6e9d2 to 977396d Compare February 23, 2016 14:38

iaguis added 5 commits February 23, 2016 15:38

Documentation: add note about exit status propagation

b9c3a67

CHANGELOG: add exit status propagation

b6f61a9

functional tests: check rkt exit code

beb42d4

Modify functions that wait for rkt to expect a particular exit code instead of only success and fail.

stage1: add exit target

e1e1d5b

iaguis force-pushed the iaguis/exit-code branch from 977396d to 8671c92 Compare February 23, 2016 14:38

stage1: generate shutdown.service programatically

a65b232

Depending on stage1's systemd version, we call "halt" or "exit". In the host flavor, we need to parse the output of "systemctl --version" because there's not systemd version information in stage1.

iaguis force-pushed the iaguis/exit-code branch from 8671c92 to a65b232 Compare February 23, 2016 14:39

alban added reviewed/lgtm and removed needs/review labels Feb 23, 2016

iaguis added a commit that referenced this pull request Feb 23, 2016

Merge pull request #2198 from kinvolk/iaguis/exit-code

765bb2a

stage1: propagate app exit code to rkt exit code

iaguis merged commit 765bb2a into rkt:master Feb 23, 2016

alban mentioned this pull request Feb 23, 2016

rkt run: exit status not propagated from apps #1460

Closed

alban mentioned this pull request Feb 25, 2016

release v1.1.0 #2227

Merged

alban mentioned this pull request May 25, 2016

stage1: restrict access to procfs and sysfs paths #2683

Merged


		#### New features and UX changes

		- Propagate app exit status to rkt's exit status ([#HEHE](https://github.com/coreos/rkt/pull/HEHE).

Uh oh!

stage1: propagate app exit code to rkt exit code #2198

stage1: propagate app exit code to rkt exit code #2198

Uh oh!

Conversation

iaguis commented Feb 19, 2016

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

iaguis commented Feb 22, 2016

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

krnowak commented Feb 22, 2016

Uh oh!

alban commented Feb 22, 2016

Uh oh!

iaguis commented Feb 22, 2016

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

iaguis commented Feb 22, 2016

Uh oh!

iaguis commented Feb 23, 2016

Uh oh!

krnowak commented Feb 23, 2016

Uh oh!

iaguis commented Feb 23, 2016

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

alban commented Feb 23, 2016

Uh oh!

yifan-gu commented Feb 24, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants