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.

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

rgw: build async scheduler only when beast is built #26634

Merged
merged 3 commits into from Mar 25, 2019

Conversation

Projects
None yet
5 participants
@theanalyst
Copy link
Member

commented Feb 25, 2019

Fix ftbs for platforms not having boost_context and following the pattern we use everywhere else when using boost_context

Signed-off-by: Abhishek Lekshmanan abhishek@suse.com

  • References tracker ticket
  • Updates documentation if necessary
  • Includes tests for new functionality or reproducer for bug

@theanalyst theanalyst requested review from cbodley and smithfarm Feb 25, 2019

@batrick batrick added the rgw label Feb 25, 2019

@theanalyst theanalyst force-pushed the theanalyst:scheduler-beast-ctx branch from bbf2623 to 9e22659 Feb 26, 2019

@smithfarm

This comment has been minimized.

Copy link
Contributor

commented Feb 26, 2019

@theanalyst Can you look at the make check failure? The build fails at:

[ 97%] Linking CXX executable ../../../bin/unittest_rgw_dmclock_scheduler

due to undefined symbols in test_rgw_dmclock_scheduler.cc.o

@smithfarm

This comment has been minimized.

Copy link
Contributor

commented Feb 26, 2019

@theanalyst theanalyst force-pushed the theanalyst:scheduler-beast-ctx branch from 9e22659 to 5c14c60 Feb 27, 2019

@smithfarm

This comment has been minimized.

Copy link
Contributor

commented Mar 4, 2019

@theanalyst Should the PR title be changed to "rgw: build async scheduler only when beast is built"?

@smithfarm

This comment has been minimized.

Copy link
Contributor

commented Mar 4, 2019

@cbodley This is ready for re-review? I'm testing the s390x build now.

@theanalyst theanalyst changed the title rgw: dmclock: async scheduler: wrap yield_ctx around ifdefs rgw: build async scheduler only when beast is built Mar 4, 2019

@cbodley

cbodley approved these changes Mar 4, 2019

@smithfarm smithfarm added this to the nautilus milestone Mar 4, 2019

@theanalyst theanalyst force-pushed the theanalyst:scheduler-beast-ctx branch from d4d6657 to 7d52f4b Mar 12, 2019

@@ -140,7 +140,7 @@ add_ceph_unittest(unittest_rgw_string)
# unitttest_rgw_dmclock_queue
add_executable(unittest_rgw_dmclock_scheduler test_rgw_dmclock_scheduler.cc $<TARGET_OBJECTS:unit-main>)
add_ceph_unittest(unittest_rgw_dmclock_scheduler)
target_link_libraries(unittest_rgw_dmclock_scheduler ${rgw_libs} dmclock ${Boost_LIBRARIES})
target_link_libraries(unittest_rgw_dmclock_scheduler radosgw_a dmclock ${Boost_LIBRARIES})

This comment has been minimized.

Copy link
@cbodley

cbodley Mar 12, 2019

Contributor

note the changes from #26799, which removed ${Boost_LIBRARIES}. does it link without the dmclock bit too?

This comment has been minimized.

Copy link
@theanalyst

theanalyst Mar 12, 2019

Author Member

checking. I just added another commit as librgw includes were not linking dmclock, ceph_test_librgw_file_marker was failing.

theanalyst added some commits Mar 12, 2019

rgw: build async scheduler only when beast is built
As it depends on yield and other asio constructs don't build if beast frontend
isn't built

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
rgw: test_dmclock_scheduler: conditionalize tests with boost ctx
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
librgw: expose dmclock linkage
As files that include librgw will fail to build with include errors otherwise

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>

@theanalyst theanalyst force-pushed the theanalyst:scheduler-beast-ctx branch from 7d52f4b to dc06e21 Mar 12, 2019

@liewegas liewegas removed this from the nautilus milestone Mar 18, 2019

@liewegas

This comment has been minimized.

Copy link
Member

commented Mar 18, 2019

This didn't merge before nautilus, and there's no tracker ticket, so someone will need to remember to backport this if it is needed for nautilus.

@liewegas

This comment has been minimized.

Copy link
Member

commented Mar 18, 2019

(also, can it merge now?)

@theanalyst

This comment has been minimized.

@smithfarm

This comment has been minimized.

Copy link
Contributor

commented Mar 25, 2019

(also, can it merge now?)

Yes, please?

@cbodley cbodley merged commit 9ebea28 into ceph:master Mar 25, 2019

5 checks passed

Docs: build check OK - docs built
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details
make check (arm64) make check succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.