Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check Process limit on node start up #1503

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Prev Previous commit
Next Next commit
fix as pr comment
atchapcyp committed Sep 27, 2019

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 8e288460811b6af4237a0dc65539919e2b71903f
18 changes: 9 additions & 9 deletions cmd/loom/loom.go
Original file line number Diff line number Diff line change
@@ -337,17 +337,16 @@ func newRunCommand() *cobra.Command {
cmd := &cobra.Command{
Use: "run [root contract]",
Short: "Run the blockchain node",
PreRunE: func(cmd *cobra.Command, args []string) error {
if err := checkFileDescriptorLimit(cfg.MinimumFileDescriptorLimit); err != nil {
fmt.Fprintf(os.Stderr, "%v\n", err)
os.Exit(0)
}
return nil
},
RunE: func(cmd *cobra.Command, args []string) error {
if err != nil {
return err
}
if cfg.MinOpenFilesLimit != 0 {
if err := checkFileDescriptorLimit(cfg.MinOpenFilesLimit); err != nil {
fmt.Fprintf(os.Stderr, "%v\n", err)
os.Exit(0)
}
}
log.Setup(cfg.LoomLogLevel, cfg.LogDestination)
logger := log.Default
if cfg.PrometheusPushGateway.Enabled {
@@ -1298,10 +1297,11 @@ func startPushGatewayMonitoring(cfg *config.PrometheusPushGatewayConfig, log *lo
func checkFileDescriptorLimit(min uint64) error {
var rlimit syscall.Rlimit
if err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &rlimit); err != nil {
return err
fmt.Fprintf(os.Stderr, "%v\n", err)
return nil
}
if rlimit.Cur < min {
return fmt.Errorf("Current file descriptor limit (%d) is too low; minimum file descriptor limit is %d", rlimit.Cur, min)
return fmt.Errorf("Current open file limit (%d) is too low, please set it to at least %d", rlimit.Cur, min)
}

return nil
18 changes: 9 additions & 9 deletions config/config.go
Original file line number Diff line number Diff line change
@@ -142,8 +142,8 @@ type Config struct {
// Dragons
EVMDebugEnabled bool

//Minimum number of file descriptor limit
MinimumFileDescriptorLimit uint64
// Minimum number of file descriptor limit
MinOpenFilesLimit uint64
}

type Metrics struct {
@@ -386,12 +386,12 @@ func DefaultConfig() *Config {
EVMDebugEnabled: false,
SampleGoContractEnabled: false,

Oracle: "",
DeployEnabled: true,
CallEnabled: true,
DPOSVersion: 3,
AllowNamedEvmContracts: false,
MinimumFileDescriptorLimit: 512,
Oracle: "",
DeployEnabled: true,
CallEnabled: true,
DPOSVersion: 3,
AllowNamedEvmContracts: false,
MinOpenFilesLimit: 100000,
}
cfg.TransferGateway = DefaultTGConfig(cfg.RPCProxyPort)
cfg.LoomCoinTransferGateway = DefaultLoomCoinTGConfig(cfg.RPCProxyPort)
@@ -770,5 +770,5 @@ PluginsDir: "{{ .PluginsDir }}"
#
EVMDebugEnabled: {{ .EVMDebugEnabled }}
AllowNamedEvmContracts: {{ .AllowNamedEvmContracts }}
MinimumFileDescriptorLimit: {{ .MinimumFileDescriptorLimit }}
MinOpenFilesLimit: {{ .MinOpenFilesLimit }}
` + transferGatewayLoomYamlTemplate