qa/fsstress.sh: fix 'cp not writing through dangling symlink'

On some test machines, /usr/lib/ltp/testcases/bin/fsstress is
dangling symlink. 'cp -f' is impotent in this case.

Fixes: #12710
Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit 479f2a760baf6af4714d3391a366a6b3acf1bcaf)

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>

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>

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)

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)

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

tracing: dynamic tracepoint provider helper

The TracepointProvider class is a configuration observer.  When
tracing is enabled, it will dynamically load the associated
tracepoint provider.

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

Conflicts:
src/common/Makefile.am: trivial resolution

packaging: add new tracepoint probe shared libraries

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

ceph.spec.in: add new tracepoint probe shared libraries

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

 Conflicts:
ceph.spec.in: trivial resolution

lttng: move tracepoint probes to dynamic libraries

LTTng-UST initializes itself at program load, which means it is
currently always enabled.  This can lead to issues with SElinux
and AppArmor which might restrict access to the necessary device
files.

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

 Conflicts:
src/test/Makefile-client.am: trivial resolution
src/tracing/Makefile.am: trivial resolution

Merge pull request #6580 from dachary/wip-13786-hammer

rbd-replay-* moved from ceph-test-dbg to ceph-common-dbg as well

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

Merge pull request #6286 from dillaman/wip-13460-hammer

rbd-replay-prep and rbd-replay improvements

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

Merge pull request #5790 from SUSE/wip-12932-hammer

Miscellaneous spec file fixes

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

Merge pull request #6644 from dachary/wip-13812-upgrade

revert: osd: use GMT time for hitsets

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

revert: osd: use GMT time for hitsets

"Merge pull request #5825 from tchaikov/wip-12848-hammer"

This reverts commit 39544718dc2f09bcfdc632ac72fd2a3cda87687e, reversing
changes made to 4ad97162026e1eb6e6e948ddf3eb39f711431e45.

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

Signed-off-by: Loic Dachary <loic@dachary.org>

Merge pull request #6402 from SUSE/wip-13621-hammer

CephFS restriction on removing cache tiers is overly strict

Reviewed-by: Greg Farnum <gfarnum@redhat.com>

Merge pull request #6354 from theanalyst/wip-13387-hammer

librbd: reads larger than cache size hang

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

Merge pull request #6289 from dillaman/wip-13461-hammer

librbd: invalidate object map on error even w/o holding lock

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

Merge pull request #6153 from dachary/wip-13205-hammer

ReplicatedBackend: populate recovery_info.size for clone (bug symptom is size mismatch on replicated backend on a clone in scrub)

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

Merge pull request #6158 from dachary/wip-13336-hammer

osd: we do not ignore notify from down osds

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

Merge pull request #6335 from Abhishekvrshny/wip-13488-hammer

object_info_t::decode() has wrong version

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

Merge pull request #6401 from SUSE/wip-13620-hammer

osd: pg stuck in replay

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

build/ops: rbd-replay moved from ceph-test-dbg to ceph-common-dbg

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

Signed-off-by: Loic Dachary <loic@dachary.org>
(cherry picked from commit a0204dc47acc0c50223e449fd23a2fc97bfd111a)

    Conflicts:
     debian/control: << 0.94.5-2 is appropriate for hammer

osd: fix the snapshot reads of evicted tiering pool

reset ssc->exsits in finish_ctx() if the ctx->cache_evict is true, and
the head is removed.

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

Objecter: pool_op callback may hang forever.

pool_op callback may hang forever due to osdmap update during reply handling.
Fixes: #13642
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit 00c6fa9e31975a935ed2bb33a099e2b4f02ad7f2)

WorkQueue: new PointerWQ base class for ContextWQ

The existing work queues do not properly function if added to a running
thread pool.  librbd uses a singleton thread pool which requires
dynamically adding/removing work queues as images are opened and closed.

Fixes: #13636
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 3e78b18b09d75626ca2599bac3b9f9c9889507a5)

Conflicts:
src/common/WorkQueue.h
Trivial merge conflict at class `ContextWQ` initialization

librbd: fixed deadlock while attempting to flush AIO requests

In-flight AIO requests might force a flush if a snapshot was created
out-of-band.  The flush completion was previously invoked asynchronously,
potentially via the same thread worker handling the AIO request. This
resulted in the flush operation deadlocking since it can't complete.

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

tests: new test case to catch deadlock on RBD image refresh

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

librbd: resize should only update image size within header

Previously, the whole RBD image format 1 header struct was
re-written to disk on a resize operation.

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

ceph.spec.in: lttng in SLES12 only

Over in the SUSE sector, we are trying to enable the SLE_12 and openSUSE_13.2
build targets. The lttng/babeltrace stuff is currently available only in
SLE_12.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit bf9ca1eb107c4462d8768faf3ff4db7972384ffd)

Conflicts:
ceph.spec.in
            trivial resolution

ceph.spec.in: fix lttng/babeltrace conditionals

lttng and babeltrace are build dependencies for rbd-replay-prep. Make
sure the right package names are used. Enable for SLE12, as well as
for openSUSE 13.1 and higher.

Move the BuildRequires out of the ceph-test subpackage and into the
distro-conditional dependencies section.

Make ordering of BuildRequires a little more alphabetical.

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit e267128ce22d8b8cd83f6d6d82f24f496600e678)

Conflicts:
ceph.spec.in
            Dropped Requires: xmlstarlet in ceph-test that had inadvertently
            been grabbed from d2cc2b1

packaging: move rbd-replay* to ceph-common

The rbd-replay* utilities are useful for Ceph users with RBD clients.
Currently the rbd-replay* utilities ship in the "ceph-test" package, and
we intend this ceph-test package for Ceph developers and contributors,
not normal users.

Move the rbd-replay* utilities to "ceph-common".

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

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit 96486fd6f284ca3ab67f4f94631896d41c529e85)

Conflicts:
ceph.spec.in
            50a33dea has not been backported to hammer
debian/ceph-test.install
            50a33dea has not been backported to hammer
debian/control
            different ceph-test Replaces: and Breaks: version

Merge pull request #6213 from SUSE/wip-13425-hammer

wrong conditional for boolean function KeyServer::get_auth()

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

Merge pull request #6336 from Abhishekvrshny/wip-13535-hammer

LibRadosWatchNotify.WatchNotify2Timeout

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

Merge pull request #6391 from SUSE/wip-13590-hammer

mon: should not set isvalid = true when cephx_verify_authorizer return false

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

Merge pull request #6398 from SUSE/wip-13588-hammer

OSD::build_past_intervals_parallel() shall reset primary and up_primary when begin a new past_interval.

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

krbd: remove deprecated --quiet param from udevadm

This parameter has been removed since systemd 213, so this
effects Fedora 21+, Debian Jessie, and potentially future
releases of RHEL 7.

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