Merge pull request #14149 from smithfarm/wip-18777-kraken

kraken: rbd: rbd --pool=x rename y z does not work

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

Merge pull request #14315 from smithfarm/wip-19460-kraken

kraken: build/ops: spec file mentions non-existent ceph-create-keys systemd unit file, causing ceph-mon units to not be enabled via preset

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

Merge pull request #13875 from smithfarm/wip-19172-kraken

kraken: rgw: S3 create bucket should not do response in json

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>

Merge pull request #13873 from smithfarm/wip-19164-kraken

kraken: rgw: radosgw-admin: add the 'object stat' command to usage

Reviewed-by: Casey Bodley <cbodley@redhat.com>

Merge pull request #13245 from smithfarm/wip-18776-kraken

kraken: rbd: qemu crash triggered by network issues

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

Merge pull request #13247 from smithfarm/wip-18456-kraken

kraken: rbd: attempting to remove an image with incompatible features results in partial removal

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

Merge pull request #13132 from rjfd/wip-18609-kraken

kraken: librbd: allow to open an image without opening parent image

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

Merge pull request #13185 from smithfarm/wip-18721-kraken

kraken: build/ops: systemd restarts Ceph Mon to quickly after failing to start

Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Wido den Hollander <wido@42on.com>

Merge pull request #13845 from smithfarm/wip-19147-kraken

kraken: rgw: DUMPABLE flag is cleared by setuid preventing coredumps

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>

Merge pull request #13555 from smithfarm/wip-18707-kraken

kraken: mds: failed filelock.can_read(-1) assertion in Server::_dir_is_nonempty

Reviewed-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #13488 from shinobu-x/wip-18955-kraken

kraken: ceph-disk: Fix getting wrong group name when --setgroup in bluestore

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

Merge pull request #13112 from jcsp/wip-18678

kraken: mds: finish clientreplay requests before requesting active state

Reviewed-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #14048 from asheplyakov/reindex-on-pg-split-kraken

kraken: osd: pg log split does not rebuild index for parent or child

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

Merge pull request #13116 from smithfarm/wip-18403-kraken

kraken: mon: cache tiering: base pool last_force_resend not respected (racing read got wrong version)

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

Merge pull request #13487 from shinobu-x/wip-18819-kraken

kraken: common: possible lockdep false alarm for ThreadPool lock

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #14147 from smithfarm/wip-18769-kraken

kraken: rbd: [  FAILED  ] TestJournalTrimmer.RemoveObjectsWithOtherClient

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

Merge pull request #13026 from SUSE/wip-18606-kraken

kraken: tools: ceph-disk prepare writes osd log 0 with root owner

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

Merge pull request #13497 from shinobu-x/wip-17821-kraken

kraken: ceph-disk: does not support cluster names different than 'ceph'

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

systemd: remove all occurence of ceph-create-keys

ceph-create-keys unit file does not exist anymore so there is no need to
call it.

Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit 205cff12b3fe577a02db119ed3084d5c46ba76ce)

systemd: remove ceph-create-keys from presets

ceph-create-keys unit file was removed here:

* https://github.com/ceph/ceph/commit/8bcb4646b6b9846bb965cdec3ca2a21eb3b26bab
* https://github.com/ceph/ceph/commit/dc5fe8d415858358bd0baf5d8dce0a753f5e0cea

As a consequence the systemctl preset command now fails to run since the
unit does not exist anymore. Due to the redirection in /dev/null we
don't know what's happening.

Ultimately the mon unit doesn't get enabled and the mon service won't
start after reboot.
Removing the old/non-existent unit makes the command succeed now.

Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit 151c0ce213186b2196531ce74478ed7671eb9819)

Merge pull request #14163 from trociny/wip-19368

kraken: librbd: possible race in ExclusiveLock handle_peer_notification

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

Merge pull request #14200 from dzafman/wip-18533-again

Fixes: http://tracker.ceph.com/issues/19391
Reviewed-by: Josh Durgin <jdurgin@redhat.com>

filestore, tools: Fix logging of DBObjectMap check() repairs

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

osd: Simplify DBObjectMap by no longer creating complete tables

Bump the version for new maps to 3
Make clone less efficient but simpler
Add rename operation (use instead of clone/unlink)
For now keep code that understands version 2 maps

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

No ghobject_t::operator>() so use Kraken cmp_bitwise() instead
Need to use MIN_GHOBJ/MAX_GHOBJ instead of std::min/std::max

