Migrate from async-std to tokio #169
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
|
@evshary it seems a merge conflict recently appeared. |
Mallets
reviewed
Jul 31, 2024
v2/src/lib.rs
Outdated
| create_db(&self.admin_client, &creds.org_id, &db).await | ||
| }) { | ||
| match TOKIO_RUNTIME | ||
| .block_on(async { create_db(&self.admin_client, &creds.org_id, &db).await }) |
There was a problem hiding this comment.
block_on should as well try to get current runtime in the same way as done for spawn.
|
See eclipse-zenoh/zenoh#1264 for runtime sharing discussion |
Signed-off-by: ChenYing Kuo <[email protected]>
evshary
force-pushed
the
use_tokio_for_backends
branch
from
b0a4eee to
c075309
Compare
Signed-off-by: ChenYing Kuo <[email protected]>
evshary
force-pushed
the
use_tokio_for_backends
branch
from
c075309 to
37eb81f
Compare
Mallets
approved these changes
Aug 6, 2024
Mallets
added a commit
that referenced
this pull request
Aug 30, 2024
* chore: Sync Rust toolchain * Update influxdb to use Zenoh 1.0.0 (#130) * build: Sync with eclipse-zenoh/zenoh@25f06bd from 2024-05-21 (#119) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@3118d31 from 2024-05-28 (#120) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@009f666 from 2024-05-30 (#122) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@d574654 from 2024-06-03 (#123) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@c279982 from 2024-06-05 (#124) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@d8e66de from 2024-06-10 (#125) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@9d09742 from 2024-06-11 (#126) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@ed6c636 from 2024-06-12 (#127) Co-authored-by: eclipse-zenoh-bot <[email protected]> * Update v1 to use zenoh v1.0.0 * Update V2 to use zenoh v1.0.0 * fmt * Remove internal zenoh Crates from dependencies * plugins in Cargo.Toml * Cleanup * remove TODO, add comments * Use New API for deserializing payload --------- Co-authored-by: eclipse-zenoh-bot <[email protected]> Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@65e5df7 from 2024-06-21 (#138) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@a6d117b from 2024-06-21 (#139) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@2b16fed from 2024-06-25 (#140) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@e1beef1 from 2024-06-25 (#141) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@fc18f90 from 2024-06-26 (#142) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@1790d59 from 2024-06-26 (#143) Co-authored-by: eclipse-zenoh-bot <[email protected]> * chore: bump zenoh version (#144) * chore: bump zenoh version * chore: update branch * build: Sync with eclipse-zenoh/zenoh@e021d0d from 2024-07-03 (#148) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@54d12e1 from 2024-07-05 (#153) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@c7e418f from 2024-07-05 (#154) Co-authored-by: eclipse-zenoh-bot <[email protected]> * remove timestamp generation for unimplemented function (#150) * build: Sync with eclipse-zenoh/zenoh@cae8697 from 2024-07-05 (#155) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@6df74c7 from 2024-07-07 (#156) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@12b11ee from 2024-07-08 (#157) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@9e1c4a8 from 2024-07-08 (#159) Co-authored-by: eclipse-zenoh-bot <[email protected]> * chore: Sync Rust toolchain * chore: Sync Rust toolchain * build: Sync with eclipse-zenoh/zenoh@4827f39 from 2024-07-24 (#163) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@0c43c08 from 2024-07-25 (#166) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@32bdded from 2024-07-26 (#167) Co-authored-by: eclipse-zenoh-bot <[email protected]> * Update README: remove leading `/` - new key format * build: Sync with eclipse-zenoh/zenoh@502d3be from 2024-07-30 (#172) Co-authored-by: eclipse-zenoh-bot <[email protected]> * Fix/createdb (#162) fix: createdb not functioning due to missing application/json header in request implement: get_all_entries function of Storage Trait for InfluxDbStorage Also there are logic + safety + code quality improvements * build: Sync with eclipse-zenoh/zenoh@5d09cf7 from 2024-08-01 (#174) Co-authored-by: eclipse-zenoh-bot <[email protected]> * Merge main into dev/1.0.0 (#175) * Update README: remove leading `/` - new key format * Merge branch main into dev/1.0.0 --------- Co-authored-by: zettascale-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@b1e4dba from 2024-08-05 (#178) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@b7d42ef from 2024-08-06 (#179) Co-authored-by: eclipse-zenoh-bot <[email protected]> * Migrate from async-std to tokio (#169) * Migrate from async-std to tokio Signed-off-by: ChenYing Kuo <[email protected]> * Support reusing Runtime if possible. Signed-off-by: ChenYing Kuo <[email protected]> --------- Signed-off-by: ChenYing Kuo <[email protected]> * build: Sync with eclipse-zenoh/zenoh@2d5ab7c from 2024-08-06 (#180) Co-authored-by: eclipse-zenoh-bot <[email protected]> * chore: remove build-resources dir and Cargo.lock (#181) Cargo.lock file wrongly added by the sync lock file workflow. * build: Sync with eclipse-zenoh/zenoh@0e2f78a from 2024-08-14 (#185) Co-authored-by: eclipse-zenoh-bot <[email protected]> * Bump dev version to `1.0.0-dev` (#186) * chore: Bump version to `1.0.0-dev` * chore: Bump /zenoh.*/ dependencies to `1.0.0-dev` * chore: Update Cargo lockfile --------- Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@8b027e9 from 2024-08-22 (#187) Co-authored-by: eclipse-zenoh-bot <[email protected]> * WIP: fix no reactor running when executing task, Dynamic plugin * Add handle check inside show_databases * replace TimedMeasurementDrop with Tokio timeout, Add await_task! to use Plugin Runtime for dyn plugins * remove client clones * replace blocking with task spawn, v1 * remove debug + format * remove return result: schedule measurement drop * remove macro, add comment regarding tokio runtime * Add await_task macro, fix get() call * build: Sync with eclipse-zenoh/zenoh@7f7d648 from 2024-08-28 (#191) Co-authored-by: eclipse-zenoh-bot <[email protected]> * Wrap Client in Arc, Cleanup * replace timeout with sleep * build: Sync with eclipse-zenoh/zenoh@3579f12 from 2024-08-29 (#193) Co-authored-by: eclipse-zenoh-bot <[email protected]> * build: Sync with eclipse-zenoh/zenoh@926208c from 2024-08-29 (#196) Co-authored-by: eclipse-zenoh-bot <[email protected]> * Point to eclipse-zenoh/zenoh branch=main --------- Signed-off-by: ChenYing Kuo <[email protected]> Co-authored-by: eclipse-zenoh-bot <[email protected]> Co-authored-by: eclipse-zenoh-bot <[email protected]> Co-authored-by: C Schleich <[email protected]> Co-authored-by: Joseph Perez <[email protected]> Co-authored-by: zettascale-bot <[email protected]> Co-authored-by: ChenYing Kuo (CY) <[email protected]> Co-authored-by: Diogo Matsubara <[email protected]> Co-authored-by: Michael Ilyin <[email protected]>
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.
Related to eclipse-zenoh/zenoh#1257