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

test/rgw: use mock OpsLogSink instead of OpsLogSocket #45815

Merged
merged 2 commits into from Apr 11, 2022
Merged

test/rgw: use mock OpsLogSink instead of OpsLogSocket #45815

merged 2 commits into from Apr 11, 2022

Conversation

cbodley
Copy link
Contributor

@cbodley cbodley commented Apr 7, 2022

resolves 'make check' failures in unittest_rgw_lua:

[ RUN      ] TestRGWLua.OpsLog
unix socket connect error: 2
../src/test/rgw/test_rgw_lua.cc:682: Failure
Value of: unix_socket_client_ended_ok
  Actual: false
Expected: true
[  FAILED  ] TestRGWLua.OpsLog (9240 ms)

Fixes: https://tracker.ceph.com/issues/55232

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 yuvalif April 7, 2022 17:12
@cbodley
Copy link
Contributor Author

cbodley commented Apr 7, 2022

strange linker error from 'make check':

[2260/2517] Linking CXX executable bin/unittest_rgw_lua
FAILED: bin/unittest_rgw_lua
: && /usr/bin/ccache /usr/bin/clang++-10 -g -Werror -Wl,--export-dynamic src/test/rgw/CMakeFiles/unittest_rgw_lua.dir/test_rgw_lua.cc.o -o bin/unittest_rgw_lua -Wl,-rpath,/opt/ceph/lib/x86_64-linux-gnu:/home/jenkins-build/build/workspace/ceph-pull-requests/build/lib lib/libgmock_maind.a lib/libgmockd.a lib/libgtestd.a -lpthread -ldl lib/librgw_a.a (...):
/usr/bin/ld: lib/librgw_common.a(rgw_lua_request.cc.o): in function rgw::lua::request::RequestLog(lua_State*)': /home/jenkins-build/build/workspace/ceph-pull-requests/build/../src/rgw/rgw_lua_request.cc:32: undefined reference to rgw_log_op(RGWREST*, req_state*, std::__cxx11::basic_string<char, std::char_traits, std::allocator > const&, OpsLogSink*)'

rgw_log_op() is defined in rgw_log.cc, which is part of target librgw_a which does show up on this link line

@cbodley
Copy link
Contributor Author

cbodley commented Apr 7, 2022

the 'ceph API tests' succeeded here with gcc-9.3, but both 'make check's failed with clang-10

@cbodley cbodley force-pushed the wip-55232 branch 2 times, most recently from b71dd11 to e4a970f Compare April 7, 2022 20:28
@cbodley
Copy link
Contributor Author

cbodley commented Apr 8, 2022

jenkins test make check

@cbodley
cmake: move rgw_lua_request.cc from rgw_common target to rgw_a
25393f6 
resolves a clang linker error where `rgw::lua::request::RequestLog()`
from rgw_lua_request.cc (in rgw_common) looks for `rgw_log_op()` from
rgw_log.cc (in rgw_a)

rgw_a depends on rgw_common, not the other way around. so this moves
rgw_lua_request.cc into the same target as rgw_log.cc

lua is now a public dependency of rgw_common so it's not hidden from
rgw_a or unit tests

Signed-off-by: Casey Bodley <cbodley@redhat.com>
@cbodley cbodley merged commit 52a8345 into ceph:master Apr 11, 2022
@cbodley cbodley deleted the wip-55232 branch April 11, 2022 16:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yuvalif yuvalif yuvalif approved these changes

Assignees
No one assigned
Labels
build/ops rgw tests
Projects
None yet
Milestone
No milestone
2 participants
@cbodley @yuvalif