ceph-osdomap-tool: Fix seg fault with large amount of check error output

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

osd: Add automatic repair for DBObjectMap bug

Add repair command to ceph-osdomap-tool too

Under some situations the previous rm_keys() code would
generated a corrupt complete table.  There is no way to
figure out what the table should look like now.  By removing
the entries we fix the corruption and aren't much worse off
because the corruption caused some deleted keys to re-appear.

This doesn't breaking the parent/child relationship during
repair because some of the keys may still be contained
in the parent.

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

Conflicts:
src/os/filestore/DBObjectMap.h (trivial)

ceph-osdomap-tool: Fix tool exit status

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

DBObjectMap: rewrite rm_keys and merge_new_complete

Leverage the updated in_complete_region and needs_parent to simplify
these methods.

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit c4dffb68eaafe724f7fdae93a4285a7f8003ea29)

DBObjectMap: strengthen in_complete_region post condition

Previously, in_complete_region didn't guarantee anything about
where it left complete_iter pointing.  It will be handy for
complete_iter to be pointing at the lowest interval which ends
after to_test.  Make it so.

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 97b35f4d7d4862da4b6f50ecaef0d292a671fd04)

DBObjectMap: fix next_parent()

The previous implementation assumed that
lower_bound(parent_iter->key()) always leaves the iterator
on_parent().  There isn't any guarantee, however, that that
key isn't present on the child as well.

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 74a7631d0938d7b44894f022224eab10a90d5cec)

test_object_map: add tests to trigger some bugs related to 18533

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit f131dbcf5bb17107c029f942a57e9bf4432a26ee)

test: Add ceph_test_object_map to make check tests

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

ceph-osdomap-tool: Add --debug and only show internal logging if enabled

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

osd: DBOjectMap::check: Dump complete mapping when inconsistency found

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

test_object_map: Use ASSERT_EQ() for check() so failure doesn't stop testing

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

tools: Check for overlaps in internal "complete" table for DBObjectMap

Changed check to return an error count and fix tool error message

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

Conflicts:
src/os/filestore/DBObjectMap.h (trivial)

tools: Add dump-headers command to ceph-osdomap-tool

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

Conflicts:
src/os/filestore/DBObjectMap.h (trivial)

tools: Add --oid option to ceph-osdomap-tool

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

osd: Remove unnecessary assert and assignment in DBObjectMap

Fix and add comment(s)

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

kraken: librbd: possible race in ExclusiveLock handle_peer_notification

This is a direct commit to kraken -- the master diverged after
ManagedLock refactoring and is not affected.

Fix: http://tracker.ceph.com/issues/19368
Signed-off-by: Mykola Golub <mgolub@mirantis.com>

rbd: destination pool should be source pool if it is not specified

Currently if user perform image rename operation and user give pool
name as a optional parameter (--pool=<pool_name>) then currently
its taking this optional pool name for source pool and making
destination pool name default pool name.
With this fix if user provide pool name as a optional pool name
parameter then it  will consider both soruce and destination pool
name as optional parameter pool name.

Fixes: http://tracker.ceph.com/issues/18326
Reported-by: МАРК КОРЕНБЕРГ <socketpair@gmail.com>
Signed-off-by: Gaurav Kumar Garg <garg.gaurav52@gmail.com>
(cherry picked from commit 01f23aa99fb694da326ab408e75b33c640ce660b)

journal: stop processing removal after error

Fixed: http://tracker.ceph.com/issues/18738
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 040004f53f7d334fc9452e3f5fd80169cad5f65e)

osd/PGLog: avoid return by value on ginormous log

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

osd/PGLog: reindex properly on pg log split

When pg_log_t::split_out_child() runs it builds the list, which means the
old indexes are wrong (the point to bad memory), but index() will not
rebuild them because ever since b858e869e78927dccebaa350d246bd74af7f1de9
we won't rebuild them if they are already built.

Fix that by calling unindex() before the split.

Further, the new child log also needs to be indexed.  Fix that too.

Fixes: http://tracker.ceph.com/issues/18975
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 643ae42cf27f16dd6ed4e1402acc0483bb9fca74)

doc: rgw: make a note abt system users vs normal users

Mention that system users don't behave like normal users in context of
normal rest operations

Fixes: http://tracker.ceph.com/issues/18889
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit a47bcf70c9f51a6601b809cba219f5615b204d34)

rgw: Let the object stat command be shown in the usage

Fixes: http://tracker.ceph.com/issues/19013
Signed-off-by: Pavan Rallabhandi <PRallabhandi@walmartlabs.com>
(cherry picked from commit 0fe76f83d19be098ef54fb0492a376fef3aa9e23)

rgw: set dumpable flag after setuid post ff0e521

ff0e521 resolved the issue for the other daemons but not for rgw since
it calls setuid (via civetweb) after the new code sets PR_SET_DUMPABLE.
Add another prctl call before wait_shutdown.

Fixes: http://tracker.ceph.com/issues/19089
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit bc458d39630b599e0e1ca9fe25ad7455fcffdd10)

Merge pull request #13501 from shinobu-x/wip-18371-kraken

 kraken: ceph-disk: error on _bytes2str

Merge pull request #13757 from liewegas/wip-pgp-kraken

qa/tasks: set pgp = pg num on thrashing finish

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

test: Thrasher: do not update pools_to_fix_pgp_num if nothing happens

we should not update pools_to_fix_pgp_num if the pool is not expanded or
the pg_num is not increased due to pgs being created. this prevent us
from fixing the pgp_num after done with thrashing if we actually did
nothing when fixing the pgp_num when thrashing, but we removed the pool
from pools_to_fix_pgp_num after set_pool_pgpnum() returns.

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

test: Thrasher: update pgp_num of all expanded pools if not yet

otherwise wait_until_healthy will fail after timeout as seeing warning
like:

HEALTH_WARN pool cephfs_data pg_num 182 > pgp_num 172

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

Merge pull request #13707 from zmc/wip-openstack-volumes-kraken

qa/suites/ceph-deploy: Drop OpenStack volume count

qa/suites/ceph-deploy: Drop OpenStack volume count

Looks like we only need two per node, since there is only one OSD per
node, and ceph-deploy wants two disks per OSD to account for the
journal.

Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit 87072e277c9ef259c9ee2ae1f761e252aa216713)

Merge pull request #13673 from zmc/wip-openstack-volumes-kraken

qa/suites/{ceph-ansible,rest}: OpenStack volumes

qa/suites/rest: Openstack volumes

Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit 99d942145f4206c00aca30c0bb74f0edc4bac798)

qa/suites/ceph-ansible: Openstack volumes

Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit 964b983bdbd412311bce56184d12d1b6d43c7f28)

Merge pull request #13485 from shinobu-x/wip-18644-kraken

kraken: osd: condition object_info_t encoding on required (not up) features

Reviewed-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #13641 from zmc/wip-fs-openstack-kraken

qa/suites/fs: Add openstack volume configuration

qa/suites/fs: Add openstack volume configuration

Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit b076d89a3f1fbad7d477913812b2e17529abeacf)

Merge pull request #13638 from zmc/wip-openstack-volumes-kraken

qa/suites/{knfs,hadoop,samba}: OpenStack volume configuration

Merge pull request #13635 from zmc/wip-kcephfs-openstack-kraken

qa/suites/kcephfs: Openstack volume configuration

ceph-disk: dmcrypt activate must use the same cluster as prepare

When dmcrypt is used, the fsid cannot be retrieved from the data
partition because it is encrypted. Store the fsid in the lockbox to
enable dmcrypt activation using the same logic as regular activation.

The fsid is used to retrive the cluster name that was used during
prepare, reason why activation does not and must not have a --cluster
argument.

Fixes: http://tracker.ceph.com/issues/17821
Signed-off-by: Loic Dachary <ldachary@redhat.com>
(cherry picked from commit 7f66672b675abbc0262769d32a38112c781fefac)

Conflicts:
src/ceph-disk/ceph_disk/main.py

qa/suites/samba: Openstack volume configuration

Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit e0296d706422ea4dc01d84f8786f6f7104c3d996)

qa/suites/hadoop: Openstack volume configuration

Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit 3fef0a49da2ccfdceba7b98e9096be8305da1111)

qa/suites/knfs: Add openstack volume configuration

Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit 62c6fd3371adf0f420c12d9c7e2b3a2a0c69256b)

qa/suites/kcephfs: Openstack volume configuration

Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit ec6fb28eaf8e2db327e4afc115879a40c7664e07)

Merge pull request #13633 from zmc/wip-krbd-openstack-kraken

qa/suites/krbd: Add openstack volume configuration

Merge pull request #13613 from ceph/wip-rgw-openstack-kraken

qa/suites/rgw: Add openstack volume configuration

Merge pull request #13618 from tmuthamizhan/wip-rm-trusty-kraken

qa: drop ubuntu trusty support

