diff options
Diffstat (limited to 'runsc')
| -rw-r--r-- | runsc/boot/loader.go | 10 | ||||
| -rw-r--r-- | runsc/boot/loader_test.go | 5 |
2 files changed, 10 insertions, 5 deletions
diff --git a/runsc/boot/loader.go b/runsc/boot/loader.go index 4a6528307..89300a953 100644 --- a/runsc/boot/loader.go +++ b/runsc/boot/loader.go @@ -18,6 +18,7 @@ package boot import ( "fmt" "math/rand" + "runtime" "sync/atomic" "syscall" gtime "time" @@ -171,10 +172,11 @@ func New(spec *specs.Spec, conf *Config, controllerFD int, ioFDs []int, console Timekeeper: tk, RootUserNamespace: creds.UserNamespace, NetworkStack: networkStack, - ApplicationCores: 8, - Vdso: vdso, - RootUTSNamespace: utsns, - RootIPCNamespace: ipcns, + // TODO: use number of logical processors from cgroups. + ApplicationCores: uint(runtime.NumCPU()), + Vdso: vdso, + RootUTSNamespace: utsns, + RootIPCNamespace: ipcns, }); err != nil { return nil, fmt.Errorf("error initializing kernel: %v", err) } diff --git a/runsc/boot/loader_test.go b/runsc/boot/loader_test.go index 3ce7855f6..ca78c2cd6 100644 --- a/runsc/boot/loader_test.go +++ b/runsc/boot/loader_test.go @@ -15,7 +15,9 @@ package boot import ( + "fmt" "io/ioutil" + "math/rand" "os" "sync" "testing" @@ -29,6 +31,7 @@ import ( func init() { log.SetLevel(log.Debug) + rand.Seed(time.Now().UnixNano()) } // testSpec returns a simple spec that can be used in tests. @@ -46,7 +49,7 @@ func testSpec() *specs.Spec { } func createLoader() (*Loader, error) { - fd, err := server.CreateSocket(ControlSocketAddr("123")) + fd, err := server.CreateSocket(ControlSocketAddr(fmt.Sprintf("%010d", rand.Int())[:10])) if err != nil { return nil, err } |