[B-03499] update tokio to 0.3 #461
Closed
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
neonphog
reviewed
Nov 3, 2020
neonphog
reviewed
Nov 3, 2020
neonphog
reviewed
Nov 3, 2020
| async fn kvbuf_scratch_and_persistence() -> DatabaseResult<()> { | ||
| let test_env = test_cell_env(); | ||
| let arc = test_env.env(); | ||
| let arc = test_env.env(); |
There was a problem hiding this comment.
why didn't our ci linting code catch this? is this file not being scanned or something?
neonphog
reviewed
Nov 3, 2020
| tokio-tungstenite = { version = "0.10.1", features = [ "tls" ] } | ||
| tokio = { version = "0.3.3", features = [ "full" ] } | ||
| # No tokio 0.3 compatible release yet: https://github.com/snapview/tokio-tungstenite/issues/130 | ||
| tokio-tungstenite = { git = "https://github.com/snapview/tokio-tungstenite.git", rev = "3c6d4280d77fdff3e25f68ad703d94e89f38dae2", features = [ "tls" ] } |
There was a problem hiding this comment.
oo, sneaky - good thing we're not publishing to crates.io yet...
neonphog
reviewed
Nov 3, 2020
| // TODO(steveeJ): investigate whether we need an alternative | ||
| // socket.set_keepalive(Some(std::time::Duration::from_secs( | ||
| // config.tcp_keepalive_s as u64, | ||
| // )))?; |
There was a problem hiding this comment.
if we really need to, we can use net2 https://docs.rs/net2/0.2.35/net2/trait.TcpStreamExt.html#tymethod.set_keepalive_ms to build a std tcp socket, then wrap it in tokio with https://docs.rs/tokio/0.3.3/tokio/net/struct.TcpStream.html#method.from_std
There was a problem hiding this comment.
Though, I guess that won't work for the incoming side...
steveej
force-pushed
the
pr/tokio-0.3
branch
11 times, most recently
from
bccec02
to
f2df0fe
Compare
neonphog
reviewed
Nov 9, 2020
crates/tokio_helper/src/lib.rs
Outdated
Comment on lines
3
to
7
| lazy_static::lazy_static! { | ||
| pub static ref TOKIO: Runtime = { | ||
| new_runtime() | ||
| }; | ||
| } |
There was a problem hiding this comment.
Suggested change
| lazy_static::lazy_static! { | |
| pub static ref TOKIO: Runtime = { | |
| new_runtime() | |
| }; | |
| } | |
| use once_cell::sync::Lazy; | |
| pub static TOKIO: Lazy<Runtime> = Lazy::new(new_runtime); |
once_cell is the new lazy_static! : )
steveej
force-pushed
the
pr/tokio-0.3
branch
3 times, most recently
from
f3568b5
to
eed77e4
Compare
This updates the tokio dependency in all crates to tokio 0.3. The update approach is as mechanical as possible, i.e. it's trying to purely adapt to the changes introduced in tokio 0.3 without unrelated refactors. These out-of-repo dependencies were updated to tokio 0.3 in the process as well: tokio 0.3 compatible versions: * tokio_safe_block_on: * lair A new crate `tokio_helper` was introduced to work around issues with the `updated tokio_safe_block_on`. It provies functionality to use a globally and statically available tokio runtime to be entered from anywhere blocking calls are required. Currently this work is blocked on two dependencies that haven't updated to tokio 0.3 yet: * quinn: used by the `transoprt_quic` crate * reqwest
This was referenced Nov 11, 2020
steveej
added
WIP
blocked
steveej
removed
the
blocked
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This update is as mechanical as possible, i.e. it's trying to purely
adapt to the changes introduced in tokio 0.3 without unrelated
refactors.
Dependencies that need to update to tokio 0.3 before we can cleanly move forward with this:
tokioto 1.0 seanmonstar/reqwest#1060