summaryrefslogtreecommitdiffhomepage
path: root/runsc/main.go
diff options
context:
space:
mode:
authorAleksandr Razumov <a.razumov@corp.mail.ru>2019-12-17 20:41:02 +0300
committerAleksandr Razumov <a.razumov@corp.mail.ru>2019-12-17 20:41:02 +0300
commit67f678be27b3f4545d41539bd6855527da53a250 (patch)
tree66d35d45dce0f360c289db9a9943ae5297d1becf /runsc/main.go
parentb661434202672f920291bf5685b68772103c66cb (diff)
Leave minimum CPU number as a constant
Remove introduced CPUNumMin config and hard-code it as 2.
Diffstat (limited to 'runsc/main.go')
-rw-r--r--runsc/main.go4
1 files changed, 1 insertions, 3 deletions
diff --git a/runsc/main.go b/runsc/main.go
index 7c60cbb4b..abf929511 100644
--- a/runsc/main.go
+++ b/runsc/main.go
@@ -82,8 +82,7 @@ var (
numNetworkChannels = flag.Int("num-network-channels", 1, "number of underlying channels(FDs) to use for network link endpoints.")
rootless = flag.Bool("rootless", false, "it allows the sandbox to be started with a user that is not root. Sandbox and Gofer processes may run with same privileges as current user.")
referenceLeakMode = flag.String("ref-leak-mode", "disabled", "sets reference leak check mode: disabled (default), log-names, log-traces.")
- cpuNumFromQuota = flag.Bool("cpu-num-from-quota", false, "set cpu number to cpu quota (least integer greater or equal to quota value)")
- cpuNumMin = flag.Int("cpu-num-min", 2, "minimum number of cpu to use with --cpu-num-from-quota")
+ cpuNumFromQuota = flag.Bool("cpu-num-from-quota", false, "set cpu number to cpu quota (least integer greater or equal to quota value, but not less than 2)")
// Test flags, not to be used outside tests, ever.
testOnlyAllowRunAsCurrentUserWithoutChroot = flag.Bool("TESTONLY-unsafe-nonroot", false, "TEST ONLY; do not ever use! This skips many security measures that isolate the host from the sandbox.")
@@ -228,7 +227,6 @@ func main() {
ReferenceLeakMode: refsLeakMode,
OverlayfsStaleRead: *overlayfsStaleRead,
CPUNumFromQuota: *cpuNumFromQuota,
- CPUNumMin: *cpuNumMin,
TestOnlyAllowRunAsCurrentUserWithoutChroot: *testOnlyAllowRunAsCurrentUserWithoutChroot,
TestOnlyTestNameEnv: *testOnlyTestNameEnv,