Skip to content

Fix OOM error in large parentchain syncs with sidechain feature. #1493

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

Merged
brenzi merged 15 commits into from
Nov 30, 2023
Merged

Fix OOM error in large parentchain syncs with sidechain feature. #1493

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
986d2d5
improve log levels
clangenb Oct 14, 2023
d84bcd1
[service] `sidechain_start_untrusted_rpc_server`downgrade tokyo handl…
clangenb Nov 15, 2023
24522cd
[service/main] distinguish better between different setups
clangenb Nov 15, 2023
c2fac9f
[service/main] extract duplicate code
clangenb Nov 15, 2023
bc77a5b
[service/main] fix clippy
clangenb Nov 15, 2023
ee4bf37
[service/main] fix clippy with teeracle
clangenb Nov 15, 2023
9c6abe8
Merge branch 'master' into cl/fix-sidechain-oom
clangenb Nov 29, 2023
3acdc2e
introduce `is_syncing` in `sync_parentchain`
clangenb Nov 29, 2023
1ab60ee
remove obsolete `trigger_parentchain_block` ffi
clangenb Nov 29, 2023
fb3db5e
remove unused import
clangenb Nov 29, 2023
9c25d88
fix clippy
clangenb Nov 29, 2023
d907646
fix test compilation
clangenb Nov 29, 2023
4d65577
Merge branch 'master' into cl/fix-sidechain-oom
clangenb Nov 30, 2023
d49ec56
[service/main] extract `init_proxied_shard_vault`
clangenb Nov 30, 2023
54f378e
Merge branch 'master' into cl/fix-sidechain-oom
clangenb Nov 30, 2023
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
Prev Previous commit
Next Next commit
fix test compilation
  • Loading branch information
@clangenb
clangenb committed Nov 29, 2023
commit d907646d989162c44cdf42bad837b16096399167
2 changes: 1 addition & 1 deletion core/parentchain/block-import-dispatcher/src/immediate_dispatcher.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ mod tests {
counter_clone.increment();
});

dispatcher.dispatch_import(vec![1u32, 2u32], vec![]).unwrap();
dispatcher.dispatch_import(vec![1u32, 2u32], vec![], false).unwrap();

assert_eq!(1, notification_counter.get_counter());
}
Expand Down
32 changes: 24 additions & 8 deletions core/parentchain/block-import-dispatcher/src/triggered_dispatcher.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,11 @@ mod tests {
let dispatcher = test_fixtures();

dispatcher
.dispatch_import(vec![1, 2, 3, 4, 5], vec![vec![1], vec![2], vec![3], vec![4], vec![5]])
.dispatch_import(
vec![1, 2, 3, 4, 5],
vec![vec![1], vec![2], vec![3], vec![4], vec![5]],
false,
)
.unwrap();

assert!(dispatcher.block_importer.get_all_imported_blocks().is_empty());
Expand All @@ -248,10 +252,14 @@ mod tests {
let dispatcher = test_fixtures();

dispatcher
.dispatch_import(vec![1, 2, 3, 4, 5], vec![vec![1], vec![2], vec![3], vec![4], vec![5]])
.dispatch_import(
vec![1, 2, 3, 4, 5],
vec![vec![1], vec![2], vec![3], vec![4], vec![5]],
false,
)
.unwrap();
dispatcher
.dispatch_import(vec![6, 7, 8], vec![vec![6], vec![7], vec![8]])
.dispatch_import(vec![6, 7, 8], vec![vec![6], vec![7], vec![8]], false)
.unwrap();

assert!(dispatcher.block_importer.get_all_imported_blocks().is_empty());
Expand All @@ -266,7 +274,7 @@ mod tests {
fn triggering_import_all_empties_queue() {
let dispatcher = test_fixtures();

dispatcher.dispatch_import(vec![1, 2, 3, 4, 5], vec![]).unwrap();
dispatcher.dispatch_import(vec![1, 2, 3, 4, 5], vec![], false).unwrap();
let latest_imported = dispatcher.import_all().unwrap().unwrap();

assert_eq!(latest_imported, 5);
Expand All @@ -278,7 +286,7 @@ mod tests {
fn triggering_import_all_on_empty_queue_imports_none() {
let dispatcher = test_fixtures();

dispatcher.dispatch_import(vec![], vec![]).unwrap();
dispatcher.dispatch_import(vec![], vec![], false).unwrap();
let maybe_latest_imported = dispatcher.import_all().unwrap();

assert!(maybe_latest_imported.is_none());
Expand All @@ -295,7 +303,11 @@ mod tests {
let dispatcher = test_fixtures();

dispatcher
.dispatch_import(vec![1, 2, 3, 4, 5], vec![vec![1], vec![2], vec![3], vec![4], vec![5]])
.dispatch_import(
vec![1, 2, 3, 4, 5],
vec![vec![1], vec![2], vec![3], vec![4], vec![5]],
false,
)
.unwrap();
let latest_imported =
dispatcher.import_until(|i: &SignedBlockType| i == &4).unwrap().unwrap();
Expand All @@ -311,7 +323,11 @@ mod tests {
let dispatcher = test_fixtures();

dispatcher
.dispatch_import(vec![1, 2, 3, 4, 5], vec![vec![1], vec![2], vec![3], vec![4], vec![5]])
.dispatch_import(
vec![1, 2, 3, 4, 5],
vec![vec![1], vec![2], vec![3], vec![4], vec![5]],
false,
)
.unwrap();
let maybe_latest_imported = dispatcher.import_until(|i: &SignedBlockType| i == &8).unwrap();

Expand All @@ -328,7 +344,7 @@ mod tests {
fn trigger_import_all_but_latest_works() {
let dispatcher = test_fixtures();

dispatcher.dispatch_import(vec![1, 2, 3, 4, 5], vec![]).unwrap();
dispatcher.dispatch_import(vec![1, 2, 3, 4, 5], vec![], false).unwrap();
dispatcher.import_all_but_latest().unwrap();

assert_eq!(dispatcher.block_importer.get_all_imported_blocks(), vec![1, 2, 3, 4]);
Expand Down
1 change: 1 addition & 0 deletions service/src/tests/mocks/enclave_api_mock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ impl Sidechain for EnclaveMock {
_events: &[Vec<u8>],
_events_proofs: &[StorageProof],
_: &ParentchainId,
_: bool,
) -> EnclaveResult<()> {
Ok(())
}
Expand Down