This repository has been archived by the owner on Nov 6, 2020. It is now read-only.
fix: Intermittent failing CI due to addr in use #9885
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
It looks like @mattrutherford hasn't signed our Contributor License Agreement, yet.
You can read and sign our full Contributor License Agreement at the following URL: https://cla.parity.io Once you've signed, please reply to this thread with Many thanks, Parity Technologies CLA Bot |
|
[clabot:check] |
|
It looks like @mattrutherford signed our Contributor License Agreement. 👍 Many thanks, Parity Technologies CLA Bot |
ordian
approved these changes
Nov 9, 2018
There was a problem hiding this comment.
Hey Matt, the changes LGTM.
Please:
- Rebase on master to include recent CI changes.
- Set up your commit email address on GitHub and git.
- [Optionally] sign your commits.
ordian
added
A8-looksgood 🦄
Allow OS to set port at runtime
mattrutherford
force-pushed
the
mr-9709-addr-in-use-ci
branch
from
687738c to
b1c0e18
Compare
|
OK, thanks! It's done. |
sorpaas
reviewed
Nov 9, 2018
| @@ -44,6 +43,7 @@ pub fn serve() -> (Server<ws::Server>, usize, GuardedAuthCodes) { | |||
| extractors::WsExtractor::new(Some(&authcodes.path)), | |||
| extractors::WsStats::new(stats), | |||
| ).unwrap()); | |||
| let port = res.addr().port() as usize; | |||
There was a problem hiding this comment.
From jsonrpc-ws-server, looks like this addr is directly what's parsed in address variable. Will that result in port == 0?
There was a problem hiding this comment.
Should be fine, we get local_addr after bind() in ws as well.
https://github.com/paritytech/jsonrpc/blob/2ed142d55662155b0dc76b9b5d2732300f265dd6/ws/src/server.rs#L85
There was a problem hiding this comment.
It returns the assigned port; addr is initialised in the returned struct with a call to local_addr()
mattrutherford
requested review from
tomusdrw
and removed request for
tomusdrw
tomusdrw
approved these changes
Nov 9, 2018
| @@ -44,6 +43,7 @@ pub fn serve() -> (Server<ws::Server>, usize, GuardedAuthCodes) { | |||
| extractors::WsExtractor::new(Some(&authcodes.path)), | |||
| extractors::WsStats::new(stats), | |||
| ).unwrap()); | |||
| let port = res.addr().port() as usize; | |||
There was a problem hiding this comment.
Should be fine, we get local_addr after bind() in ws as well.
https://github.com/paritytech/jsonrpc/blob/2ed142d55662155b0dc76b9b5d2732300f265dd6/ws/src/server.rs#L85
This was referenced Nov 13, 2018
Closed
Merged
Merged
ascjones
pushed a commit
that referenced
this pull request
Nov 13, 2018
Allow OS to set port at runtime
ordian
pushed a commit
that referenced
this pull request
Nov 13, 2018
Allow OS to set port at runtime
Tbaut
added a commit
that referenced
this pull request
Nov 14, 2018
* bump stable 2.1.6 * ethcore: use Machine::verify_transaction on parent block (#9900) * ethcore: use Machine::verify_transaction on parent block also fixes off-by-one activation of transaction permission contract * ethcore: clarify call to verify_transaction * fix: Intermittent failing CI due to addr in use (#9885) Allow OS to set port at runtime * gitlab-ci: make android release build succeed (#9743) * use docker cargo config file for android builds * make android build succeed * Update light-client hardcoded headers for foundation: #6692865, ropsten: #4417537, kovan: #9363457 * Remove rust-toolchain file (#9906) * light-fetch: Differentiate between out-of-gas/manual throw and use required gas from response on failure (#9824) * fix start_gas, handle OOG exceptions & NotEnoughGas * Change START_GAS: 50_000 -> 60_000 * When the `OutOfGas exception` is received then try to double the gas until it succeeds or block gas limit is reached * When `NotEnoughBasGas error` is received then use the required gas provided in the response * fix(light-fetch): ensure block_gas_limit is tried Try the `block_gas_limit` before regard the execution as an error * Update rpc/src/v1/helpers/light_fetch.rs Co-Authored-By: niklasad1 <[email protected]> * fix #9824 merge artifacts * simplify cargo audit * ci: nuke the gitlab caches (#9855)
Tbaut
added a commit
that referenced
this pull request
Nov 14, 2018
* Bump beta to version 2.2.1 * fix: Intermittent failing CI due to addr in use (#9885) Allow OS to set port at runtime * Use Weak reference in PubSubClient (#9886) * Fix json tracer overflow (#9873) * Fix json tracer overflow * Replace trace_executed with a direct trace push * Remove unused variable * Add test for 5a51 * Remove duplicate json! * Fix docker script (#9854) * Dockerfile: change source path of the newly added check_sync.sh (#9869) * Allow to seal work on latest block (#9876) * Allow to seal work on latest block. * Test from @todr to check sealing conditions. * gitlab-ci: make android release build succeed (#9743) * use docker cargo config file for android builds * make android build succeed * ethcore: use Machine::verify_transaction on parent block (#9900) * ethcore: use Machine::verify_transaction on parent block also fixes off-by-one activation of transaction permission contract * ethcore: clarify call to verify_transaction * foundation: #6692865, ropsten: #4417537, kovan: #9363457 * Remove rust-toolchain file (#9906) * EIP-712 implementation (#9631) * EIP-712 impl * added more tests * removed size parsing unwrap * corrected TYPE_REGEX to disallow zero sized fixed length arrays, replaced LinkedHashSet with IndexSet, added API spec to docs, fixed Type::Byte encoding branch * use Option<u64> instead of u64 for Type::Array::Length * replace `.iter()` with `.values()` Co-Authored-By: seunlanlege <[email protected]> * tabify eip712.rs * use proper comments for docs * Cargo.lock: revert unrelated changes * tabify encode.rs * EIP 191 (#9701) * added sign_191 rpc method * fixed hash_structured_data return type * added ConfirmationPayload::SignMessage for non-prefixed signatures, added tests for sign191 * renamed WithValidator -> PresignedTransaction * rename applicationData to data in test * adds docs for EIP191Version, renamed SignRequest to EIP191SignRequest * light-fetch: Differentiate between out-of-gas/manual throw and use required gas from response on failure (#9824) * fix start_gas, handle OOG exceptions & NotEnoughGas * Change START_GAS: 50_000 -> 60_000 * When the `OutOfGas exception` is received then try to double the gas until it succeeds or block gas limit is reached * When `NotEnoughBasGas error` is received then use the required gas provided in the response * fix(light-fetch): ensure block_gas_limit is tried Try the `block_gas_limit` before regard the execution as an error * Update rpc/src/v1/helpers/light_fetch.rs Co-Authored-By: niklasad1 <[email protected]> * simplify cargo audit * Use block header for building finality (#9914) * ci: nuke the gitlab caches (#9855)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #9709 - Allow OS to set port instead of random port