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

fix load test #1043

Merged
merged 15 commits into from
Jan 22, 2024
Merged

fix load test #1043

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
7df020a
tweak global limit
patrick-ogrady Jan 5, 2024
31d5b5f
uncomment submit
patrick-ogrady Jan 6, 2024
c00a00c
update consts
patrick-ogrady Jan 6, 2024
16afebf
update avalanchego version
patrick-ogrady Jan 6, 2024
e7438bb
fix compilation err
patrick-ogrady Jan 6, 2024
42e013d
simpler fix
patrick-ogrady Jan 6, 2024
df9a0bf
remove mempool configs
patrick-ogrady Jan 6, 2024
d19ff9f
bump latest avago rc
ceyonur Jan 11, 2024
bc962ba
fix tests
ceyonur Jan 11, 2024
86925fe
update avalanchego
ceyonur Jan 18, 2024
aa9af2c
fix mockgen
ceyonur Jan 18, 2024
d252382
bump ANR
ceyonur Jan 20, 2024
1621aae
remove unnecessary log levels
ceyonur Jan 20, 2024
b8b5ae8
Fix bloom reset (#1049)
ceyonur Jan 22, 2024
4af6bf7
Update plugin/evm/tx_gossip_test.go
ceyonur Jan 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions core/txpool/txpool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,10 +207,10 @@ var DefaultConfig = Config{
PriceLimit: 1,
PriceBump: 10,

AccountSlots: 16,
GlobalSlots: 4096 + 1024, // urgent + floating queue capacity with 4:1 ratio
AccountSlots: 102400,
patrick-ogrady marked this conversation as resolved.
Show resolved Hide resolved
GlobalSlots: 100000, // urgent + floating queue capacity with 4:1 ratio
AccountQueue: 64,
GlobalQueue: 1024,
GlobalQueue: 1024000,

Lifetime: 3 * time.Hour,
}
Expand Down
14 changes: 7 additions & 7 deletions internal/ethapi/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1854,17 +1854,17 @@ func SubmitTransaction(ctx context.Context, b Backend, tx *types.Transaction) (c
// Print a log with full tx details for manual investigations and interventions
head := b.CurrentBlock()
signer := types.MakeSigner(b.ChainConfig(), head.Number, head.Time)
from, err := types.Sender(signer, tx)
_, err := types.Sender(signer, tx)
if err != nil {
return common.Hash{}, err
}

if tx.To() == nil {
addr := crypto.CreateAddress(from, tx.Nonce())
log.Info("Submitted contract creation", "hash", tx.Hash().Hex(), "from", from, "nonce", tx.Nonce(), "contract", addr.Hex(), "value", tx.Value(), "type", tx.Type(), "gasFeeCap", tx.GasFeeCap(), "gasTipCap", tx.GasTipCap(), "gasPrice", tx.GasPrice())
} else {
log.Info("Submitted transaction", "hash", tx.Hash().Hex(), "from", from, "nonce", tx.Nonce(), "recipient", tx.To(), "value", tx.Value(), "type", tx.Type(), "gasFeeCap", tx.GasFeeCap(), "gasTipCap", tx.GasTipCap(), "gasPrice", tx.GasPrice())
}
// if tx.To() == nil {
// addr := crypto.CreateAddress(from, tx.Nonce())
// log.Info("Submitted contract creation", "hash", tx.Hash().Hex(), "from", from, "nonce", tx.Nonce(), "contract", addr.Hex(), "value", tx.Value(), "type", tx.Type(), "gasFeeCap", tx.GasFeeCap(), "gasTipCap", tx.GasTipCap(), "gasPrice", tx.GasPrice())
// } else {
// log.Info("Submitted transaction", "hash", tx.Hash().Hex(), "from", from, "nonce", tx.Nonce(), "recipient", tx.To(), "value", tx.Value(), "type", tx.Type(), "gasFeeCap", tx.GasFeeCap(), "gasTipCap", tx.GasTipCap(), "gasPrice", tx.GasPrice())
// }
return tx.Hash(), nil
}

Expand Down
2 changes: 1 addition & 1 deletion plugin/evm/gossip.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ func (g *GossipEthTxPool) Subscribe(ctx context.Context) {
}

if reset {
log.Debug("resetting bloom filter", "reason", "reached max filled ratio")
log.Info("resetting bloom filter", "reason", "reached max filled ratio")

g.mempool.IteratePending(func(tx *types.Transaction) bool {
g.bloom.Add(&GossipEthTx{Tx: pendingTx})
Expand Down
4 changes: 3 additions & 1 deletion tests/utils/runner/network_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,14 @@ func NewDefaultANRConfig() ANRConfig {
AvalancheGoExecPath: os.ExpandEnv("$GOPATH/src/github.com/ava-labs/avalanchego/build/avalanchego"),
PluginDir: os.ExpandEnv("$GOPATH/src/github.com/ava-labs/avalanchego/build/plugins"),
GlobalNodeConfig: `{
"log-level":"info",
Copy link
Collaborator

Choose a reason for hiding this comment

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

Should we remove log-display-level if we are going to specify log-level? Also, not sure why we were originally specifying log-display-level here (although it looks like I wrote it, I think I copied it from somewhere).

Most likely this was to log to stdout without writing to the log directory. I'd assume if anything we'd want more specific logs written to stdout, so that we can inspect them on test failure without crowding out the output from the network runner, which pipes the logs from stdout (as I understand it).

Copy link
Collaborator

Choose a reason for hiding this comment

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

removed

"log-display-level":"info",
"proposervm-use-current-height":true
}`,
GlobalCChainConfig: `{
"warp-api-enabled": true,
"log-level": "debug"
"log-level": "debug",
"log-display-level": "debug"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
"log-level": "debug",
"log-display-level": "debug"
"log-level": "debug",

There is no log-display-level for the C-Chain specific config

Copy link
Collaborator

Choose a reason for hiding this comment

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

removed

}`,
}
// If AVALANCHEGO_BUILD_PATH is populated, override location set by GOPATH
Expand Down
Loading