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

osd: zipkin tracing #14305

Merged
merged 32 commits into from May 5, 2017

Conversation

Projects
None yet
10 participants
@liewegas
Member

liewegas commented Apr 3, 2017

These are just the librados and osd patches. The librbd pieces still need to be rebased (and that will likely be a bit painful).

@liewegas

This comment has been minimized.

Member

liewegas commented Apr 4, 2017

retest this please

1 similar comment
@liewegas

This comment has been minimized.

Member

liewegas commented Apr 4, 2017

retest this please

@cbodley

This comment has been minimized.

Contributor

cbodley commented Apr 7, 2017

@liewegas i found this cmake commit cbodley@5e5ef94 that somehow got dropped from the previous pr

@liewegas

This comment has been minimized.

Member

liewegas commented Apr 8, 2017

retest this please

@liewegas

This comment has been minimized.

@liewegas

This comment has been minimized.

Member

liewegas commented Apr 11, 2017

https://jenkins.ceph.com/job/ceph-dev-new-build/ARCH=x86_64,AVAILABLE_ARCH=x86_64,AVAILABLE_DIST=centos7,DIST=centos7,MACHINE_SIZE=huge/2516//consoleFull

-- Found PythonInterp: /usr/bin/python2.7 (found suitable version "2.7.5", minimum required is "2") 
-- Found PythonLibs: /usr/lib64/libpython2.7.so (found suitable version "2.7.5", minimum required is "2") 
-- Found Python3Interp: /usr/bin/python3 (found suitable version "3.4.3", minimum required is "3") 
-- Found Python3Libs: /usr/lib64/libpython3.4m.so (found suitable version "3.4.3", minimum required is "3") 
CMake Error at src/blkin/blkin-lib/CMakeLists.txt:9 (target_compile_options):
  Unknown CMake command "target_compile_options".


-- Configuring incomplete, errors occurred!
error: Bad exit status from /var/tmp/rpm-tmp.Ttf5Cq (%build)


RPM build errors:
    Bad exit status from /var/tmp/rpm-tmp.Ttf5Cq (%build)
@liewegas

This comment has been minimized.

Member

liewegas commented Apr 11, 2017

on centos only...

@cbodley

This comment has been minimized.

Contributor

cbodley commented Apr 12, 2017

@liewegas ceph/blkin#3 should fix that Unknown CMake command "target_compile_options". error

find_package(blkin REQUIRED)
include_directories(${BLKIN_INCLUDE_DIR})
set(BLKIN_LIBRARIES blkin lttng-ust)
include_directories(src/blkin/blkin-lib)

This comment has been minimized.

@tchaikov

tchaikov Apr 14, 2017

Contributor

can we add blkin as an external project, so its targets won't be populated into ceph's cmake targets, and "make install" won't include the blkin?

@alimaredia

This comment has been minimized.

Contributor

alimaredia commented Apr 14, 2017

@yuriw

This comment has been minimized.

Contributor

yuriw commented Apr 18, 2017

  • branch wip-zipkin-partial -> FETCH_HEAD
    Auto-merging src/osdc/Objecter.h
    Auto-merging src/osd/ReplicatedBackend.cc
    Auto-merging src/osd/PrimaryLogPG.cc
    Auto-merging src/osd/PG.h
    Auto-merging src/osd/PG.cc
    Auto-merging src/osd/OSD.h
    Auto-merging src/osd/OSD.cc
    Auto-merging src/osd/ECBackend.cc
    Auto-merging src/os/filestore/FileStore.cc
    Auto-merging src/common/config_opts.h
    Auto-merging src/CMakeLists.txt
    Auto-merging .gitmodules
    CONFLICT (content): Merge conflict in .gitmodules
    Automatic merge failed; fix conflicts and then commit the result.

@liewegas fyi

cbodley and others added some commits Aug 25, 2015

