Skip to content

Revert "nspawn: remove unnecessary mount option parsing logic"#13173

Merged
yuwata merged 2 commits intosystemd:masterfrom
kinvolk:iaguis/fix-norbind
Jul 25, 2019
Merged

Revert "nspawn: remove unnecessary mount option parsing logic"#13173
yuwata merged 2 commits intosystemd:masterfrom
kinvolk:iaguis/fix-norbind

Conversation

@iaguis
Copy link
Member

@iaguis iaguis commented Jul 24, 2019

This reverts commit 72d967d.

Revert this because it broke the norbind option of the bind flags
because it does bind-mounts unconditionally recursive.

Let's bring the old logic back.

Also, add a test for this.

Fixes: #13170

This reverts commit 72d967d.

Revert this because it broke the `norbind` option of the bind flags
because it does bind-mounts unconditionally recursive.

Let's bring the old logic back.

Fixes: systemd#13170
@iaguis iaguis requested a review from yuwata July 24, 2019 15:18
This regressed so let's add a test to make sure it doesn't happen again.
@iaguis iaguis force-pushed the iaguis/fix-norbind branch from a232306 to 5574181 Compare July 24, 2019 15:20
@yuwata yuwata added the nspawn label Jul 24, 2019
Copy link
Member

@yuwata yuwata left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks.

@yuwata yuwata added the good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed label Jul 24, 2019
@evverx
Copy link
Contributor

evverx commented Jul 24, 2019

@ddstreet @iainlane it seems Ubuntu CI has been unstable today in the sense that some requests (like the one that should have triggered amd64 here) have timed out:
Screenshot 2019-07-24 at 18 55 44

Could you take a look?

@evverx
Copy link
Contributor

evverx commented Jul 24, 2019

In the meantime, I triggered bionic-amd64 manually here.

@ddstreet
Copy link
Contributor

@ddstreet @iainlane it seems Ubuntu CI has been unstable today in the sense that some requests (like the one that should have triggered amd64 here) have timed out:
Screenshot 2019-07-24 at 18 55 44

Could you take a look?

I don't have access to the lab where the Ubuntu CI runs, but there were (and apparently still are) problems in the lab I do have access to. The Canonical infrastructure team is working on it; I don't think there is anything I'm able to do, although it seems like the production lab where Ubuntu CI runs is working better now.

@iainlane
Copy link

iainlane commented Jul 24, 2019

Sorry I'm at Debconf right now and so I don't have very good availability this week. I checked a couple of other recent PRs (#13176 and #13175) which seem to have gone OK - did this resolve itself?

I can see some OSError: [Errno 101] Network is unreachable in the logs which might correspond to this and probably do indicate a transient outage.

@evverx
Copy link
Contributor

evverx commented Jul 24, 2019

@ddstreet @iainlane thank you. To judge from the logs the webhook triggering amd64 last failed at 18:36 yesterday and has been successful since then so it looks like Ubuntu CI is up and running now.

@yuwata
Copy link
Member

yuwata commented Jul 25, 2019

TEST-01-BASIC failure is caused by #13141. Not related.

@yuwata yuwata merged commit 9a4490e into systemd:master Jul 25, 2019
dongsupark pushed a commit to flatcar-archive/coreos-overlay that referenced this pull request Jul 25, 2019
There was a bug w.r.t. the `norbind` option of bind mount options
in systemd, so we need backport the upstream fix to v241.

See systemd/systemd#13173
dongsupark pushed a commit to flatcar-archive/coreos-overlay that referenced this pull request Jul 25, 2019
There was a bug w.r.t. the `norbind` option of bind mount options
in systemd, so we need backport the upstream fix to v241.

See systemd/systemd#13173
agermain added a commit to agermain/rkt that referenced this pull request Aug 7, 2019
As CoreOS Container Linux is in maintenance mode
(coreos/bugs#2559 (comment)) and won't
see many new features and we need some systemd bugfixes that rkt needs
(specifically systemd/systemd#13173 and
systemd/systemd#12860) let's switch to Flatcar Linux.

Flatcar Linux us a drop-in replacement of Container Linux and its Edge channel
contains the needed bugfixes.

To do that, we need to change the GPG key to verify the images through the script.
agermain added a commit to agermain/rkt that referenced this pull request Aug 7, 2019
As CoreOS Container Linux is in maintenance mode
(coreos/bugs#2559 (comment)) and won't
see many new features and we need some systemd bugfixes that rkt needs
(specifically systemd/systemd#13173 and
systemd/systemd#12860) let's switch to Flatcar Linux.

Flatcar Linux us a drop-in replacement of Container Linux and its Edge channel
contains the needed bugfixes.

To do that, we need to change the GPG key to verify the images through the script.
agermain added a commit to agermain/rkt that referenced this pull request Aug 9, 2019
As CoreOS Container Linux is in maintenance mode
(coreos/bugs#2559 (comment)) and won't
see many new features and we need some systemd bugfixes that rkt needs
(specifically systemd/systemd#13173 and
systemd/systemd#12860) let's switch to Flatcar Linux.

Flatcar Linux us a drop-in replacement of Container Linux and its Edge channel
contains the needed bugfixes.

To do that, we need to change the GPG key to verify the images through the script.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed nspawn

Development

Successfully merging this pull request may close these issues.

nspawn: regression in non-recursive mounts

5 participants