RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-30 07:19:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6249 from dillaman/wip-13274-infernalis

Browse Source 
LTTng-UST tracing should be dynamically enabled

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
This commit is contained in:
Josh Durgin 2015-10-15 18:07:09 -04:00
commit 28131505b8
37 changed files with 388 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ceph.spec.in
View File

@ -45,6 +45,10 @@ restorecon -R /var/log/ceph > /dev/null 2>&1;
%global _with_systemd 1
%endif
# LTTng-UST enabled on Fedora, RHEL 6, and SLES 12
%if 0%{?fedora} || 0%{?rhel} == 6 || 0%{?suse_version} == 1315
%global _with_lttng 1
%endif
#################################################################################
# common
@ -176,14 +180,16 @@ BuildRequires: boost-random
BuildRequires: python-argparse
%endif
# lttng and babeltrace for rbd-replay-prep
%if 0%{?fedora} || 0%{?rhel} == 6
%if 0%{?_with_lttng}
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: lttng-ust-devel
BuildRequires: libbabeltrace-devel
%endif
%if 0%{?suse_version} == 1315
%if 0%{?suse_version}
BuildRequires: lttng-ust-devel
BuildRequires: babeltrace-devel
%endif
%endif
# expat and fastcgi for RGW
%if 0%{?suse_version}
BuildRequires: libexpat-devel
@ -201,7 +207,6 @@ BuildRequires: python-sphinx10
BuildRequires: python-sphinx
%endif
%description
Ceph is a massively scalable, open-source, distributed storage system that runs
on commodity hardware and delivers object, block and file system storage.
@ -810,6 +815,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/rados-classes/libcls_version.so*
%dir %{_libdir}/ceph/erasure-code
%{_libdir}/ceph/erasure-code/libec_*.so*
%if 0%{?_with_lttng}
%{_libdir}/libos_tp.so*
%{_libdir}/libosd_tp.so*
%endif
%{_udevrulesdir}/60-ceph-partuuid-workaround.rules
%{_udevrulesdir}/95-ceph-osd.rules
%config %{_sysconfdir}/bash_completion.d/ceph
@ -866,7 +875,7 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/rbd
%{_bindir}/rbd-replay
%{_bindir}/rbd-replay-many
%if 0%{?fedora} || 0%{?rhel} == 6 || 0%{?suse_version} == 1315
%if 0%{?_with_lttng}
%{_bindir}/rbd-replay-prep
%endif
%{_bindir}/ceph-post-file
@ -1022,6 +1031,9 @@ fi
%files -n librados2
%defattr(-,root,root,-)
%{_libdir}/librados.so.*
%if 0%{?_with_lttng}
%{_libdir}/librados_tp.so.*
%endif
%post -n librados2
/sbin/ldconfig
@ -1042,6 +1054,9 @@ fi
%{_includedir}/rados/rados_types.hpp
%{_includedir}/rados/memory.h
%{_libdir}/librados.so
%if 0%{?_with_lttng}
%{_libdir}/librados_tp.so
%endif
#################################################################################
%files -n python-rados
@ -1071,6 +1086,9 @@ fi
%files -n librbd1
%defattr(-,root,root,-)
%{_libdir}/librbd.so.*
%if 0%{?_with_lttng}
%{_libdir}/librbd_tp.so.*
%endif
%post -n librbd1
/sbin/ldconfig
@ -1088,6 +1106,9 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
%{_includedir}/rbd/librbd.hpp
%{_includedir}/rbd/features.h
%{_libdir}/librbd.so
%if 0%{?_with_lttng}
%{_libdir}/librbd_tp.so
%endif
#################################################################################
%files -n python-rbd

1
configure.ac
View File

@ -1336,7 +1336,6 @@ AC_CONFIG_FILES([Makefile
src/ocf/ceph
src/ocf/rbd
src/java/Makefile
src/tracing/Makefile
systemd/Makefile
man/Makefile
doc/Makefile

2
debian/ceph.install vendored
View File

@ -16,6 +16,8 @@ usr/lib/python*/dist-packages/ceph_detect_init*
usr/bin/crushtool
usr/bin/monmaptool
usr/bin/osdmaptool
usr/lib/libos_tp.so.*
usr/lib/libosd_tp.so.*
usr/lib/ceph/ceph_common.sh
usr/lib/ceph/erasure-code/*
usr/lib/rados-classes/*

2
debian/librados2.install vendored
View File

@ -1,2 +1,2 @@
usr/lib/librados.so.*
usr/lib/librados_tp.so.*

1
debian/librbd1.install vendored
View File

@ -1 +1,2 @@
usr/lib/librbd.so.*
usr/lib/librbd_tp.so.*

5
src/Makefile-env.am
View File

@ -5,6 +5,7 @@ DIST_SUBDIRS =
BUILT_SOURCES =
EXTRA_DIST =
CLEANFILES =
dist_noinst_DATA =
noinst_HEADERS =
bin_PROGRAMS =
@ -188,10 +189,6 @@ LIBRBD_TYPES = librbd_types.la
LIBKRBD = libkrbd.la
LIBCEPHFS = libcephfs.la
LIBERASURE_CODE = liberasure_code.la
LIBOSD_TP = tracing/libosd_tp.la
LIBRADOS_TP = tracing/librados_tp.la
LIBRBD_TP = tracing/librbd_tp.la
LIBOS_TP = tracing/libos_tp.la
if WITH_LIBAIO
LIBOS += -laio

5
src/Makefile.am
View File

@ -1,7 +1,7 @@
include Makefile-env.am
SUBDIRS += ocf java tracing
DIST_SUBDIRS += gmock ocf java tracing
SUBDIRS += ocf java
DIST_SUBDIRS += gmock ocf java
if NO_GIT_VERSION
export NO_VERSION="yes"
@ -40,6 +40,7 @@ include test/Makefile.am
include tools/Makefile.am
include Makefile-rocksdb.am
include compressor/Makefile.am
include tracing/Makefile.am
# shell scripts

13
src/ceph_osd.cc
View File

@ -33,6 +33,7 @@ using namespace std;
#include "msg/Messenger.h"
#include "common/Timer.h"
#include "common/TracepointProvider.h"
#include "common/ceph_argparse.h"
#include "global/global_init.h"
@ -50,6 +51,15 @@ using namespace std;
#define dout_subsys ceph_subsys_osd
namespace {
TracepointProvider::Traits osd_tracepoint_traits("libosd_tp.so",
"osd_tracing");
TracepointProvider::Traits os_tracepoint_traits("libos_tp.so",
"osd_objectstore_tracing");
} // anonymous namespace
OSD *osd = NULL;
void handle_osd_signal(int signum)
@ -528,6 +538,9 @@ int main(int argc, const char **argv)
global_init_daemonize(g_ceph_context, 0);
common_init_finish(g_ceph_context);
TracepointProvider::initialize<osd_tracepoint_traits>(g_ceph_context);
TracepointProvider::initialize<os_tracepoint_traits>(g_ceph_context);
MonClient mc(g_ceph_context);
if (mc.build_initial_monmap() < 0)
return -1;

6
src/common/Makefile.am
View File

@ -73,7 +73,8 @@ libcommon_internal_la_SOURCES = \
common/module.c \
common/Readahead.cc \
common/Cycles.cc \
common/ContextCompletion.cc
common/ContextCompletion.cc \
common/TracepointProvider.cc
libcommon_internal_la_SOURCES += \
common/blkdev.cc
@ -235,7 +236,8 @@ noinst_HEADERS += \
common/ContextCompletion.h \
common/bit_vector.hpp \
common/SubProcess.h \
common/valgrind.h
common/valgrind.h \
common/TracepointProvider.h
if ENABLE_XIO
noinst_HEADERS += \

28
src/common/Preforker.h
View File

@ -10,9 +10,6 @@
#include <errno.h>
#include <stdlib.h>
#include <unistd.h>
#ifdef WITH_LTTNG
#include <lttng/ust.h>
#endif
#include <sstream>
#include <string>
@ -33,9 +30,6 @@ class Preforker {
pid_t childpid;
bool forked;
int fd[2]; // parent's, child's
#ifdef WITH_LTTNG
sigset_t sigset;
#endif
public:
Preforker()
@ -53,10 +47,6 @@ public:
return r;
}
#ifdef WITH_LTTNG
ust_before_fork(&sigset);
#endif
forked = true;
childpid = fork();
@ -67,9 +57,9 @@ public:
return r;
}
if (childpid == 0) {
child_after_fork();
::close(fd[0]);
} else {
parent_after_fork();
::close(fd[1]);
}
return 0;
}
@ -138,20 +128,6 @@ public:
r += r2; // make the compiler shut up about the unused return code from ::write(2).
}
private:
void child_after_fork() {
#ifdef WITH_LTTNG
ust_after_fork_child(&sigset);
#endif
::close(fd[0]);
}
void parent_after_fork() {
#ifdef WITH_LTTNG
ust_after_fork_parent(&sigset);
#endif
::close(fd[1]);
}
};
#endif

44
src/common/TracepointProvider.cc Normal file
View File

@ -0,0 +1,44 @@
// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
// vim: ts=8 sw=2 smarttab
#include "common/TracepointProvider.h"
#include "common/config.h"
TracepointProvider::TracepointProvider(CephContext *cct, const char *library,
const char *config_key)
: m_cct(cct), m_library(library), m_config_keys{config_key, NULL},
m_lock("TracepointProvider::m_lock"), m_enabled(false) {
m_cct->_conf->add_observer(this);
verify_config(m_cct->_conf);
}
TracepointProvider::~TracepointProvider() {
m_cct->_conf->remove_observer(this);
}
void TracepointProvider::handle_conf_change(
const struct md_config_t *conf, const std::set<std::string> &changed) {
if (changed.count(m_config_keys[0])) {
verify_config(conf);
}
}
void TracepointProvider::verify_config(const struct md_config_t *conf) {
Mutex::Locker locker(m_lock);
if (m_enabled) {
return;
}
char buf[10];
char *pbuf = buf;
if (conf->get_val(m_config_keys[0], &pbuf, sizeof(buf)) != 0 ||
strncmp(buf, "true", 5) != 0) {
return;
}
void *handle = dlopen(m_library.c_str(), RTLD_NOW);
if (handle != NULL) {
m_enabled = true;
}
}

83
src/common/TracepointProvider.h Normal file
View File

@ -0,0 +1,83 @@
// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
// vim: ts=8 sw=2 smarttab
#ifndef CEPH_TRACEPOINT_PROVIDER_H
#define CEPH_TRACEPOINT_PROVIDER_H
#include "include/int_types.h"
#include "common/ceph_context.h"
#include "common/config_obs.h"
#include "common/Mutex.h"
#include <dlfcn.h>
#include <set>
#include <string>
#include <boost/noncopyable.hpp>
struct md_config_t;
class TracepointProvider : public md_config_obs_t, boost::noncopyable {
public:
struct Traits {
const char *library;
const char *config_key;
Traits(const char *library, const char *config_key)
: library(library), config_key(config_key) {
}
};
class Singleton {
public:
Singleton(CephContext *cct, const char *library, const char *config_key)
: tracepoint_provider(new TracepointProvider(cct, library, config_key)) {
}
~Singleton() {
delete tracepoint_provider;
}
inline bool is_enabled() const {
return tracepoint_provider->m_enabled;
}
private:
TracepointProvider *tracepoint_provider;
};
template <const Traits &traits>
class TypedSingleton : public Singleton {
public:
TypedSingleton(CephContext *cct)
: Singleton(cct, traits.library, traits.config_key) {
}
};
TracepointProvider(CephContext *cct, const char *library,
const char *config_key);
virtual ~TracepointProvider();
template <const Traits &traits>
static void initialize(CephContext *cct) {
#if WITH_LTTNG
TypedSingleton<traits> *singleton;
cct->lookup_or_create_singleton_object(singleton, traits.library);
#endif
}
protected:
virtual const char** get_tracked_conf_keys() const {
return m_config_keys;
}
virtual void handle_conf_change(const struct md_config_t *conf,
const std::set <std::string> &changed);
private:
CephContext *m_cct;
std::string m_library;
mutable const char* m_config_keys[2];
Mutex m_lock;
bool m_enabled;
void verify_config(const struct md_config_t *conf);
};
#endif // CEPH_TRACEPOINT_PROVIDER_H

2
src/common/ceph_context.cc
View File

@ -463,7 +463,7 @@ CephContext::~CephContext()
{
join_service_thread();
for (map<string, AssociatedSingletonObject*>::iterator it = _associated_objs.begin();
for (map<string, SingletonWrapper*>::iterator it = _associated_objs.begin();
it != _associated_objs.end(); ++it)
delete it->second;

30
src/common/ceph_context.h
View File

@ -20,10 +20,12 @@
#include <string>
#include <set>
#include "include/assert.h"
#include "include/buffer.h"
#include "include/atomic.h"
#include "common/cmdparse.h"
#include "include/Spinlock.h"
#include <boost/noncopyable.hpp>
class AdminSocket;
class CephContextServiceThread;
@ -60,10 +62,6 @@ private:
~CephContext();
atomic_t nref;
public:
class AssociatedSingletonObject {
public:
virtual ~AssociatedSingletonObject() {}
};
CephContext *get() {
nref.inc();
return this;
@ -132,9 +130,12 @@ public:
ceph_spin_lock(&_associated_objs_lock);
if (!_associated_objs.count(name)) {
p = new T(this);
_associated_objs[name] = reinterpret_cast<AssociatedSingletonObject*>(p);
_associated_objs[name] = new TypedSingletonWrapper<T>(p);
} else {
p = reinterpret_cast<T*>(_associated_objs[name]);
TypedSingletonWrapper<T> *wrapper =
dynamic_cast<TypedSingletonWrapper<T> *>(_associated_objs[name]);
assert(wrapper != NULL);
p = wrapper->singleton;
}
ceph_spin_unlock(&_associated_objs_lock);
}
@ -149,6 +150,21 @@ public:
std::ostream *message);
private:
struct SingletonWrapper : boost::noncopyable {
virtual ~SingletonWrapper() {}
};
template <typename T>
struct TypedSingletonWrapper : public SingletonWrapper {
TypedSingletonWrapper(T *p) : singleton(p) {
}
virtual ~TypedSingletonWrapper() {
delete singleton;
}
T *singleton;
};
CephContext(const CephContext &rhs);
CephContext &operator=(const CephContext &rhs);
@ -182,7 +198,7 @@ private:
ceph::HeartbeatMap *_heartbeat_map;
ceph_spinlock_t _associated_objs_lock;
std::map<std::string, AssociatedSingletonObject*> _associated_objs;
std::map<std::string, SingletonWrapper*> _associated_objs;
// crypto
CryptoHandler *_crypto_none;

4
src/common/config_opts.h
View File

@ -715,6 +715,7 @@ OPTION(osd_failsafe_full_ratio, OPT_FLOAT, .97) // what % full makes an OSD "ful
OPTION(osd_failsafe_nearfull_ratio, OPT_FLOAT, .90) // what % full makes an OSD near full (failsafe)
OPTION(osd_pg_object_context_cache_count, OPT_INT, 64)
OPTION(osd_tracing, OPT_BOOL, false) // true if LTTng-UST tracepoints should be enabled
// determines whether PGLog::check() compares written out log to stored log
OPTION(osd_debug_pg_log_writeout, OPT_BOOL, false)
@ -781,6 +782,7 @@ OPTION(osd_max_attr_name_len, OPT_U32, 100) // max rados attr name len; canno
OPTION(osd_max_attr_size, OPT_U64, 0)
OPTION(osd_objectstore, OPT_STR, "filestore") // ObjectStore backend type
OPTION(osd_objectstore_tracing, OPT_BOOL, false) // true if LTTng-UST tracepoints should be enabled
// Override maintaining compatibility with older OSDs
// Set to true for testing. Users should NOT set this.
OPTION(osd_debug_override_acting_compat, OPT_BOOL, false)
@ -943,6 +945,7 @@ OPTION(journal_discard, OPT_BOOL, false) //using ssd disk as journal, whether su
OPTION(rados_mon_op_timeout, OPT_DOUBLE, 0) // how many seconds to wait for a response from the monitor before returning an error from a rados operation. 0 means on limit.
OPTION(rados_osd_op_timeout, OPT_DOUBLE, 0) // how many seconds to wait for a response from osds before returning an error from a rados operation. 0 means no limit.
OPTION(rados_tracing, OPT_BOOL, false) // true if LTTng-UST tracepoints should be enabled
OPTION(rbd_op_threads, OPT_INT, 1)
OPTION(rbd_op_thread_timeout, OPT_INT, 60)
@ -969,6 +972,7 @@ OPTION(rbd_blacklist_expire_seconds, OPT_INT, 0) // number of seconds to blackli
OPTION(rbd_request_timed_out_seconds, OPT_INT, 30) // number of seconds before maint request times out
OPTION(rbd_skip_partial_discard, OPT_BOOL, false) // when trying to discard a range inside an object, set to true to skip zeroing the range.
OPTION(rbd_enable_alloc_hint, OPT_BOOL, true) // when writing a object, it will issue a hint to osd backend to indicate the expected size object need
OPTION(rbd_tracing, OPT_BOOL, false) // true if LTTng-UST tracepoints should be enabled
/*
* The following options change the behavior for librbd's image creation methods that

3
src/global/Makefile.am
View File

@ -4,9 +4,6 @@ libglobal_la_SOURCES = \
global/pidfile.cc \
global/signal_handler.cc
libglobal_la_LIBADD = $(LIBCOMMON)
if WITH_LTTNG
libglobal_la_LIBADD += -llttng-ust -ldl
endif
noinst_LTLIBRARIES += libglobal.la
noinst_HEADERS += \

12
src/global/global_init.cc
View File

@ -34,10 +34,6 @@
#include <errno.h>
#include <deque>
#ifdef WITH_LTTNG
#include <lttng/ust.h>
#endif
#define dout_subsys ceph_subsys_
@ -288,11 +284,6 @@ void global_init_daemonize(CephContext *cct, int flags)
if (global_init_prefork(cct, flags) < 0)
return;
#ifdef WITH_LTTNG
sigset_t sigset;
ust_before_fork(&sigset);
#endif
int ret = daemon(1, 1);
if (ret) {
ret = errno;
@ -301,9 +292,6 @@ void global_init_daemonize(CephContext *cct, int flags)
exit(1);
}
#ifdef WITH_LTTNG
ust_after_fork_child(&sigset);
#endif
global_init_postfork_start(cct);
global_init_postfork_finish(cct, flags);
}

3
src/librados/Makefile.am
View File

@ -23,9 +23,6 @@ librados_la_CXXFLAGS = ${AM_CXXFLAGS}
LIBRADOS_DEPS += \
librados_internal.la libcls_lock_client.la \
$(LIBOSDC) $(LIBCOMMON_DEPS)
if WITH_LTTNG
LIBRADOS_DEPS += $(LIBRADOS_TP)
endif
librados_la_LIBADD = $(LIBRADOS_DEPS) $(PTHREAD_LIBS) $(CRYPTO_LIBS) $(EXTRALIBS)
librados_la_LDFLAGS = ${AM_LDFLAGS} -version-info 2:0:0

66
src/librados/librados.cc
View File

@ -18,6 +18,7 @@
#include "common/errno.h"
#include "common/ceph_argparse.h"
#include "common/common_init.h"
#include "common/TracepointProvider.h"
#include "include/rados/librados.h"
#include "include/rados/librados.hpp"
#include "include/types.h"
@ -39,7 +40,11 @@
#include <stdexcept>
#ifdef WITH_LTTNG
#define TRACEPOINT_DEFINE
#define TRACEPOINT_PROBE_DYNAMIC_LINKAGE
#include "tracing/librados.h"
#undef TRACEPOINT_PROBE_DYNAMIC_LINKAGE
#undef TRACEPOINT_DEFINE
#else
#define tracepoint(...)
#endif
@ -57,6 +62,12 @@ using std::runtime_error;
#define RADOS_LIST_MAX_ENTRIES 1024
namespace {
TracepointProvider::Traits tracepoint_traits("librados_tp.so", "rados_tracing");
} // anonymous namespace
/*
* Structure of this file
*
@ -2225,10 +2236,9 @@ librados::ObjectOperation::~ObjectOperation()
}
///////////////////////////// C API //////////////////////////////
static
int rados_create_common(rados_t *pcluster,
const char * const clustername,
CephInitParameters *iparams)
static CephContext *rados_create_cct(const char * const clustername,
CephInitParameters *iparams)
{
// missing things compared to global_init:
// g_ceph_context, g_conf, g_lockdep, signal handlers
@ -2238,26 +2248,27 @@ int rados_create_common(rados_t *pcluster,
cct->_conf->parse_env(); // environment variables override
cct->_conf->apply_changes(NULL);
librados::RadosClient *radosp = new librados::RadosClient(cct);
*pcluster = (void *)radosp;
TracepointProvider::initialize<tracepoint_traits>(cct);
return cct;
}
extern "C" int rados_create(rados_t *pcluster, const char * const id)
{
CephInitParameters iparams(CEPH_ENTITY_TYPE_CLIENT);
if (id) {
iparams.name.set(CEPH_ENTITY_TYPE_CLIENT, id);
}
CephContext *cct = rados_create_cct("ceph", &iparams);
tracepoint(librados, rados_create_enter, id);
*pcluster = reinterpret_cast<rados_t>(new librados::RadosClient(cct));
tracepoint(librados, rados_create_exit, 0, *pcluster);
cct->put();
return 0;
}
extern "C" int rados_create(rados_t *pcluster, const char * const id)
{
tracepoint(librados, rados_create_enter, id);
CephInitParameters iparams(CEPH_ENTITY_TYPE_CLIENT);
if (id) {
iparams.name.set(CEPH_ENTITY_TYPE_CLIENT, id);
}
int retval = rados_create_common(pcluster, "ceph", &iparams);
tracepoint(librados, rados_create_exit, retval, *pcluster);
return retval;
}
// as above, but
// as above, but
// 1) don't assume 'client.'; name is a full type.id namestr
// 2) allow setting clustername
// 3) flags is for future expansion (maybe some of the global_init()
@ -2266,16 +2277,21 @@ extern "C" int rados_create(rados_t *pcluster, const char * const id)
extern "C" int rados_create2(rados_t *pcluster, const char *const clustername,
const char * const name, uint64_t flags)
{
tracepoint(librados, rados_create2_enter, clustername, name, flags);
// client is assumed, but from_str will override
int retval = 0;
CephInitParameters iparams(CEPH_ENTITY_TYPE_CLIENT);
if (!name || !iparams.name.from_str(name)) {
tracepoint(librados, rados_create2_exit, -EINVAL, *pcluster);
return -EINVAL;
retval = -EINVAL;
}
int retval = rados_create_common(pcluster, clustername, &iparams);
CephContext *cct = rados_create_cct(clustername, &iparams);
tracepoint(librados, rados_create2_enter, clustername, name, flags);
if (retval == 0) {
*pcluster = reinterpret_cast<rados_t>(new librados::RadosClient(cct));
}
tracepoint(librados, rados_create2_exit, retval, *pcluster);
cct->put();
return retval;
}
@ -2285,8 +2301,10 @@ extern "C" int rados_create2(rados_t *pcluster, const char *const clustername,
*/
extern "C" int rados_create_with_context(rados_t *pcluster, rados_config_t cct_)
{
tracepoint(librados, rados_create_with_context_enter, cct_);
CephContext *cct = (CephContext *)cct_;
TracepointProvider::initialize<tracepoint_traits>(cct);
tracepoint(librados, rados_create_with_context_enter, cct_);
librados::RadosClient *radosp = new librados::RadosClient(cct);
*pcluster = (void *)radosp;
tracepoint(librados, rados_create_with_context_exit, 0, *pcluster);

4
src/librbd/Makefile.am
View File

@ -39,10 +39,6 @@ librbd_la_LIBADD = \
libcls_lock_client.la \
$(PTHREAD_LIBS) $(EXTRALIBS)
if WITH_LTTNG
librbd_la_LIBADD += $(LIBRBD_TP)
endif
librbd_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0
if LINUX
librbd_la_CXXFLAGS = -fvisibility=hidden -fvisibility-inlines-hidden

33
src/librbd/librbd.cc
View File

@ -20,6 +20,7 @@
#include "common/errno.h"
#include "common/snap_types.h"
#include "common/perf_counters.h"
#include "common/TracepointProvider.h"
#include "include/Context.h"
#include "include/rbd/librbd.hpp"
#include "osdc/ObjectCacher.h"
@ -35,7 +36,11 @@
#include <vector>
#ifdef WITH_LTTNG
#define TRACEPOINT_DEFINE
#define TRACEPOINT_PROBE_DYNAMIC_LINKAGE
#include "tracing/librbd.h"
#undef TRACEPOINT_PROBE_DYNAMIC_LINKAGE
#undef TRACEPOINT_DEFINE
#else
#define tracepoint(...)
#endif
@ -53,6 +58,8 @@ using librados::IoCtx;
namespace {
TracepointProvider::Traits tracepoint_traits("librbd_tp.so", "rbd_tracing");
class C_AioReadWQ : public Context {
public:
C_AioReadWQ(librbd::ImageCtx *ictx, uint64_t off, size_t len,
@ -168,6 +175,10 @@ void submit_aio_flush(librbd::ImageCtx *ictx, librbd::AioCompletion *c) {
}
}
CephContext* get_cct(IoCtx &io_ctx) {
return reinterpret_cast<CephContext*>(io_ctx.cct());
}
librbd::AioCompletion* get_aio_completion(librbd::RBD::AioCompletion *comp) {
return reinterpret_cast<librbd::AioCompletion *>(comp->pc);
}
@ -220,6 +231,7 @@ namespace librbd {
const char *snap_name)
{
ImageCtx *ictx = new ImageCtx(name, "", snap_name, io_ctx, false);
TracepointProvider::initialize<tracepoint_traits>(get_cct(io_ctx));
tracepoint(librbd, open_image_enter, ictx, ictx->name.c_str(), ictx->id.c_str(), ictx->snap_name.c_str(), ictx->read_only);
if (image.ctx != NULL) {
@ -242,6 +254,7 @@ namespace librbd {
const char *snap_name)
{
ImageCtx *ictx = new ImageCtx(name, "", snap_name, io_ctx, true);
TracepointProvider::initialize<tracepoint_traits>(get_cct(io_ctx));
tracepoint(librbd, open_image_enter, ictx, ictx->name.c_str(), ictx->id.c_str(), ictx->snap_name.c_str(), ictx->read_only);
if (image.ctx != NULL) {
@ -262,6 +275,7 @@ namespace librbd {
int RBD::create(IoCtx& io_ctx, const char *name, uint64_t size, int *order)
{
TracepointProvider::initialize<tracepoint_traits>(get_cct(io_ctx));
tracepoint(librbd, create_enter, io_ctx.get_pool_name().c_str(), io_ctx.get_id(), name, size, *order);
int r = librbd::create(io_ctx, name, size, order);
tracepoint(librbd, create_exit, r, *order);
@ -271,6 +285,7 @@ namespace librbd {
int RBD::create2(IoCtx& io_ctx, const char *name, uint64_t size,
uint64_t features, int *order)
{
TracepointProvider::initialize<tracepoint_traits>(get_cct(io_ctx));
tracepoint(librbd, create2_enter, io_ctx.get_pool_name().c_str(), io_ctx.get_id(), name, size, features, *order);
int r = librbd::create(io_ctx, name, size, false, features, order, 0, 0);
tracepoint(librbd, create2_exit, r, *order);
@ -281,6 +296,7 @@ namespace librbd {
uint64_t features, int *order, uint64_t stripe_unit,
uint64_t stripe_count)
{
TracepointProvider::initialize<tracepoint_traits>(get_cct(io_ctx));
tracepoint(librbd, create3_enter, io_ctx.get_pool_name().c_str(), io_ctx.get_id(), name, size, features, *order, stripe_unit, stripe_count);
int r = librbd::create(io_ctx, name, size, false, features, order,
stripe_unit, stripe_count);
@ -292,6 +308,7 @@ namespace librbd {
IoCtx& c_ioctx, const char *c_name, uint64_t features,
int *c_order)
{
TracepointProvider::initialize<tracepoint_traits>(get_cct(p_ioctx));
tracepoint(librbd, clone_enter, p_ioctx.get_pool_name().c_str(), p_ioctx.get_id(), p_name, p_snap_name, c_ioctx.get_pool_name().c_str(), c_ioctx.get_id(), c_name, features);
int r = librbd::clone(p_ioctx, p_name, p_snap_name, c_ioctx, c_name,
features, c_order, 0, 0);
@ -303,6 +320,7 @@ namespace librbd {
IoCtx& c_ioctx, const char *c_name, uint64_t features,
int *c_order, uint64_t stripe_unit, int stripe_count)
{
TracepointProvider::initialize<tracepoint_traits>(get_cct(p_ioctx));
tracepoint(librbd, clone2_enter, p_ioctx.get_pool_name().c_str(), p_ioctx.get_id(), p_name, p_snap_name, c_ioctx.get_pool_name().c_str(), c_ioctx.get_id(), c_name, features, stripe_unit, stripe_count);
int r = librbd::clone(p_ioctx, p_name, p_snap_name, c_ioctx, c_name,
features, c_order, stripe_unit, stripe_count);
@ -312,6 +330,7 @@ namespace librbd {
int RBD::remove(IoCtx& io_ctx, const char *name)
{
TracepointProvider::initialize<tracepoint_traits>(get_cct(io_ctx));
tracepoint(librbd, remove_enter, io_ctx.get_pool_name().c_str(), io_ctx.get_id(), name);
librbd::NoOpProgressContext prog_ctx;
int r = librbd::remove(io_ctx, name, prog_ctx);
@ -322,6 +341,7 @@ namespace librbd {
int RBD::remove_with_progress(IoCtx& io_ctx, const char *name,
ProgressContext& pctx)
{
TracepointProvider::initialize<tracepoint_traits>(get_cct(io_ctx));
tracepoint(librbd, remove_enter, io_ctx.get_pool_name().c_str(), io_ctx.get_id(), name);
int r = librbd::remove(io_ctx, name, pctx);
tracepoint(librbd, remove_exit, r);
@ -330,6 +350,7 @@ namespace librbd {
int RBD::list(IoCtx& io_ctx, vector<string>& names)
{
TracepointProvider::initialize<tracepoint_traits>(get_cct(io_ctx));
tracepoint(librbd, list_enter, io_ctx.get_pool_name().c_str(), io_ctx.get_id());
int r = librbd::list(io_ctx, names);
if (r >= 0) {
@ -343,6 +364,7 @@ namespace librbd {
int RBD::rename(IoCtx& src_io_ctx, const char *srcname, const char *destname)
{
TracepointProvider::initialize<tracepoint_traits>(get_cct(src_io_ctx));
tracepoint(librbd, rename_enter, src_io_ctx.get_pool_name().c_str(), src_io_ctx.get_id(), srcname, destname);
int r = librbd::rename(src_io_ctx, srcname, destname);
tracepoint(librbd, rename_exit, r);
@ -1027,6 +1049,7 @@ extern "C" int rbd_list(rados_ioctx_t p, char *names, size_t *size)
{
librados::IoCtx io_ctx;
librados::IoCtx::from_rados_ioctx_t(p, io_ctx);
TracepointProvider::initialize<tracepoint_traits>(get_cct(io_ctx));
tracepoint(librbd, list_enter, io_ctx.get_pool_name().c_str(), io_ctx.get_id());
vector<string> cpp_names;
int r = librbd::list(io_ctx, cpp_names);
@ -1068,6 +1091,7 @@ extern "C" int rbd_create(rados_ioctx_t p, const char *name, uint64_t size, int
{
librados::IoCtx io_ctx;
librados::IoCtx::from_rados_ioctx_t(p, io_ctx);
TracepointProvider::initialize<tracepoint_traits>(get_cct(io_ctx));
tracepoint(librbd, create_enter, io_ctx.get_pool_name().c_str(), io_ctx.get_id(), name, size, *order);
int r = librbd::create(io_ctx, name, size, order);
tracepoint(librbd, create_exit, r, *order);
@ -1080,6 +1104,7 @@ extern "C" int rbd_create2(rados_ioctx_t p, const char *name,
{
librados::IoCtx io_ctx;
librados::IoCtx::from_rados_ioctx_t(p, io_ctx);
TracepointProvider::initialize<tracepoint_traits>(get_cct(io_ctx));
tracepoint(librbd, create2_enter, io_ctx.get_pool_name().c_str(), io_ctx.get_id(), name, size, features, *order);
int r = librbd::create(io_ctx, name, size, false, features, order, 0, 0);
tracepoint(librbd, create2_exit, r, *order);
@ -1093,6 +1118,7 @@ extern "C" int rbd_create3(rados_ioctx_t p, const char *name,
{
librados::IoCtx io_ctx;
librados::IoCtx::from_rados_ioctx_t(p, io_ctx);
TracepointProvider::initialize<tracepoint_traits>(get_cct(io_ctx));
tracepoint(librbd, create3_enter, io_ctx.get_pool_name().c_str(), io_ctx.get_id(), name, size, features, *order, stripe_unit, stripe_count);
int r = librbd::create(io_ctx, name, size, false, features, order,
stripe_unit, stripe_count);
@ -1107,6 +1133,7 @@ extern "C" int rbd_clone(rados_ioctx_t p_ioctx, const char *p_name,
librados::IoCtx p_ioc, c_ioc;
librados::IoCtx::from_rados_ioctx_t(p_ioctx, p_ioc);
librados::IoCtx::from_rados_ioctx_t(c_ioctx, c_ioc);
TracepointProvider::initialize<tracepoint_traits>(get_cct(p_ioc));
tracepoint(librbd, clone_enter, p_ioc.get_pool_name().c_str(), p_ioc.get_id(), p_name, p_snap_name, c_ioc.get_pool_name().c_str(), c_ioc.get_id(), c_name, features);
int r = librbd::clone(p_ioc, p_name, p_snap_name, c_ioc, c_name,
features, c_order, 0, 0);
@ -1122,6 +1149,7 @@ extern "C" int rbd_clone2(rados_ioctx_t p_ioctx, const char *p_name,
librados::IoCtx p_ioc, c_ioc;
librados::IoCtx::from_rados_ioctx_t(p_ioctx, p_ioc);
librados::IoCtx::from_rados_ioctx_t(c_ioctx, c_ioc);
TracepointProvider::initialize<tracepoint_traits>(get_cct(p_ioc));
tracepoint(librbd, clone2_enter, p_ioc.get_pool_name().c_str(), p_ioc.get_id(), p_name, p_snap_name, c_ioc.get_pool_name().c_str(), c_ioc.get_id(), c_name, features, stripe_unit, stripe_count);
int r = librbd::clone(p_ioc, p_name, p_snap_name, c_ioc, c_name,
features, c_order, stripe_unit, stripe_count);
@ -1133,6 +1161,7 @@ extern "C" int rbd_remove(rados_ioctx_t p, const char *name)
{
librados::IoCtx io_ctx;
librados::IoCtx::from_rados_ioctx_t(p, io_ctx);
TracepointProvider::initialize<tracepoint_traits>(get_cct(io_ctx));
tracepoint(librbd, remove_enter, io_ctx.get_pool_name().c_str(), io_ctx.get_id(), name);
librbd::NoOpProgressContext prog_ctx;
int r = librbd::remove(io_ctx, name, prog_ctx);
@ -1145,6 +1174,7 @@ extern "C" int rbd_remove_with_progress(rados_ioctx_t p, const char *name,
{
librados::IoCtx io_ctx;
librados::IoCtx::from_rados_ioctx_t(p, io_ctx);
TracepointProvider::initialize<tracepoint_traits>(get_cct(io_ctx));
tracepoint(librbd, remove_enter, io_ctx.get_pool_name().c_str(), io_ctx.get_id(), name);
librbd::CProgressContext prog_ctx(cb, cbdata);
int r = librbd::remove(io_ctx, name, prog_ctx);
@ -1228,6 +1258,7 @@ extern "C" int rbd_rename(rados_ioctx_t src_p, const char *srcname,
{
librados::IoCtx src_io_ctx;
librados::IoCtx::from_rados_ioctx_t(src_p, src_io_ctx);
TracepointProvider::initialize<tracepoint_traits>(get_cct(src_io_ctx));
tracepoint(librbd, rename_enter, src_io_ctx.get_pool_name().c_str(), src_io_ctx.get_id(), srcname, destname);
int r = librbd::rename(src_io_ctx, srcname, destname);
tracepoint(librbd, rename_exit, r);
@ -1239,6 +1270,7 @@ extern "C" int rbd_open(rados_ioctx_t p, const char *name, rbd_image_t *image,
{
librados::IoCtx io_ctx;
librados::IoCtx::from_rados_ioctx_t(p, io_ctx);
TracepointProvider::initialize<tracepoint_traits>(get_cct(io_ctx));
librbd::ImageCtx *ictx = new librbd::ImageCtx(name, "", snap_name, io_ctx,
false);
tracepoint(librbd, open_image_enter, ictx, ictx->name.c_str(), ictx->id.c_str(), ictx->snap_name.c_str(), ictx->read_only);
@ -1254,6 +1286,7 @@ extern "C" int rbd_open_read_only(rados_ioctx_t p, const char *name,
{
librados::IoCtx io_ctx;
librados::IoCtx::from_rados_ioctx_t(p, io_ctx);
TracepointProvider::initialize<tracepoint_traits>(get_cct(io_ctx));
librbd::ImageCtx *ictx = new librbd::ImageCtx(name, "", snap_name, io_ctx,
true);
tracepoint(librbd, open_image_enter, ictx, ictx->name.c_str(), ictx->id.c_str(), ictx->snap_name.c_str(), ictx->read_only);

2
src/msg/async/AsyncMessenger.h
View File

@ -114,7 +114,7 @@ class Processor {
void accept();
};
class WorkerPool: CephContext::AssociatedSingletonObject {
class WorkerPool {
WorkerPool(const WorkerPool &);
WorkerPool& operator=(const WorkerPool &);
CephContext *cct;

4
src/os/FileStore.cc
View File

@ -80,7 +80,11 @@ using ceph::crypto::SHA1;
#include "common/blkdev.h"
#ifdef WITH_LTTNG
#define TRACEPOINT_DEFINE
#define TRACEPOINT_PROBE_DYNAMIC_LINKAGE
#include "tracing/objectstore.h"
#undef TRACEPOINT_PROBE_DYNAMIC_LINKAGE
#undef TRACEPOINT_DEFINE
#else
#define tracepoint(...)
#endif

3
src/os/Makefile.am
View File

@ -46,9 +46,6 @@ endif
libos_la_CXXFLAGS = ${AM_CXXFLAGS}
libos_la_LIBADD = $(LIBOS_TYPES)
if WITH_LTTNG
libos_la_LIBADD += $(LIBOS_TP)
endif
noinst_LTLIBRARIES += libos.la

3
src/osd/Makefile.am
View File

@ -31,9 +31,6 @@ if WITH_KINETIC
libosd_la_CXXFLAGS += -std=gnu++11
endif
libosd_la_LIBADD = $(LIBOSDC) $(LIBOS) $(LIBOSD_TYPES) $(LIBOS_TYPES)
if WITH_LTTNG
libosd_la_LIBADD += $(LIBOSD_TP)
endif
noinst_LTLIBRARIES += libosd.la
noinst_HEADERS += \

4
src/osd/OSD.cc
View File

@ -135,7 +135,11 @@
#include "common/config.h"
#ifdef WITH_LTTNG
#define TRACEPOINT_DEFINE
#define TRACEPOINT_PROBE_DYNAMIC_LINKAGE
#include "tracing/osd.h"
#undef TRACEPOINT_PROBE_DYNAMIC_LINKAGE
#undef TRACEPOINT_DEFINE
#else
#define tracepoint(...)
#endif

4
src/osd/OpRequest.cc
View File

@ -14,7 +14,11 @@
#include "osd/osd_types.h"
#ifdef WITH_LTTNG
#define TRACEPOINT_DEFINE
#define TRACEPOINT_PROBE_DYNAMIC_LINKAGE
#include "tracing/oprequest.h"
#undef TRACEPOINT_PROBE_DYNAMIC_LINKAGE
#undef TRACEPOINT_DEFINE
#else
#define tracepoint(...)
#endif

4
src/osd/PG.cc
View File

@ -45,7 +45,11 @@
#include "common/BackTrace.h"
#ifdef WITH_LTTNG
#define TRACEPOINT_DEFINE
#define TRACEPOINT_PROBE_DYNAMIC_LINKAGE
#include "tracing/pg.h"
#undef TRACEPOINT_PROBE_DYNAMIC_LINKAGE
#undef TRACEPOINT_DEFINE
#else
#define tracepoint(...)
#endif

6
src/test/Makefile-client.am
View File

@ -362,12 +362,6 @@ noinst_HEADERS += \
test/librbd/mock/MockImageWatcher.h \
test/librbd/mock/MockObjectMap.h
if WITH_LTTNG
unittest_librbd_LDADD += $(LIBRBD_TP)
ceph_test_librbd_LDADD += $(LIBRBD_TP)
ceph_test_librbd_api_LDADD += $(LIBRBD_TP)
endif
if LINUX
ceph_test_librbd_fsx_SOURCES = test/librbd/fsx.cc
ceph_test_librbd_fsx_LDADD = \

8
src/tracing/.gitignore vendored
View File

@ -1,2 +1,6 @@
*.h
*.c
librados.h
librbd.h
objectstore.h
oprequest.h
osd.h
pg.h

96
src/tracing/Makefile.am
View File

@ -1,80 +1,78 @@
EXTRA_DIST = tracing-common.h
EXTRA_DIST += \
tracing/tracing-common.h
if WITH_LTTNG
%.c %.h: %.tp
$(LTTNG_GEN_TP_PROG) $< -o $*.c -o $*.h
tracing/%.h: tracing/%.tp
$(LTTNG_GEN_TP_PROG) $< -o tracing/$*.h
endif
dist_noinst_DATA = \
librados.tp \
librbd.tp \
oprequest.tp \
osd.tp \
pg.tp \
objectstore.tp
dist_noinst_DATA += \
tracing/librados.tp \
tracing/librbd.tp \
tracing/oprequest.tp \
tracing/osd.tp \
tracing/pg.tp \
tracing/objectstore.tp
if WITH_LTTNG
libosd_tp_la_SOURCES = \
tracing/oprequest.c \
tracing/osd.c \
tracing/pg.c
nodist_libosd_tp_la_SOURCES = \
oprequest.c \
oprequest.h \
osd.c \
osd.h \
pg.h \
pg.c
tracing/oprequest.h \
tracing/osd.h \
tracing/pg.h
endif
libosd_tp_la_LIBADD = -llttng-ust -ldl
libosd_tp_la_CPPFLAGS = -DTRACEPOINT_PROBE_DYNAMIC_LINKAGE
libosd_tp_la_CFLAGS = -I$(top_srcdir)/src $(AM_CFLAGS)
libosd_tp_la_LDFLAGS =
libosd_tp_la_CFLAGS = -I$(top_srcdir)/src/tracing -I$(top_srcdir)/src $(AM_CFLAGS) -fpic
libosd_tp_la_LDFLAGS = -version-info 1:0:0
if WITH_LTTNG
librados_tp_la_SOURCES = \
tracing/librados.c
nodist_librados_tp_la_SOURCES = \
librados.c \
librados.h
tracing/librados.h
endif
librados_tp_la_LIBADD = -llttng-ust -ldl
librados_tp_la_CPPFLAGS = -DTRACEPOINT_PROBE_DYNAMIC_LINKAGE
librados_tp_la_CFLAGS = -I$(top_srcdir)/src $(AM_CFLAGS)
librados_tp_la_LDFLAGS =
librados_tp_la_CFLAGS = -I$(top_srcdir)/src/tracing -I$(top_srcdir)/src $(AM_CFLAGS) -fpic
librados_tp_la_LDFLAGS = -version-info 2:0:0
if WITH_LTTNG
librbd_tp_la_SOURCES = \
tracing/librbd.c
nodist_librbd_tp_la_SOURCES = \
librbd.c \
librbd.h
tracing/librbd.h
endif
librbd_tp_la_LIBADD = -llttng-ust -ldl
librbd_tp_la_CPPFLAGS = -DTRACEPOINT_PROBE_DYNAMIC_LINKAGE
librbd_tp_la_CFLAGS = -I$(top_srcdir)/src $(AM_CFLAGS)
librbd_tp_la_LDFLAGS =
librbd_tp_la_CFLAGS = -I$(top_srcdir)/src/tracing -I$(top_srcdir)/src $(AM_CFLAGS) -fpic
librbd_tp_la_LDFLAGS = -version-info 1:0:0
if WITH_LTTNG
libos_tp_la_SOURCES = \
tracing/objectstore.c
nodist_libos_tp_la_SOURCES = \
objectstore.c \
objectstore.h
tracing/objectstore.h
endif
libos_tp_la_LIBADD = -llttng-ust -ldl
libos_tp_la_CPPFLAGS = -DTRACEPOINT_PROBE_DYNAMIC_LINKAGE
libos_tp_la_CFLAGS = -I$(top_srcdir)/src $(AM_CFLAGS)
libos_tp_la_LDFLAGS =
libos_tp_la_CFLAGS = -I$(top_srcdir)/src/tracing -I$(top_srcdir)/src $(AM_CFLAGS) -fpic
libos_tp_la_LDFLAGS = -version-info 1:0:0
if WITH_LTTNG
noinst_LTLIBRARIES = \
lib_LTLIBRARIES += \
libosd_tp.la \
libos_tp.la \
librados_tp.la \
librbd_tp.la \
libos_tp.la
librbd_tp.la
BUILT_SOURCES = \
librados.h \
librbd.h \
oprequest.h \
osd.h \
pg.h \
objectstore.h
BUILT_SOURCES += \
tracing/librados.h \
tracing/librbd.h \
tracing/objectstore.h \
tracing/oprequest.h \
tracing/osd.h \
tracing/pg.h
endif
CLEANFILES = \
$(nodist_libosd_tp_la_SOURCES) \
$(nodist_librados_tp_la_SOURCES) \
$(nodist_librbd_tp_la_SOURCES) \
$(nodist_libos_tp_la_SOURCES)
CLEANFILES += \
$(BUILT_SOURCES)

6
src/tracing/librados.c Normal file
View File

@ -0,0 +1,6 @@
#define TRACEPOINT_CREATE_PROBES
/*
* The header containing our TRACEPOINT_EVENTs.
*/
#include "librados.h"

6
src/tracing/librbd.c Normal file
View File

@ -0,0 +1,6 @@
#define TRACEPOINT_CREATE_PROBES
/*
* The header containing our TRACEPOINT_EVENTs.
*/
#include "librbd.h"

6
src/tracing/objectstore.c Normal file
View File

@ -0,0 +1,6 @@
#define TRACEPOINT_CREATE_PROBES
/*
* The header containing our TRACEPOINT_EVENTs.
*/
#include "objectstore.h"

6
src/tracing/oprequest.c Normal file
View File

@ -0,0 +1,6 @@
#define TRACEPOINT_CREATE_PROBES
/*
* The header containing our TRACEPOINT_EVENTs.
*/
#include "oprequest.h"

6
src/tracing/osd.c Normal file
View File

@ -0,0 +1,6 @@
#define TRACEPOINT_CREATE_PROBES
/*
* The header containing our TRACEPOINT_EVENTs.
*/
#include "osd.h"

6
src/tracing/pg.c Normal file
View File

@ -0,0 +1,6 @@
#define TRACEPOINT_CREATE_PROBES
/*
* The header containing our TRACEPOINT_EVENTs.
*/
#include "pg.h"