blkin: osd op messages carry trace information
Signed-off-by: Casey Bodley <cbodley@redhat.com>
blkin: set up tracing in the OSD
Signed-off-by: Casey Bodley <cbodley@redhat.com>
blkin: add traces to ReplicatedBackend
Signed-off-by: Casey Bodley <cbodley@redhat.com>
blkin: set up tracing in PGs
Signed-off-by: Casey Bodley <cbodley@redhat.com>
blkin: add traces to FileStore/Journal
Signed-off-by: Casey Bodley <cbodley@redhat.com>
filestore: Initialize Zipkin traces when there is a store trace
Avoids creating orphaned traces.

Signed-off-by: Victor Araujo <ve.ar91@gmail.com>
blkin: add traces to ECBackend
Signed-off-by: Casey Bodley <cbodley@redhat.com>
blkin: add traces to librados and Objecter
Signed-off-by: Casey Bodley <cbodley@redhat.com>
blkin: add config variable osd_blkin_trace_all
when set, Message::decode_trace() will always create a trace for
incoming messages, even if they didn't pass trace information

Signed-off-by: Casey Bodley <cbodley@redhat.com>
blkin: add config variable osdc_blkin_trace_all
Signed-off-by: Casey Bodley <cbodley@redhat.com>
cmake: Add blkin libs to target_link_libraries
Signed-off-by: Victor Araujo <ve.ar91@gmail.com>
cmake: build blkin instead of using find_package
Signed-off-by: Casey Bodley <cbodley@redhat.com>
librados: Overload aio_operate with blkin trace info parameter
This will enable passing trace information from rbd to librados for
aio_reads and aio_writes.

Signed-off-by: Victor Araujo <ve.ar91@gmail.com>
src/blkin: add blkin submodule
Signed-off-by: Sage Weil <sage@redhat.com>
CMakeLists.txt: default WITH_BLKIN=ON
Signed-off-by: Sage Weil <sage@redhat.com>
CMakeLists.txt: fix libcommon link to blkin
Signed-off-by: Sage Weil <sage@redhat.com>
msg/Message: make {encode,decode}_trace unconditional
These are protocol features and cannot vary based on our compilation.
Encode and decode unconditionally.  The callers have already guarded these
field additions with a message version bump and are conditionally calling
decode_trace.

Signed-off-by: Sage Weil <sage@redhat.com>
common/zipkin_trace: fix blkin_trace_info encoding
- encode the same regardless of whether it is compiled in (!)
- encode in endian- and struct alignment-safe way.

Signed-off-by: Sage Weil <sage@redhat.com>
blkin: drop boost dependency
Signed-off-by: Sage Weil <sage@redhat.com>
blkin: fix -fPIC option
Signed-off-by: Sage Weil <sage@redhat.com>
blkin: remove installed files
Signed-off-by: Sage Weil <sage@redhat.com>
blkin: fix cmake compile options
Signed-off-by: Sage Weil <sage@redhat.com>
blkin: fix test
Signed-off-by: Sage Weil <sage@redhat.com>
CMakeLists.txt: WITH_BLKIN off for now
We are unconditionally linking lttng-ust, which make selinux complain. We
should either

 - fix selinux rules and unconditionally link
 - dlopen at runtime based on an option (like we do for the current
   tracepoints)
 - ???

Signed-off-by: Sage Weil <sage@redhat.com>

@liewegas liewegas merged commit 425769f into ceph:master May 5, 2017

2 of 3 checks passed

Unmodifed Submodules Approval needed: modified submodules found
Details
Signed-off-by all commits in this PR are signed
Details
default Build finished.
Details

@liewegas liewegas deleted the liewegas:wip-zipkin-partial branch May 5, 2017

@wjwithagen

This comment has been minimized.

Contributor

wjwithagen commented May 26, 2017

@liewegas
@tchaikov

I can not fully fathom the discussion above, but ....

This introduces again the target_link_libraries(common ...)
And with the libreplacements that are already in us for things like resolv.
(Which FreeBSD does not have)

I'm assuming this addition is purposely, even though Kefu tried that to get ceph-common going?

If this is not an oversight and this needs to stay, I'll submit a PR that fixes certain of these references.
Otherwise we should remove it, since Cmake does not have a problem with it being commented out.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment