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

[mempool] Specify number of workers for mempool threads. Add prometheus metrics for networking. #1113

Merged
merged 31 commits into from
Jun 1, 2022
Merged
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
873de44
function to revoke vouch
0o-de-lally May 1, 2022
5e27f62
vouch revoking apis
0o-de-lally May 1, 2022
2a4debf
add test
0o-de-lally May 1, 2022
67b6655
set rotation can only expand by a certain number of nodes on every ep…
0o-de-lally May 1, 2022
b63187b
Merge branch 'remove-vouch' into set-rotation
0o-de-lally May 1, 2022
9e9f906
updating tests and patch implementation
0o-de-lally May 1, 2022
bd593d4
patch reconfig case_2
0o-de-lally May 1, 2022
d15d5d5
make sure jailed nodes are dropping
0o-de-lally May 1, 2022
cf24ea2
increase threshold for voting
0o-de-lally May 1, 2022
fc0c6f7
update writeset for rescue to include recovert mode
0o-de-lally May 1, 2022
f065915
patch build
0o-de-lally May 1, 2022
662f012
remove recovery mode
0o-de-lally May 1, 2022
7463d9a
expand epoch set by 1/6th
0o-de-lally May 1, 2022
0fabe5c
make setting recovery mode optional from CLI
0o-de-lally May 1, 2022
cb0f1ed
add debug prints
0o-de-lally May 3, 2022
66ce4b8
debug prints
0o-de-lally May 3, 2022
256ffe8
debug prints and comments.
0o-de-lally May 4, 2022
0913585
add debug prints and comments
0o-de-lally May 4, 2022
0293c3c
notes
0o-de-lally May 4, 2022
c914695
comment the mempool config params
0o-de-lally May 4, 2022
f39e526
find where we could create backpressure on mempool
0o-de-lally May 4, 2022
1bb9ff1
prints for debugging
0o-de-lally May 5, 2022
c6f785a
WIP experimental backpressure on shared mempool consensus requests. D…
0o-de-lally May 6, 2022
8554306
change node.yaml default params for state_sync and mempool
0o-de-lally May 6, 2022
525b6b4
Fix build
simsekgokhan May 11, 2022
4b10549
adding prometheus counters
0o-de-lally May 17, 2022
0870771
Merge branch 'main' into state-sync-debug
0o-de-lally May 17, 2022
ecd3278
patch build
0o-de-lally May 17, 2022
f0afbd5
State sync debug (#1117)
intuitiveminds May 26, 2022
580c52e
Merge branch 'main' into state-sync-debug
0o-de-lally Jun 1, 2022
27ea516
Merge branch 'main' into state-sync-debug
0o-de-lally Jun 1, 2022
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
update writeset for rescue to include recovert mode
0o-de-lally committed May 1, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit fc0c6f7968aa731c18f15579c37760b50f44649e
4 changes: 2 additions & 2 deletions language/diem-tools/writeset-transaction-generator/Makefile
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ BLOCK_HEIGHT = 28671095
endif

ifndef RECOVERY_EPOCH
RECOVERY_EPOCH = 174
RECOVERY_EPOCH = 179
endif

ifndef ACCOUNT
@@ -38,7 +38,7 @@ wipe:

tx:
mkdir ${RESCUE_PATH} | true
cd ${SOURCE_PATH} && cargo r -p diem-writeset-generator -- --db ${DATA_PATH}/db --output ${RESCUE_PATH}/rescue.blob rescue ${VALS}
cd ${SOURCE_PATH} && cargo r -p diem-writeset-generator -- --db ${DATA_PATH}/db --recovery-epoch ${RECOVERY_EPOCH} --output ${RESCUE_PATH}/rescue.blob rescue ${VALS}

tx-migrate:
cd ${SOURCE_PATH} && cargo r -p diem-writeset-generator -- --block-height ${BLOCK_HEIGHT} --recovery-epoch ${RECOVERY_EPOCH} --db ${DATA_PATH}/db --output ${RESCUE_PATH}/rescue.blob migrate ${SOURCE_PATH}/ol/fixtures/rescue/ancestry.json ${SOURCE_PATH}/ol/fixtures/rescue/make_whole.json ${VALS}
Original file line number Diff line number Diff line change
@@ -55,7 +55,7 @@ enum Command {
#[structopt(name = "update-stdlib")]
UpdateStdlib {},
#[structopt(name = "rescue")]
Rescue { addresses: Vec<AccountAddress> },
Rescue { addresses: Vec<AccountAddress>},
#[structopt(name = "recovery")]
RecoveryMode { addresses: Vec<AccountAddress> },
// #[structopt(name = "hotfix")]
@@ -168,7 +168,7 @@ fn main() -> Result<()> {
opt.db.unwrap(),
opt.block_height.expect("need to provide --block-height"),
),
Command::Rescue { addresses } => ol_writset_encode_rescue(opt.db.unwrap(), addresses),
Command::Rescue { addresses } => ol_writset_encode_rescue(opt.db.unwrap(), addresses, opt.recovery_epoch),
Command::Timestamp {} => ol_writset_update_timestamp(
opt.db.unwrap(),
opt.block_height.expect("need to provide --block-height"),
Original file line number Diff line number Diff line change
@@ -100,21 +100,25 @@ pub fn ol_writeset_ancestry(path: PathBuf, ancestry_file: PathBuf) -> WriteSetPa

// }

pub fn ol_writset_encode_rescue(path: PathBuf, vals: Vec<AccountAddress>) -> WriteSetPayload {
pub fn ol_writset_encode_rescue(path: PathBuf, vals: Vec<AccountAddress>, recovery_epoch: u64) -> WriteSetPayload {
if vals.len() == 0 {
println!("need to provide list of addresses");
exit(1)
};

let stdlib_cs = stdlib::ol_fresh_stlib_changeset(path.clone()).unwrap();

// set recovery mode
let recovery =
stdlib::ol_set_epoch_recovery_mode(path.clone(), vec![], recovery_epoch).unwrap();

// TODO: forcing the boundary causes an error on the epoch boundary.
// let boundary = ol_force_boundary(path.clone(), vals.clone(), block_height).unwrap();
let boundary = reconfig::ol_bulk_validators_changeset(path.clone(), vals).unwrap();

// set recovery mode

// let new_cs = merge_change_set(stdlib_cs, boundary).unwrap();
let new_cs = merge_vec_changeset(vec![stdlib_cs, boundary]).unwrap();
let new_cs = merge_vec_changeset(vec![stdlib_cs, recovery, boundary]).unwrap();
// WriteSetPayload::Direct(merge_change_set(new_cs, time).unwrap())
WriteSetPayload::Direct(new_cs)
}