Reviewed-by: Yuri Weinstein <yweins@redhat.com>

qa/suites/krbd: Add openstack volume configuration

Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit 201b4d0d1e92bf95ac6a8f2951b664763030f12d)

qa/suites/rgw: Add openstack volume configuration

Without this, OSDs will fail to create on instances whose root fs isn't
xfs.

(cherry picked from commit 8af4c35f9577ef5a88307ea5cbbe2561a473926c)
Signed-off-by: Zack Cerza <zack@redhat.com>

osd/OSDMap: require OSD features only of OSDs

Fix up commit 1a5cc32f0a3b ("osd/OSDMap: reflect REQUIRE_*_OSDS flag in
required features") -- require_*_osds shouldn't affect older clients.

Fixes: http://tracker.ceph.com/issues/18831
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit ab558bbf2956157cbde59c155a5180a62ae73d07)

Conflicts:
src/osd/OSDMap.cc

qa: drop ubuntu trusty support

ceph-ansible dropped support for OS that doesnt support systemd

Signed-off-by: Tamil Muthamizhan <tmuthami@redhat.com>
(cherry picked from commit 4d4b38eca81f7b57e3d3b31e1c13e7ab0ba5b30f)
Signed-off-by: Tamil Muthamizhan <tmuthami@redhat.com>

Merge pull request #13283 from zmc/wip-smoke-openstack-kraken

qa/suites/smoke: add openstack requirements

Reviewed-by: Yuri Weinstein <yweins@redhat.com>

Merge pull request #13201 from dillaman/wip-18703-kraken

kraken: librbd: prevent self-blacklisting during break lock

Reviewed-by: Mykola Golub <mgolub@mirantis.com>

Merge pull request #13102 from dillaman/wip-18668

kraken: test: use librados API to retrieve config params

Reviewed-by: Mykola Golub <mgolub@mirantis.com>

mds: fix incorrect assertion in Server::_dir_is_nonempty()

when filelock is in XLOCKDONE state. client of xlocker can rdlock
the filelock. In that case, only client of xlocker can read the lock.

Fixes: http://tracker.ceph.com/issues/18578
Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit fe4ab52b30079a785be053a9fd0197d6990737fe)

ceph-disk: convert none str to str before printing it

Error('somethings goes wrong', e) is thrown if exception `e` is caught
in ceph-disk, where e is not a string. so we can not just concat it in
Error's __str__(). so cast it to str before doing so.

introduced by d0e29c7

Fixes: http://tracker.ceph.com/issues/18371
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 5e0dd1e7df43a3be589d17878714756a22052d8e)

ceph-disk: Fix getting wrong group name when --setgroup in bluestore

ceph-disk prepare --setgroup <GROUP NAME> will be wrong when using with
bluestore

Signed-off-by: craigchi <craig10624@gmail.com>
(cherry picked from commit a8c0870e7370a0948e8e7fd53d3376b85bf9c649)

common: possible lockdep false alarm for ThreadPool lock

Fixes: http://tracker.ceph.com/issues/18819
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
(cherry picked from commit 8677dea4cd462d2141da28623a82b208cbc926f6)

Merge pull request #13330 from smithfarm/wip-18870-kraken

kraken: tests: SUSE yaml facets in qa/distros/all are out of date

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>

Merge pull request #12984 from ceph/wip-cherry-pick-4tamil

qa: Wip cherry pick 4tamil ceph-ansible

Reviewed-by: Yuri Weinstein <yweins@redhat.com>

Merge pull request #13239 from smithfarm/wip-18805-kraken

kraken: tests: ignore bogus ceph-objectstore-tool error in ceph_manager

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

tests: drop buildpackages.py

The buildpackages suite has been moved to teuthology. This cleans up a file
that was left behind by https://github.com/ceph/ceph/pull/13297

Fixes: http://tracker.ceph.com/issues/18846
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 6b7443fb50c117ee7f20d53bbc7530bb0eb7ebd5)

tests: update SUSE yaml facets in qa/distros/all

Fixes: http://tracker.ceph.com/issues/18856
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 0bd56e871a8549d4b0b1211f09dad2d1120fb606)

Merge pull request #13298 from dachary/wip-18849-kraken

kraken: tests: remove qa/suites/buildpackages

Reviewed-by: Nathan Cutler <ncutler@suse.cz>

buildpackages: remove because it does not belong

It should live in teuthology, not in Ceph. And it is currently broken:
there is no need to keep it around.

Fixes: http://tracker.ceph.com/issues/18846
Signed-off-by: Loic Dachary <loic@dachary.org>
(cherry picked from commit 5a43f8d57925da227c95480501ceec10a29395d8)

tests: fix regression in qa/tasks/ceph_master.py

https://github.com/ceph/ceph/pull/13194 introduced a regression:

2017-02-06T16:14:23.162 INFO:tasks.thrashosds.thrasher:Traceback (most recent call last):
  File "/home/teuthworker/src/github.com_ceph_ceph_master/qa/tasks/ceph_manager.py", line 722, in wrapper
    return func(self)
  File "/home/teuthworker/src/github.com_ceph_ceph_master/qa/tasks/ceph_manager.py", line 839, in do_thrash
    self.choose_action()()
  File "/home/teuthworker/src/github.com_ceph_ceph_master/qa/tasks/ceph_manager.py", line 305, in kill_osd
    output = proc.stderr.getvalue()
AttributeError: 'NoneType' object has no attribute 'getvalue'

This is because the original patch failed to pass "stderr=StringIO()" to run().

Fixes: http://tracker.ceph.com/issues/16263
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit db2582e25e390fcaf75952eb59a73dcff643f49c)

Add openstack requirements to smoke suite

Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit fe9b7552d116b150f178c4cc778fa27cd8d956d1)

librbd: don't remove an image w/ incompatible features

Fixes: http://tracker.ceph.com/issues/18315
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
(cherry picked from commit f76127b5e617923d14adb62bfb836a635c14f209)

osdc: cache should ignore error bhs during trim

A read error (such as injecting a timeout into an OSD op) might result
in a bh in an error state. These should be trimable by the cache.

Fixes: http://tracker.ceph.com/issues/18436
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 5910ed9de9856b5821488a1836487bbbd3d6460e)

tests: ignore bogus ceph-objectstore-tool error in ceph_manager

Fixes: http://tracker.ceph.com/issues/16263
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 046e873026c59e733f1844b28ffdc030cbe57b36)

librbd: prevent self-blacklisting during break lock

Fixes: http://tracker.ceph.com/issues/18666
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 5c590acaec4dd66a9a8c3aa0ec8ab904dd350216)

Conflicts:
src/librbd/exclusive_lock/BreakRequest.cc: managed lock refactor
src/test/librbd/exclusive_lock/test_mock_BreakRequest.cc: managed lock refactor

systemd: Restart Mon after 10s in case of failure

In some situations the IP address the Monitor wants to bind to
might not be available yet.

This might for example be a IPv6 Address which is still performing
DAD or waiting for a Router Advertisement to be send by the Router(s).

Have systemd wait for 10s before starting the Mon and increase the amount
of times it does so to 5.

This allows the system to bring up IP Addresses in the mean time while
systemd waits with restarting the Mon.

Fixes: #18635
Signed-off-by: Wido den Hollander <wido@42on.com>
(cherry picked from commit e73eb8cc1e0d45af1f0b7852c551f2ddfb82a520)

librbd: allow to open an image without opening parent image

Fixes: http://tracker.ceph.com/issues/18325
Signed-off-by: Ricardo Dias <rdias@suse.com>
(cherry picked from commit 61af1c25015de087a2423811548d975dd7d430b4)

Conflicts:
  src/librbd/exclusive_lock/PostAcquireRequest.cc - deleted, does not
                                                    exist in kraken
  src/librbd/librbd.cc - removed rbd_group_* functions that don't exist
                         in kraken

mon/OSDMonitor: set last_force_op_resend on overlay pool too

We currently set the last_force_op_resend field on the
base pool when we set or clear the overlay.  Set it on
the cache/overlay pool too.  The Objecter should resend
even with a change only to the base pool, but the OSD
needs to see the change on the overlay pool to correctly
discard the op.

Fixes: http://tracker.ceph.com/issues/18366
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 08c3618771b852840aa88cff1ca98d980d802941)

Merge pull request #13024 from SUSE/wip-18604-kraken

kraken: cephfs test failures (ceph.com/qa is broken, should be download.ceph.com/qa)

Merge pull request #12813 from SUSE/wip-18439-kraken

kraken: fuse: TestVolumeClient.test_evict_client failure creating pidfile

Merge pull request #12951 from jcsp/wip-18361-kraken

kraken: client: populate metadata during mount

Merge pull request #13030 from SUSE/wip-18612-kraken

kraken: client: segfault on ceph_rmdir path /