Skip to content

asio: drop BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT#50064

Closed
cbodley wants to merge 37 commits intoceph:wip-coro-after-reeffrom
cbodley:wip-asio-no-ts-executors
Closed

asio: drop BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT#50064
cbodley wants to merge 37 commits intoceph:wip-coro-after-reeffrom
cbodley:wip-asio-no-ts-executors

Conversation

@cbodley
Copy link
Contributor

@cbodley cbodley commented Feb 10, 2023 •
edited
Loading

note that this PR targets the wip-coro-after-reef feature branch

this BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT define was added for backward compatibility before boost 1.74:

https://www.boost.org/doc/libs/1_74_0/doc/html/boost_asio/std_executors.html

this PR replaces all the stuff that depended on ts executors, and adds BOOST_ASIO_NO_TS_EXECUTORS to verify that

this also requires changes to the spawn submodule pending in cbodley/spawn#8

as future work, we can use boost 1.81's type-erased any_completion_handler to replace ceph::async::Completion

Show available Jenkins commands
  • jenkins retest this please
  • jenkins test classic perf
  • jenkins test crimson perf
  • jenkins test signed
  • jenkins test make check
  • jenkins test make check arm64
  • jenkins test submodules
  • jenkins test dashboard
  • jenkins test dashboard cephadm
  • jenkins test api
  • jenkins test docs
  • jenkins render docs
  • jenkins test ceph-volume all
  • jenkins test ceph-volume tox
  • jenkins test windows

@cbodley cbodley requested a review from adamemerson February 10, 2023 00:13
@cbodley cbodley force-pushed the wip-asio-no-ts-executors branch 4 times, most recently from 4e05e56 to e1f81cb Compare February 10, 2023 17:31
@github-actions github-actions bot added the rbd label Feb 10, 2023
@cbodley cbodley force-pushed the wip-asio-no-ts-executors branch from e1f81cb to ecb2c94 Compare February 10, 2023 19:55
@github-actions github-actions bot added the tests label Feb 10, 2023
@cbodley cbodley force-pushed the wip-asio-no-ts-executors branch from ecb2c94 to 2f13b02 Compare February 10, 2023 20:29
@cbodley
Copy link
Contributor Author

cbodley commented Feb 10, 2023

by adding the cmake commit last, i was able to verify that all of the code changes compile in both cases: with BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT, and with BOOST_ASIO_NO_TS_EXECUTORS

note that there's a clang error on wip-coro-after-reef, fixed by commit common/async: add co_waiter::op_cancellation ctor for clang from #50005

@cbodley cbodley marked this pull request as ready for review February 10, 2023 22:25
@cbodley cbodley requested review from a team as code owners February 10, 2023 22:25
@cbodley cbodley force-pushed the wip-asio-no-ts-executors branch from 2f13b02 to 3689e1b Compare February 14, 2023 16:35
@cbodley
Copy link
Contributor Author

cbodley commented Feb 14, 2023

this also requires changes to the spawn submodule pending in cbodley/spawn#8

these changes merged to ceph/spawn.git, so i added a commit to pull up the spawn submodule. i also verified that it compiles both with/without the final cmake commit

@adamemerson
build: Bump boost to 1.81
39abb3e 
Needed to fix coroutine detection under Clang

TODO: update boost package sha1 in install-deps.sh when we have
packages uploaded

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
@adamemerson
neorados: Remove 'broken out' versions of calls
270ffb4 
Previously we had versions of all the calls that took an int64_t and
optional key and namespace.

This didn't really offer much benefit and doubled the maintenance
burden for changing anything.

As such just make the IOContext constructor non-explicit, and make all
its mutators return the same IOContext so people can supply them
builder-style if they want to.

Also don't wrap things in 'optional' when the underlying library
doesn't. The callers just end up having to wrap and unwrap with
value-or repeatedly.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
@adamemerson
neorados: Switch to async_initiate
2e9b69c 
This form of completion handling is compatible with C++20 Completions
and generally more flexible stuff.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
@adamemerson
neorados: Don't call dispatch inside with_osdmap
9d7690a 
The lock will continue to be held over the 'dispatch' with C++20
coroutines.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
@adamemerson
neorados: Ensure we don't have dangling references
07ecb4f 
Apparently in some cases we were using references to objects on the
caller stack that happen to no longer exist if the caller's stack goes
away.

