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.

Sign up for GitHub

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

Jump to bottom

extracted configuration value for vm-queries delay #5071

Merged
merged 2 commits into from
Mar 14, 2023
Merged

extracted configuration value for vm-queries delay #5071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4dd1847
extracted configuration value for vm-queries delay
bogdan-rosianu Mar 9, 2023
235796b
fixes after review
bogdan-rosianu Mar 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions cmd/node/config/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,8 @@
TrieOperationsDeadlineMilliseconds = 10000
# GetAddressesBulkMaxSize represents the maximum number of addresses to be fetched in a bulk per API request. 0 means unlimited
GetAddressesBulkMaxSize = 100
# VmQueryDelayAfterStartInSec represents the number of seconds to wait when starting node before accepting vm query requests
VmQueryDelayAfterStartInSec = 120
# EndpointsThrottlers represents a map for maximum simultaneous go routines for an endpoint
EndpointsThrottlers = [{ Endpoint = "/transaction/:hash", MaxNumGoRoutines = 10 },
{ Endpoint = "/transaction/send", MaxNumGoRoutines = 2 },
Expand Down
1 change: 1 addition & 0 deletions config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,7 @@ type WebServerAntifloodConfig struct {
SameSourceResetIntervalInSec uint32
TrieOperationsDeadlineMilliseconds uint32
GetAddressesBulkMaxSize uint32
VmQueryDelayAfterStartInSec uint32
EndpointsThrottlers []EndpointsThrottlersConfig
}

Expand Down
11 changes: 8 additions & 3 deletions node/nodeRunner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ import (

const (
// TODO: remove this after better handling VM versions switching
// delayBeforeScQueriesStart represents the delay before the sc query processor should start to allow external queries
delayBeforeScQueriesStart = 2 * time.Minute
// defaultDelayBeforeScQueriesStartInSec represents the default delay before the sc query processor should start to allow external queries
defaultDelayBeforeScQueriesStartInSec = 120

maxTimeToClose = 10 * time.Second
// SoftRestartMessage is the custom message used when the node does a soft restart operation
Expand Down Expand Up @@ -516,9 +516,14 @@ func (nr *nodeRunner) executeOneComponentCreationCycle(

log.Info("application is now running")

delayInSecBeforeAllowingVmQueries := configs.GeneralConfig.WebServerAntiflood.VmQueryDelayAfterStartInSec
if delayInSecBeforeAllowingVmQueries == 0 {
Copy link
Contributor

Choose a reason for hiding this comment

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

Shall we add a warn here to specify that we override the config value?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

log.Warn("WebServerAntiflood.VmQueryDelayAfterStartInSec value not set. will use default", "default", defaultDelayBeforeScQueriesStartInSec)
delayInSecBeforeAllowingVmQueries = defaultDelayBeforeScQueriesStartInSec
}
// TODO: remove this and treat better the VM versions switching
go func(statusHandler core.AppStatusHandler) {
time.Sleep(delayBeforeScQueriesStart)
time.Sleep(time.Duration(delayInSecBeforeAllowingVmQueries) * time.Second)
close(allowExternalVMQueriesChan)
statusHandler.SetStringValue(common.MetricAreVMQueriesReady, strconv.FormatBool(true))
}(managedStatusCoreComponents.AppStatusHandler())
Expand Down