Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

rpc-send-tx-svc server-side retry knobs (backport #20818) #20830

Merged
merged 2 commits into from
Oct 21, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 20, 2021

This is an automatic backport of pull request #20818 done by Mergify.
Cherry-pick of fe098b5 has failed:

On branch mergify/bp/v1.8/pr-20818
Your branch is up to date with 'origin/v1.8'.

You are currently cherry-picking commit fe098b5dd.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   core/src/validator.rs
	modified:   local-cluster/src/validator_configs.rs
	modified:   replica-node/src/replica_node.rs
	modified:   validator/src/main.rs

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   Cargo.lock
	both modified:   core/Cargo.toml
	deleted by us:   replica-node/Cargo.toml
	both modified:   rpc/src/rpc_service.rs
	both modified:   rpc/src/send_transaction_service.rs
	both modified:   validator/Cargo.toml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Oct 20, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Oct 20, 2021

automerge label removed due to a CI failure

(cherry picked from commit fe098b5)

# Conflicts:
#	Cargo.lock
#	core/Cargo.toml
#	replica-node/Cargo.toml
#	rpc/src/rpc_service.rs
#	rpc/src/send_transaction_service.rs
#	validator/Cargo.toml
@t-nelson t-nelson force-pushed the mergify/bp/v1.8/pr-20818 branch from cc06b95 to 9a40f26 Compare October 20, 2021 21:58
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Oct 20, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Oct 20, 2021

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Oct 20, 2021
@t-nelson t-nelson force-pushed the mergify/bp/v1.8/pr-20818 branch from 9a40f26 to 0b55d02 Compare October 20, 2021 22:28
@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Oct 20, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Oct 21, 2021

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Oct 21, 2021
@codecov
Copy link

codecov bot commented Oct 21, 2021

Codecov Report

Merging #20830 (0b55d02) into v1.8 (29eae21) will decrease coverage by 0.0%.
The diff coverage is 79.3%.

@@            Coverage Diff            @@
##             v1.8   #20830     +/-   ##
=========================================
- Coverage    81.9%    81.9%   -0.1%     
=========================================
  Files         453      457      +4     
  Lines      128028   128655    +627     
=========================================
+ Hits       104913   105386    +473     
- Misses      23115    23269    +154     

@mergify mergify bot merged commit 8cba6cc into v1.8 Oct 21, 2021
@mergify mergify bot deleted the mergify/bp/v1.8/pr-20818 branch October 21, 2021 02:15
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant