Merge pull request #7412 from dachary/wip-14470-hammer

tools: tool for artificially inflate the leveldb of the mon store for testing purposes

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

Merge pull request #7446 from liewegas/wip-14537-hammer

mon: compact full epochs also

http://pulpito.ceph.com/sage-2016-01-30_09:58:32-rados-wip-sage-testing-hammer---basic-mira/

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

Merge pull request #7182 from dachary/wip-14143-hammer

hammer: Verify self-managed snapshot functionality on image create

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #7183 from dachary/wip-14283-hammer

hammer: rbd: fix bench-write

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #7416 from dachary/wip-14466-hammer

hammer: rbd-replay does not check for EOF and goes to endless loop

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #7417 from dachary/wip-14553-hammer

hammer: rbd: TaskFinisher::cancel should remove event from SafeTimer

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #7407 from dillaman/wip-14543-hammer

librbd: ImageWatcher shouldn't block the notification thread

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #6980 from dillaman/wip-14063-hammer

librbd: fix merge-diff for >2GB diff-files

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

mon: compact full epochs also

by compacting the ${prefix}.${start}..${prefix}..${end} does not
necessary compact the range of ${prefix}."full_"${start}..
${prefix}."full_"${end}. so when more and more epochs get trimmed
with out a full range compaction, the size of monitor store could
be very large.

Fixes: #14537
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 93d633a25ad8c36c972bb766c38187e2612041e1)

Merge pull request #6353 from theanalyst/wip-13513-hammer

rgw: value of Swift API's X-Object-Manifest header is not url_decoded during segment look up

Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>

Merge pull request #6620 from SUSE/wip-13820-hammer

hammer: rgw: Setting ACL on Object removes ETag

Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>

Merge pull request #7186 from dachary/wip-13888-hammer

hammer: rgw: orphans finish segfaults

Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>

Merge pull request #5789 from SUSE/wip-12928-hammer

rpm: libcephfs_jni1 has no %post and %postun

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

Merge pull request #7434 from tchaikov/wip-14441-hammer

man: document listwatchers cmd in "rados" manpage

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

man: document listwatchers cmd in "rados" manpage

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit c2e391301efc43f0b431e89737246b2c43bf10a9)

man/rados.8: also added the rendered man.8 man page, as we don't
             put the generated man pages in master anymore. but
             they are still in the hammer's source repo.

rbd: remove canceled tasks from timer thread

When canceling scheduled tasks using the timer thread, TaskFinisher::cancel
does not call SafeTimer::cancel_event, so events fire anyway. Add this call.

Fixes: #14476
Signed-off-by: Douglas Fuller <dfuller@redhat.com>
(cherry picked from commit 2aa0f318c862dbe3027d74d345671506605778eb)

rbd-replay: handle EOF gracefully

Fixes: #14452
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
(cherry picked from commit c59b84c3e2c9bbda68219e4d2288a889dd9ca6cb)

Conflicts:
src/rbd_replay/BufferReader.cc: trivial resolution
        caused by s/CEPH_PAGE_SIZE/CEPH_BUFFER_APPEND_SIZE/
        in the context of one hunk.

tools: monstore: add 'show-versions' command.

Using this tool, the first/last committed version of maps will be shown.

Signed-off-by: Cilang Zhao <zhao.cilang@h3c.com>
(cherry picked from commit 21e6ba0c18428caff45733e6b43d197be38af8bb)

tools: ceph_monstore_tool: add inflate-pgmap command

this command repeatly add the latest pgmap to the monstore in order
to inflate it. the command helps with the testing of some monstore
related performance issue of monitor

Fixes: #14217
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit b0f6af814a58dd374ca95e84a4e381f8ef1368de)

tools:support printing the crushmap in readable fashion.

Signed-off-by: Bo Cai <cai.bo@h3c.com>
(cherry picked from commit b7faf678ed0241abc7eb86b9baaa6db669a22d53)

tools:print the map infomation in human readable format.

Signed-off-by: Bo Cai <cai.bo@h3c.com>
(cherry picked from commit 5ed8cdc19150382c946a373ec940d76f98e6ecb7)

tools:remove the local file when get map failed.

Signed-off-by: Bo Cai <cai.bo@h3c.com>
(cherry picked from commit 0b03b32d8ba76fe9f6f1158e68eb440e3670393a)

tools: ceph_monstore_tool: describe behavior of rewrite command

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
(cherry picked from commit a881f9385feb0f5a61fa22357984d6f291c08177)

tools/ceph-monstore-tools: add rewrite command

"rewrite" command will
 - add a new osdmap version to update current osdmap held by OSDMonitor
 - add a new paxos version, as a proposal it will
   * rewrite all osdmap epochs from specified epoch to  the last_committed
     one with the specified crush map.
   * add the new osdmap which is added just now
so the leader monitor can trigger a recovery process to apply the transaction
to all monitors in quorum, and hence bring them back to normal after being
injected with a faulty crushmap.

Fixes: #11815
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 306373427836ca0c2418dbe6caab26d74d94d12e)

tools: ceph-monstore-tool must do out_store.close()

this change fixes the "store-copy" command.
Like the bug reported in http://tracker.ceph.com/issues/10093.

Signed-off-by: huangjun <hjwsm1989@gmail.com>
(cherry picked from commit d85e0f8c50fce62be012506f7ffcb1cdeb0c819c)

Merge pull request #7316 from ceph/wip-deb-lttng-hammer

deb: strip tracepoint libraries from Wheezy/Precise builds

All other "modern" Debian-based OSes have a functional LTTng-UST. Since only hammer needs to build on these older distros, this fix only affects the deb building process for those two releases(since autoconf detects that LTTng is broken).

Reviewed-by: Loic Dachary <ldachary@redhat.com>

Merge pull request #7187 from dachary/wip-13831-hammer

hammer: init script reload doesn't work on EL7

Reviewed-by: Loic Dachary <ldachary@redhat.com>

librbd: ImageWatcher shouldn't block the notification thread

Blocking the notification thread will also result in librados async
callbacks becoming blocked (since they use the same thread).

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 7e2019a72733dff43e55c9b22df12939d584f87d)

 Conflicts:
src/librbd/ImageWatcher.[cc|h]: fewer RPC messages

librados_test_stub: watch/notify now behaves similar to librados

Notifications are executed via the same librados AIO callback
thread, so it's now possible to catch deadlock.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 43722571838a2d78ca8583b5a1ea381cd988de0b)

tests: simulate writeback flush during snap create

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit e9570fcf4be9cd5c06937769d074fa52ffb32e4b)

Merge pull request #7365 from liewegas/wip-tcmalloc-hammer

osd: pass tcmalloc env through to ceph-osd

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>

upstart/ceph-osd.conf: pass TCMALLOC_MAX_TOTAL_THREAD_CACHE_BYTES through

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit a95a3d34cccb9f9f0782a96ca05e5fe9c2b01772)

init-ceph: pass TCMALLOC_MAX_TOTAL_THREAD_CACHE_BYTES through

..when set in the sysconfig/default file.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 03e01ae263ef207046933890821ae75d5e60d9b8)

[source default/sysconfig file too]

deb: strip tracepoint libraries from Wheezy/Precise builds

These releases do not (by default) have a sane LTTng-UST environment,
which results in autoconf disabling support for tracing.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #7252 from ceph/wip-13483-hammer

qa: remove legacy OS support from rbd/qemu-iotests

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

qa: disable rbd/qemu-iotests test case 055 on RHEL/CentOS

Fixes: #14385
Signed-off-by: Jason Dillaman <dillaman@redhat.com>

qa: remove legacy OS support from rbd/qemu-iotests

RHEL7 derivatives were failing test 002 since they were using
legacy test cases for now unsupported OSes.

Fixes: #13483
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>

librbd: optionally validate RBD pool configuration (snapshot support)

Fixes: #13633
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 1fea4dadc60e13518e9ee55d136fbc4e9d3a621e)

Conflicts:
src/common/config_opts.h: trivial resolution

Merge pull request #7179 from dachary/wip-14287-hammer

hammer: ReplicatedPG: wrong result code checking logic during sparse_read

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

Merge pull request #7178 from dachary/wip-14285-hammer

hammer: osd/OSD.cc: 2469: FAILED assert(pg_stat_queue.empty()) on shutdown

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

Merge pull request #7177 from dachary/wip-14043-hammer

hammer: osd/PG.cc: 288: FAILED assert(info.last_epoch_started >= info.history.last_epoch_started)

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

Merge pull request #7180 from dachary/wip-14288-hammer

hammer: ceph osd pool stats broken in hammer

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

Merge pull request #6994 from badone/wip-13993-hammer

log: Log.cc: Assign LOG_DEBUG priority to syslog calls

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

Merge pull request #6839 from SUSE/wip-13789-hammer

Objecter: potential null pointer access when do pool_snap_list.

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

Merge pull request #6835 from SUSE/wip-13892-hammer

hammer: auth/cephx: large amounts of log are produced by osd

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

Merge pull request #6834 from SUSE/wip-13930-hammer

hammer: Ceph Pools' MAX AVAIL is 0 if some OSDs' weight is 0

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

Merge pull request #6832 from SUSE/wip-13936-hammer

hammer: Ceph daemon failed to start, because the service name was already used.

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

Merge pull request #6755 from SUSE/wip-13870-hammer

hammer: OSD: race condition detected during send_failures

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

Merge pull request #6415 from dillaman/wip-13541-hammer

LTTng-UST tracing should be dynamically enabled

Reviewed-by: Loic Dachary <ldachary@redhat.com>

Merge pull request #7176 from dachary/wip-13440-hammer

ceph-disk prepare fails if device is a symlink

Reviewed-by: Loic Dachary <ldachary@redhat.com>

Merge pull request #7150 from jecluis/wip-14236

mon: OSDMonitor: do not assume a session exists in send_incremental()

Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #7226 from dillaman/wip-13810-hammer

tests: notification slave needs to wait for master

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

tests: notification slave needs to wait for master

If the slave instance starts before the master, race
conditions are possible.

Fixes: #13810
Backport: infernalis, hammer
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 3992d6fe67bbf82322cedc1582406caaf6d4de60)

Merge pull request #6530 from SUSE/wip-13760-hammer

unknown argument --quiet in udevadm settle

Reviewed-by: Loic Dachary <ldachary@redhat.com>

rgw: fix reload on non Debian systems.

When using reload in non-debian systems, /bin/sh's kill is used to send the HUP signal to the radosgw process.
This kill version doesn't understand -SIGHUP as a valid signal, using -HUP does work.

Fix: #13709
Backport: hammer
Signed-off-by: Hervé Rousseau <hroussea@cern.ch>
(cherry picked from commit 1b000abac3a02d1e788bf25eead4b6873133f5d2)

Fixing NULL pointer dereference

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
(cherry picked from commit 93d3dfe0441be50a6990d458ee0ee3289af39b20)

rbd: fix bench-write

Make each IO get a unique offset!

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 333f3a01a9916c781f266078391c580efb81a0fc)

Check that delta_sum.stats.sum.num_object_copies and delta_sum.stats.sum.num_object are greater than zero

This fixes division by zero.

Signed-off-by BJ Lougee <almightybeeij@gmail.com>

(cherry picked from commit 27ed729c1088133400aa072eeca9e125942f2d94)

ReplicatedPG: fix sparse-read result code checking logic

Move ahead the result code checking logic before we continue to verify the trailing hole, otherwise
the real result of non-hole reading may be overwritten and thus confuse caller.

Fixes: #14151
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit b3aa29e324cf0a96a1f2f5dcf1ba998219457bcd)

Conflicts:
src/osd/ReplicatedPG.cc: trivial resolution

osd: clear pg_stat_queue after stopping pgs

Fixes: #14212
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit c25ff9927febe77cda31b534971b62f75c196ca2)

osd: Test osd_find_best_info_ignore_history_les config in another assert

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 02a9a41f151a3d968bf8066749658659dc6e3ac4)

Compare parted output with the dereferenced path

Compare parted output with the dereferenced path of the device as parted
prints that instead of the symlink we called it with.

http://tracker.ceph.com/issues/13438 Fixes: #13438

Signed-off-by: Joe Julian <jjulian@io.com>
(cherry picked from commit b3c7cb098195111b9c642e5a9b726b63717f2e0d)

Merge pull request #6512 from SUSE/wip-13734-hammer

rgw: swift API returns more than real object count and bytes used when retrieving account metadata

Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>

mon: OSDMonitor: do not assume a session exists in send_incremental()

We may not have an open session for a given osd. If we blindly assume we
do, we may end up trying to send incrementals we do not have to the osd.

And then we will crash.

This fixes a regression introduced by

  171fee1b82d2675e364da7f96dfb9dd286d9b6e6

which is meant as a backport of

  de43a02e06650a552f048dc8acd17f255126fed9

but so happens to intruduce a line that wasn't on the original patch. We
imagine it was meant to make the 's->osd_epoch' assignment work without
checking the session, as per the original patch, but the backporter must
have forgotten to also backport the assertion on the not-null session.
The unfortunate introduction of the check for a not-null session
triggered this regression.

The regression itself is due to enforcing that a session exists for the
osd we are sending the incrementals to. However, if we come via the
OSDMonitor::process_failures() path, that may very well not be the case,
as we are handling potentially-old MOSDFailure messages that may no
longer have an associated session. By enforcing the not-null session, we
don't check whether we have the requested versions (i.e., if
our_earliest_version <= requested_version), and thus we end up on the
path that assumes that we DO HAVE all the necessary versions -- when we
may not, thus finally asserting because we are reading blank
incremental versions.

Fixes: #14236
Signed-off-by: Joao Eduardo Luis <joao@suse.de>

log: Log.cc: Assign LOG_DEBUG priority to syslog calls

Fixes: #13993
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit 8e93f3f45db681f82633ca695a7dc4e7bd030584)

librbd: fix merge-diff for >2GB diff-files

Fixes: #14063
Signed-off-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #6544 from liewegas/wip-smaller-object-info

osd: make encoded object_info_t smaller to fit inside the XFS inode

Reviewed-by: Samuel Just <sjust@redhat.com>

osd/osd_types: skip encoding newer object_info_t fields if they are unused

This reduces the size of the encoded object_info_t in most cases,
enough to get us under the 255 byte limit for a single inline
xattr in XFS.

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

osd/ReplicatedPG: do not set local_mtime on non-tiered pool

If a pool isn't tiered, don't bother with setting local_mtime.  The only
users are the tiering agent (which isn't needed if there is not tiering)
and scrub for deciding if an object should get its digest recorded (we can
use mtime instead).

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

osd/PGBackend: use mtime for digest decision if local_mtime is empty

If we don't have a local_mtime value, use mtime instead, for the purposes
of deciding if we should record a digest after scrub.

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

osd/ReplicatedPG: do not set omap digest if there is no omap

We want to avoid encoding it if we can.  And if the FLAG_OMAP is not set
we don't need to *also* store an empty crc.

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

Objecter: remove redundant result-check of _calc_target in _map_session.

Result-code check is currently redundant since _calc_target never returns a negative value.
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit 5a6117e667024f51e65847f73f7589467b6cb762)

Objecter: potential null pointer access when do pool_snap_list.

Objecter: potential null pointer access when do pool_snap_list. Shall check pool existence first.
Fixes: #13639
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit 865541605b6c32f03e188ec33d079b44be42fa4a)

auth/cephx: large amounts of log are produced by osd
if the auth of osd is deleted when the osd is running, the osd will produce large amounts of log.

Fixes:#13610
Signed-off-by: Qiankun Zheng <zheng.qiankun@h3c.com>
(cherry picked from commit 102f0b19326836e3b0754b4d32da89eb2bc0b03c)

mon/PGMonitor: MAX AVAIL is 0 if some OSDs' weight is 0

In get_rule_avail(), even p->second is 0, it's possible to be used
as divisor and quotient is infinity, then is converted to an integer
which is negative value.
So we should check p->second value before calculation.

It fixes BUG #13840.

Signed-off-by: Chengyuan Li <chengyli@ebay.com>
(cherry picked from commit 18713e60edd1fe16ab571f7c83e6de026db483ca)

init-ceph: fix systemd-run cant't start ceph daemon sometimes

Fixes: #13474
Signed-off-by: Chuanhong Wang <wang.chuanhong@zte.com.cn>
(cherry picked from commit 2f36909e1e08bac993e77d1781a777b386335669)

Conflicts:
src/init-ceph.in
            different content of cmd variable

Merge pull request #6527 from theanalyst/wip-12856-hammer

rgw: missing handling of encoding-type=url when listing keys in bucket

Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>

Merge pull request #6491 from SUSE/wip-13716-hammer

rgw:swift use Civetweb ssl can not get right url

Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>

Merge pull request #6351 from theanalyst/wip-13538-hammer

rgw: orphan tool should be careful about removing head objects

Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>

Merge pull request #6349 from theanalyst/wip-13540-hammer

rgw: get bucket location returns region name, not region api name

Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>

Merge pull request #5910 from kmroz/wip-hammer-backport-content-type

rgw: backport content-type casing

Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>

osd: fix send_failures() locking

It is unsafe to check failure_queue.empty() without the lock.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit b3ca828ae8ebc9068073494c46faf3e8e1443ada)

Merge pull request #6587 from theanalyst/wip-13758-hammer

common: pure virtual method called

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #6352 from theanalyst/wip-13536-hammer

rgw: bucket listing hangs on versioned buckets

Merge pull request #6589 from theanalyst/wip-13693-hammer

osd: bug with cache/tiering and snapshot reads

Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #6585 from theanalyst/wip-13753-hammer

rbd: avoid re-writing old-format image header on resize

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #6586 from theanalyst/wip-13755-hammer

rbd: QEMU hangs after creating snapshot and stopping VM

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #6588 from theanalyst/wip-13770-hammer

Objecter: pool op callback may hang forever.

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

Merge pull request #6430 from SUSE/wip-13654-hammer

crush: crash if we see CRUSH_ITEM_NONE in early rule step

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

Merge pull request #6420 from SUSE/wip-13637-hammer

FileStore: potential memory leak if getattrs fails.

Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #6528 from theanalyst/wip-13695-hammer

init-rbdmap uses distro-specific functions

Reviewed-by: Boris Ranto <branto@redhat.com>

Merge pull request #6499 from SUSE/wip-13692-hammer

osd: do not cache unused memory in attrs

Reviewed-by: Samuel Just <sjust@redhat.com>

Merge pull request #6143 from dachary/wip-13340-hammer

small probability sigabrt when setting rados_osd_op_timeout

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

Merge pull request #5773 from tchaikov/wip-12835-hammer

mon: map_cache can become inaccurate if osd does not receive the osdmaps

Reviewed-by: Loic Dachary <ldachary@redhat.com>

ceph_context: remove unsafe cast for singletons

It was previously assumed that a CephContext singleton would
inherit from CephContext::AssociatedSingletonObject, but it was
not enforced.  This could result in unknown behavior when the
singleton is destroyed due to the implied virtual destructor.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit fb62c78637d7092f48871d943282f45029bd6d29)

osd: conditionally initialize the tracepoint provider

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 0009f343a5daf28358a669836d95660c0d9068d8)

librados: conditionally initialize the tracepoint provider

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 6368c281b53d6175a564725b85516de4b6ae54de)

librbd: conditionally initialize the tracepoint provider

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 1a6eea95bd1ccef53f01cf53e493e652faa203ee)

Conflicts:
src/librbd/librbd.cc: trivial resolution

common: new tracing config options

Config options to enable LTTng-UST tracepoint providers for
the OSD, OSD objectstore, librados, and librbd.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 2ccef89badb1f7a63721a0bf48d05eb4c2d0a97a)

Conflicts:
src/common/config_opts.h: trivial resolution

tracing: merge tracepoint provider makefiles into main makefile

This results in the tracepoint provider shared libraries being
placed in the library path for unittests.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit e11d8d68da27a1c224aa55fc40a72ac6aaa0441c)

Conflicts:
configure.ac: trivial resolution
src/Makefile.am: trivial resolution