Merge pull request #3374 from yichengq/gomaxprocs

etcdmain: change default GOMAXPROCS when compiling in go1.5
This commit is contained in:
Yicheng Qin 2015-08-25 14:48:00 -07:00
commit 2b58da1699

View File

@ -24,7 +24,6 @@ import (
"path"
"reflect"
"runtime"
"strconv"
"time"
"github.com/coreos/etcd/Godeps/_workspace/src/github.com/coreos/go-systemd/daemon"
@ -96,12 +95,8 @@ func Main() {
plog.Infof("Go Version: %s\n", runtime.Version())
plog.Infof("Go OS/Arch: %s/%s\n", runtime.GOOS, runtime.GOARCH)
GoMaxProcs := 1
if envMaxProcs, err := strconv.Atoi(os.Getenv("GOMAXPROCS")); err == nil {
GoMaxProcs = envMaxProcs
}
GoMaxProcs := runtime.GOMAXPROCS(0)
plog.Infof("setting maximum number of CPUs to %d, total number of available CPUs is %d", GoMaxProcs, runtime.NumCPU())
runtime.GOMAXPROCS(GoMaxProcs)
// TODO: check whether fields are set instead of whether fields have default value
if cfg.name != defaultName && cfg.initialCluster == initialClusterFromName(defaultName) {