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.

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

Jump to bottom

chore: Fix CI for Tokio 1.0 PR #6926

Closed
wants to merge 131 commits into from
Closed

chore: Fix CI for Tokio 1.0 PR #6926

wants to merge 131 commits into from

Conversation

pablosichert
Copy link
Contributor

These is a playground to see what changes are needed to fix the CI for #5872.

lukesteensen and others added 30 commits January 5, 2021 17:56
@lukesteensen
chore: begin upgrade to tokio 1.0.0
dcbd76d 
Some of the things left to do:

- [ ] Move to the new `tokio-openssl` API
- [ ] Figure out new way to do socket shutdown and keepalive
- [ ] Work around no `poll_ready` on new tokio channels for `Pipeline`
- [ ] General updates and cleanup

And some dependencies we're still waiting on upgrades from:

- [ ] `warp`
- [ ] `rusoto`
- [ ] `rdkafka`
- [ ] `bollard`
- [ ] `mongodb`

This is not a complete list, but covers most of the big ones I've run
into so far.

Signed-off-by: Luke Steensen <luke.steensen@gmail.com>
@lukesteensen
pin sleeps
03000da 
Signed-off-by: Luke Steensen <luke.steensen@gmail.com>
@lukesteensen
fix AsyncRead usage
3825dc5 
Signed-off-by: Luke Steensen <luke.steensen@gmail.com>
@lukesteensen
remove hyper patch and stop using Resolver for http client
28d64ba 
Signed-off-by: Luke Steensen <luke.steensen@gmail.com>
@lukesteensen
bump more deps
0ccb1ef 
Signed-off-by: Luke Steensen <luke.steensen@gmail.com>
@lukesteensen
replace some usages of incoming
939d953 
Signed-off-by: Luke Steensen <luke.steensen@gmail.com>
@lukesteensen
update tokio-openssl api usage
8caea51 
Signed-off-by: Luke Steensen <luke.steensen@gmail.com>
@lukesteensen
try experimental sink alternative for socket source
8ac1d19 
Signed-off-by: Luke Steensen <luke.steensen@gmail.com>
@lukesteensen
temporarily comment out socket shutdown and keepalive
d52a8ee 
Signed-off-by: Luke Steensen <luke.steensen@gmail.com>
@lukesteensen
more crate upgrades
e9e9eb6 
Signed-off-by: Luke Steensen <luke.steensen@gmail.com>
@lukesteensen
more crate upgrades
f814f70 
Signed-off-by: Luke Steensen <luke.steensen@gmail.com>
@pablosichert
Merge remote-tracking branch 'origin/master' into tokio-1.0
fa0ad7b 
Signed-off-by: Pablo Sichert <mail@pablosichert.com>
@pablosichert
Upgrade to rdkafka 0.25.0
f7b4ca7 
Signed-off-by: Pablo Sichert <mail@pablosichert.com>
@pablosichert
Fix more compiler errors
07b19c1 
Signed-off-by: Pablo Sichert <mail@pablosichert.com>
@pablosichert
Remove bytes 0.5
f6fee83 
Signed-off-by: Pablo Sichert <mail@pablosichert.com>
@pablosichert
Fix more compiler errors
750d747 
Signed-off-by: Pablo Sichert <mail@pablosichert.com>
@pablosichert
Merge remote-tracking branch 'origin/master' into tokio-1.0
4de48b1 
Signed-off-by: Pablo Sichert <mail@pablosichert.com>
@pablosichert
Fix futures not being Send
6296f2a 
Signed-off-by: Pablo Sichert <mail@pablosichert.com>
@pablosichert
Fix incorrect future type
ba6c205 
Signed-off-by: Pablo Sichert <mail@pablosichert.com>
@pablosichert
Resolve Send/Sync issues in futures
e47e0b1 
Signed-off-by: Pablo Sichert <mail@pablosichert.com>
@pablosichert
Fix usage of rdkafka error code
5a3d0e9 
Signed-off-by: Pablo Sichert <mail@pablosichert.com>
@pablosichert
Upgrade to bollard 0.10.1
4e95a98 
Signed-off-by: Pablo Sichert <mail@pablosichert.com>
@pablosichert
Upgrade to prost 0.7.0 in libraries
2bbbc0c 
Signed-off-by: Pablo Sichert <mail@pablosichert.com>
@pablosichert
Add missing unwrap
b256879 
Signed-off-by: Pablo Sichert <mail@pablosichert.com>
@pablosichert
Remove unneeded mut
8ec9907 
Signed-off-by: Pablo Sichert <mail@pablosichert.com>
@pablosichert
Remove unused imports
49dd1f0 
Signed-off-by: Pablo Sichert <mail@pablosichert.com>
@pablosichert
cargo fmt
df0b50b 
Signed-off-by: Pablo Sichert <mail@pablosichert.com>
@pablosichert
Fix moved value in future
51ddbaa 
Signed-off-by: Pablo Sichert <mail@pablosichert.com>
@pablosichert
Fix set_receive_buffer_size on TCP stream
8cdcd5b 
Signed-off-by: Pablo Sichert <mail@pablosichert.com>
@pablosichert
Fix tokio delay_for -> sleep
0b2f0a0 
Signed-off-by: Pablo Sichert <mail@pablosichert.com>
@pablosichert
Additionally constrain number of blocking threads
1e6e0ba 
Signed-off-by: Pablo Sichert <mail@pablosichert.com>
@pablosichert
Remove unnecessary namespace qualifiers
1ee64e6 
Signed-off-by: Pablo Sichert <mail@pablosichert.com>
@pablosichert
Remove intermediate variables
4465235 
Signed-off-by: Pablo Sichert <mail@pablosichert.com>
@pablosichert
Remove explicitly passing number of threads (done by default)
fbf1860 
Signed-off-by: Pablo Sichert <mail@pablosichert.com>
@pablosichert
Don't explicitly poll flush before shutdown (done implicitly)
efac5c3 
Signed-off-by: Pablo Sichert <mail@pablosichert.com>
@pablosichert
Merge remote-tracking branch 'origin/master' into tokio-1.0
2cf9032 
Signed-off-by: Pablo Sichert <mail@pablosichert.com>
@pablosichert
Enable "warp" dependency with "api" feature
ddfbbe7 
Signed-off-by: Pablo Sichert <mail@pablosichert.com>
@pablosichert
Replace stream! invocations with appropriate stream wrappers
fbb5a32 
Signed-off-by: Pablo Sichert <mail@pablosichert.com>
@pablosichert
Attempt to fix CI builds by limiting the number of forks
aaaf51e 
Signed-off-by: Pablo Sichert <mail@pablosichert.com>
@pablosichert
Write to stdout before waiting for child process
2bfa98f 
Signed-off-by: Pablo Sichert <mail@pablosichert.com>
@pablosichert
Rerun build
fe5d824 
Signed-off-by: Pablo Sichert <mail@pablosichert.com>
@pablosichert
Don't explicitly copy to stdout (done by default)
7c4d0fb 
Signed-off-by: Pablo Sichert <mail@pablosichert.com>
@pablosichert
Add timeout when waiting for child process
c9c1315 
Signed-off-by: Pablo Sichert <mail@pablosichert.com>
@pablosichert
Increase timeout
9b6b302 
Signed-off-by: Pablo Sichert <mail@pablosichert.com>
@pablosichert
Increase timeout
821131b 
Signed-off-by: Pablo Sichert <mail@pablosichert.com>
@pablosichert
Increase timeout
ff03606 
Signed-off-by: Pablo Sichert <mail@pablosichert.com>
@pablosichert
Spawn runtime with default number of threads in forked tests
29b6836 
Signed-off-by: Pablo Sichert <mail@pablosichert.com>
@pablosichert
Add print statements to api_graphql_component_removed_subscription
b061785 
Signed-off-by: Pablo Sichert <mail@pablosichert.com>
@pablosichert
Add print statements to all API tests
5e58ca0 
Signed-off-by: Pablo Sichert <mail@pablosichert.com>
@pablosichert
Add print statements to utility functions
9eb6c04 
Signed-off-by: Pablo Sichert <mail@pablosichert.com>
@pablosichert
Reset global state instead of emulating forking
c201b8b 
Signed-off-by: Pablo Sichert <mail@pablosichert.com>
@pablosichert pablosichert mentioned this pull request Apr 1, 2021
Closed
Base automatically changed from tokio-1.0 to master April 2, 2021 04:31
@binarylogic
Copy link
Contributor

@pablosichert is this still needed?

@jszwedko jszwedko mentioned this pull request Apr 2, 2021
Open
@pablosichert
Copy link
Contributor Author

Yep, not needed anymore.

For future investigation: This PR was previously aimed towards the tokio-1.0 branch, now that the branch is merged/deleted, GitHub automatically switched to merge to the master branch and includes all old commits from the tokio-1.0 branch.

The only interesting commit here is c201b8b, where rusty_fork was replaced with cleaning up global state.

@pablosichert pablosichert deleted the tokio-1.0-CI-fix branch April 3, 2021 19:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@pablosichert @binarylogic @leebenson @lukesteensen @bruceg