C++20 Coroutines tickled this bug.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
@adamemerson
neorados: Fix logic error in exerciser
2edce78 
Use `min` rather than `max` when deciding how much we need to read in
`read()`.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
@adamemerson
neorados: Use C++20 Coroutines in exerciser/demo
2a27649 
Just as a demonstration to see how well they work and how to put
things together with them.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
@adamemerson
cls/version: Move obj_version printer to cls_version_types.h
e535e17 
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
@adamemerson
cls/version: Add non-default constructor
53829bd 
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
@adamemerson
common/async: Don't get allocator from moved-from handler
03fe808 
In the `destroy_` functions of `CompletionImpl` we were getting the
associated allocator after moving out of the handler into the call to
`bind_and_forward`. This was triggering a crash on null-pointer access
in operations made with `co_composed`.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
adamemerson and others added 11 commits February 14, 2023 12:52
@adamemerson
cls/log: Switch from utime_t to ceph::real_time
109d073 
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
@adamemerson
cls/log: C++ namespaces exist
084c5ce 
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
@adamemerson
neorados/cls: cls::exec handles tuples properly
6684ebb 
If our decoder function returns a tuple of multiple values, flatten it
so our signature is `void(error_code, T, U, V)` not
`void(error_code, std::tuple<T, U, V>)`.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
@adamemerson
osdc: Catch exceptions thrown in CLS client decoders
7e8a980 
And return them to the client by setting the error cod and result in
the vector and returning an error from the operation as a whole.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
@adamemerson
neorados/cls/version: Don't swallow exceptions
dd71051 
Since they can be reported now, report them

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
@adamemerson
neorados/cls: Client for log objclass
0eda6bc 
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
@cbodley @adamemerson
common/async: move service out of detail
f53946d 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
@cbodley @adamemerson
common/async: add co_waiter class template
6aa74a0 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
@cbodley @adamemerson
common/async: co_throttle_impl uses co_waiter
8b037e5 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
@cbodley @adamemerson
rgw/sync: add with_lease() with polymorphic LockClient
fe1b1f5 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
@cbodley @adamemerson
rgw/sync: wrap lease renewal exceptions in lease_aborted
9ceab5f 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
@adamemerson adamemerson requested a review from a team as a code owner February 14, 2023 19:06
@cbodley
osdc: replace asio::io_context::strand with asio::strand<>
8023020 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
@cbodley
common/async: completion uses free functions for defer/dispatch/post
ed07d58 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
@cbodley
common/async: SharedMutex uses free function post
5b6108d 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
@cbodley
neorados: use strand template and make_strand()
714d3c2 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
@cbodley
librbd: use strand template and make_strand()
4bc3bea 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
@cbodley
test/common: test_blocked_completion uses boost::asio::post()
0733a5e 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
@cbodley
submodule: update spawn submodule for any_io_executor
d2cb5d0 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
@cbodley
cmake: drop BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT
5af6a41 
this define was added for backward compatibility before boost 1.74

https://www.boost.org/doc/libs/1_74_0/doc/html/boost_asio/std_executors.html

Signed-off-by: Casey Bodley <cbodley@redhat.com>
@cbodley cbodley force-pushed the wip-asio-no-ts-executors branch from 3689e1b to 5af6a41 Compare February 15, 2023 20:12
@cbodley cbodley mentioned this pull request Feb 28, 2023
Closed
@github-actions
Copy link

github-actions bot commented Feb 28, 2023

This pull request can no longer be automatically merged: a rebase is needed and changes have to be manually resolved

@cbodley
Copy link
Contributor Author

cbodley commented Mar 1, 2023

merged into #49737

@cbodley cbodley closed this Mar 1, 2023
This was referenced Jul 10, 2023
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@adamemerson adamemerson adamemerson approved these changes

Assignees

No one assigned

Labels

build/ops common core mon needs-rebase rbd tests

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@cbodley @adamemerson