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

config: adjust shard cache sizes #10409

Merged
merged 2 commits into from
Jan 12, 2024
Merged

config: adjust shard cache sizes #10409

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46bf382
impl
pugachAG Jan 10, 2024
61de47b
review comments
pugachAG Jan 12, 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
15 changes: 10 additions & 5 deletions core/store/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,17 +240,22 @@ impl Default for StoreConfig {
block_size: bytesize::ByteSize::kib(16),

trie_cache: TrieCacheConfig {
default_max_bytes: DEFAULT_SHARD_CACHE_TOTAL_SIZE_LIMIT,
default_max_bytes: 500_000_000,
Copy link
Contributor

Choose a reason for hiding this comment

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

not for this pr, but bytesize is a nice type safe helper for dealing with bytes

Copy link
Contributor Author

Choose a reason for hiding this comment

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

#10412

// Temporary solution to make contracts with heavy trie access
// patterns on shard 3 more stable. It was chosen by the estimation
// of the largest contract storage size we are aware as of 23/08/2022.
// Consider removing after implementing flat storage. (#7327)
// Note: on >= 1.34 nearcore version use 1_000_000_000 if you have
// minimal hardware.
per_shard_max_bytes: HashMap::from_iter([(
ShardUId { version: 1, shard_id: 3 },
3_000_000_000,
)]),
per_shard_max_bytes: HashMap::from_iter([
pugachAG marked this conversation as resolved.
Show resolved Hide resolved
(ShardUId { version: 1, shard_id: 3 }, 3_000_000_000),
// After resharding "token.sweat" account moves to shard 4
(ShardUId { version: 2, shard_id: 4 }, 3_000_000_000),
Copy link
Contributor

Choose a reason for hiding this comment

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

nit:

// In simple nightshade the heavy contract "token.sweat" is in shard 3
(ShardUId { version: 1, shard_id: 3 }, 3_000_000_000),
// In simple nightshade v2 the heavy contract "token.sweat" is in shard 4
(ShardUId { version: 2, shard_id: 4 }, 3_000_000_000),

// Shard 1 is dedicated to aurora and it had very few cache
// misses even with cache size of only 50MB
(ShardUId { version: 1, shard_id: 1 }, 50_000_000),
(ShardUId { version: 2, shard_id: 1 }, 50_000_000),
Comment on lines +258 to +259
Copy link
Contributor

Choose a reason for hiding this comment

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

Isn't it the default now? Does it need to be set explicitly?

Copy link
Contributor Author

@pugachAG pugachAG Jan 12, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

nope, I've changed the default via default_max_bytes field above to 500MB

]),
shard_cache_deletions_queue_capacity: DEFAULT_SHARD_CACHE_DELETIONS_QUEUE_CAPACITY,
},

Expand Down
4 changes: 2 additions & 2 deletions core/store/src/trie/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ use tracing::error;

/// Default memory limit, if nothing else is configured.
/// It is chosen to correspond roughly to the old limit, which was
/// 500k entries * TRIE_LIMIT_CACHED_VALUE_SIZE.
/// 50k entries * TRIE_LIMIT_CACHED_VALUE_SIZE.
pub(crate) const DEFAULT_SHARD_CACHE_TOTAL_SIZE_LIMIT: u64 =
if cfg!(feature = "no_cache") { 1 } else { 500_000_000 };
if cfg!(feature = "no_cache") { 1 } else { 50_000_000 };

/// Capacity for the deletions queue.
/// It is chosen to fit all hashes of deleted nodes for 3 completely full blocks.
Expand Down
Loading