Skip to content

[release/1.1 backport] Set shim max procs via env var#2782

Merged
estesp merged 1 commit intocontainerd:release/1.1from
thaJeztah:1.1_backport_shim_procs
Nov 12, 2018
Merged

[release/1.1 backport] Set shim max procs via env var#2782
estesp merged 1 commit intocontainerd:release/1.1from
thaJeztah:1.1_backport_shim_procs

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

Backport of #2423 for the 1.1 branch

git checkout -b 1.1_backport_shim_procs upstream/release/1.1
git cherry-pick -s -S -x 68e144c63791fc4982afedc0fe6fcbf924b5d59b

cherry-pick was clean; no conflicts

This sets the shim's max procs to 2, like we already have hard coded in
the shim, with the env var so that it is set at go runtime boot.

This sets the shim's max procs to 2, like we already have hard coded in
the shim, with the env var so that it is set at go runtime boot.

Signed-off-by: Michael Crosby <[email protected]>
(cherry picked from commit 68e144c)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #2782 into release/1.1 will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##           release/1.1    #2782   +/-   ##
============================================
  Coverage        48.99%   48.99%           
============================================
  Files               85       85           
  Lines             7603     7603           
============================================
  Hits              3725     3725           
  Misses            3203     3203           
  Partials           675      675
Flag Coverage Δ
#linux 48.99% <ø> (ø) ⬆️

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 a7dff7e...069260a. Read the comment docs.

@crosbymichael
Copy link
Copy Markdown
Member

LGTM

Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

@estesp estesp merged commit cc1c45a into containerd:release/1.1 Nov 12, 2018
@thaJeztah thaJeztah deleted the 1.1_backport_shim_procs branch November 12, 2018 23:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants