Skip to content

[release/1.0] cherry-pick: Ignore modprobe failures in ExecStartPre (systemd unit)#2777

Merged
crosbymichael merged 1 commit intocontainerd:release/1.0from
thaJeztah:1.0_backport_ignore_modprobe_failures
Nov 12, 2018
Merged

[release/1.0] cherry-pick: Ignore modprobe failures in ExecStartPre (systemd unit)#2777
crosbymichael merged 1 commit intocontainerd:release/1.0from
thaJeztah:1.0_backport_ignore_modprobe_failures

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Nov 10, 2018

Backport of #2776 for the 1.0 branch
fixes #2772 for the 1.0.x releases

git checkout -b 1.0_backport_ignore_modprobe_failures upstream/release/1.0
git cherry-pick -s -S -x 555ea3fb43505512bba51563183a80b2d4a1d028

cherry-pick was clean; no conflicts

When running containerd inside LXC, due to systemd being unable to execute
modprobe overlay inside the container (module is already loaded in host kernel).

This patch adds a - prefix to the ExecStartPre command, so that failures
are ignored, and the service can start as usual.

@thaJeztah thaJeztah mentioned this pull request Nov 10, 2018
Merged
@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Nov 10, 2018

CI is failing on the sorting issue; I think there was a PR that fixed that

--- a/windows/hcsshimtypes/next.pb.txt
+++ b/windows/hcsshimtypes/next.pb.txt
@@ -75,8 +75,8 @@ file {
       type: TYPE_MESSAGE
       type_name: ".google.protobuf.Duration"
       options {
-        65011: 1
         65001: 0
+        65011: 1
       }
       json_name: "terminateDuration"
     }
@@ -97,8 +97,8 @@ file {
       type: TYPE_MESSAGE
       type_name: ".google.protobuf.Timestamp"
       options {
-        65010: 1
         65001: 0
+        65010: 1
       }
       json_name: "createdAt"
     }

Found it: #2470

That one was back ported to the release/1.1 branch, but looks to be missing in 1.0

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Nov 10, 2018 •
edited
Loading

Opened #2780 for the sorting fix. I'll rebase this one, once that is merged

@thaJeztah
Ignore modprobe failures in ExecStartPre (systemd unit)
d0adcf5 
When running containerd inside LXC, due to systemd being unable to execute
`modprobe overlay` inside the container (module is already loaded in host kernel).

This patch adds a `-` prefix to the `ExecStartPre` command, so that failures
are ignored, and the service can start as usual.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 555ea3f)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah force-pushed the 1.0_backport_ignore_modprobe_failures branch from 695cfe8 to d0adcf5 Compare November 12, 2018 12:06
@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Nov 12, 2018

rebased, now that #2780 was merged

@codecov-io
Copy link
Copy Markdown

codecov-io commented Nov 12, 2018

Codecov Report

Merging #2777 into release/1.0 will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##           release/1.0    #2777   +/-   ##
============================================
  Coverage        50.95%   50.95%           
============================================
  Files               81       81           
  Lines             7205     7205           
============================================
  Hits              3671     3671           
  Misses            2833     2833           
  Partials           701      701
Flag Coverage Δ
#linux 50.95% <ø> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 178c7c3...d0adcf5. Read the comment docs.

@crosbymichael
Copy link
Copy Markdown
Member

crosbymichael commented Nov 12, 2018

LGTM

@crosbymichael crosbymichael merged commit 8cbbc75 into containerd:release/1.0 Nov 12, 2018
@thaJeztah thaJeztah deleted the 1.0_backport_ignore_modprobe_failures branch November 12, 2018 15:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@thaJeztah @codecov-io @crosbymichael @AkihiroSuda