Merge pull request #14521 from smithfarm/wip-19462-kraken

kraken: doc: rgw: admin ops: fix the quota section

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

Merge pull request #14641 from smithfarm/wip-19693-kraken

kraken: [test] test_notify.py: rbd.InvalidArgument: error updating features for image test_notify_clone2

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

Merge pull request #14533 from smithfarm/wip-18501-kraken

kraken: rbd-mirror: potential race mirroring cloned image

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

Merge pull request #14534 from smithfarm/wip-18549-kraken

kraken: rbd: 'metadata_set' API operation should not change global config setting

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

Merge pull request #14536 from smithfarm/wip-18557-kraken

kraken: rbd: 'rbd bench-write' will crash if --io-size is 4G

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

Merge pull request #14537 from smithfarm/wip-18601-kraken

kraken: rbd: Add missing parameter feedback to 'rbd snap limit'

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

Merge pull request #14538 from smithfarm/wip-18632-kraken

kraken: rbd: [qa] crash in journal-enabled fsx run

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

Merge pull request #14622 from smithfarm/wip-19037-kraken

kraken: rbd-mirror: deleting a snapshot during sync can result in read errors

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

Merge pull request #14545 from smithfarm/wip-19324-kraken

kraken: rbd: [api] temporarily restrict (rbd_)mirror_peer_add from adding multiple peers

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

test: rbd master/slave notify test should test active features

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

qa/suites: client-upgrade/jewel-client-x should test multiple features

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

Merge pull request #14487 from zmc/wip-kraken-workunit

qa/tasks/workunit: Backport repo fixes from master

Merge pull request #14531 from smithfarm/wip-18493-kraken

kraken: rbd-mirror: sporadic image replayer shut down failure

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

Merge pull request #14532 from smithfarm/wip-18495-kraken

kraken: rbd: Possible deadlock performing a synchronous API action while refresh in-progress

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

Merge pull request #14095 from shinobu-x/wip-19319-kraken

kraken: RadosImport::import should return an error if Rados::connect fails

Reviewed-by: David Zafman <dzafman@redhat.com>

Merge pull request #14323 from shinobu-x/wip-19371-kraken

kraken: common: monitor creation with IPv6 public network segfaults

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #13284 from shinobu-x/wip-18599-kraken

kraken: osd: os/bluestore: fix statfs to not include DB partition in free space

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #13046 from SUSE/wip-18554-kraken

kraken: mon: peon wrongly delete routed pg stats op before receive pg stats ack

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

Merge pull request #14480 from dillaman/wip-19467-kraken

kraken: librbd: is_exclusive_lock_owner API should ping OSD

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>

Merge pull request #13877 from smithfarm/wip-19178-kraken

kraken: rgw: anonymous user error code of getting object is not consistent with SWIFT

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>

Merge pull request #13866 from smithfarm/wip-19157-kraken

kraken: rgw: health check errors out incorrectly

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>

Merge pull request #13843 from smithfarm/wip-19146-kraken

kraken: rgw: a few cases where rgw_obj is incorrectly initialized

Reviewed-by: Orit Wasserman <owasserm@redhat.com>

Merge pull request #13829 from smithfarm/wip-18898-kraken

kraken: no http referer info in container metadata dump in swift API

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>

Merge pull request #13780 from smithfarm/wip-18896-kraken

kraken: should parse the url to http host to compare with the container referer acl

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>

Merge pull request #12986 from Werkov/rgw-fix-tempurl-url-encoding

kraken: rgw: Use decoded URI when verifying TempURL

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>

rbd: prevent adding multiple mirror peers to a single pool

The rbd-mirror daemon does not currently support replication
from multiple peers. Until that is supported, add a temporary
restriction to prevent confusion.

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

rbd-mirror: retry object copy after -ENOENT error

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

rbd-mirror: object copy should always reference valid snapshots

If a remote snapshot is deleted while an image sync is in-progress,
associate the read request against the most recent, valid remote
snapshot for a given snapshot object clone.

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

rbd-mirror: replace complex object op tuple with struct

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

journal: don't hold future lock during assignment

It's possible that the future raced with its owner and reaches
an empty reference count. This was resulting in the future being
destructed while its lock was still held.

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

rbd: add error prompt when input command 'snap set limit' is incomplete

Signed-off-by: Tang Jin <tang.jin@istuary.com>
(cherry picked from commit 8860028f508a9be5a08f512022cfb042021fd19f)

rbd: bench-write should return error if io-size >= 4G

Currently if user perform bench-write with io-size > 4G
then its crashing because currently during memory allocation
bufferptr taking size of buffer as a unsigned and io-size > 4G
will overflow with unsigned. so during memset operation it will
try to set io_size size of memory area pointed by bufferptr,
(bufferptr area is:  (4G - io_size)), so it will cause
segmentation fault.

Fix is to return error if io-size >= 4G

Fixes: http://tracker.ceph.com/issues/18422
Reported-by: Jason Dillaman <dillaman@redhat.com>
Signed-off-by: Gaurav Kumar Garg <garg.gaurav52@gmail.com>
(cherry picked from commit 6ab73e5f420e89e19b52e39dab28fa4c94e00197)

librbd: metadata_set API operation should not change global config setting

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

librbd: delay mirror registration when creating clones

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

librbd: possible deadlock with flush if refresh in-progress

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

rbd-mirror: avoid processing new events after stop requested

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

doc: rgw: correct the quota section

Add the missing option and fix typo.

Fixes: http://tracker.ceph.com/issues/19397
Signed-off-by: Chu, Hua-Rong <hrchu@cht.com.tw>
(cherry picked from commit 51a88267f0d7f51aeb62092949b66b9f6c062e15)

Merge pull request #13609 from smithfarm/wip-19064-kraken

kraken: AttributeError: Thrasher instance has no attribute 'ceph_objectstore_tool'

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

Merge pull request #13790 from shinobu-x/wip-18298-kraken

kraken: mon: force_create_pg could leave pg stuck in creating state

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

Merge pull request #13500 from shinobu-x/wip-18587-kraken

 kraken: mon: 'osd crush move ...' doesnt work on osds

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #13490 from shinobu-x/wip-18820-kraken

kraken: osd: --flush-journal: sporadic segfaults on exit

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #13295 from asheplyakov/kraken-bp-18497

kraken: osd: publish PG stats when backfill-related states change

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

Merge pull request #13253 from liewegas/wip-enxio-kraken

kraken: osd: do not send ENXIO on misdirected op by default

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

Merge pull request #14322 from shinobu-x/wip-18619-kraken

kraken: osd: ceph degraded and misplaced status output inaccurate

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

librbd: is_exclusive_lock_owner API should ping OSD

This is required to detect if a peer has been silently blacklisted
and is therefore no longer the lock owner.

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

Conflicts:
src/librbd/ManagedLock.[h|cc]: logic moved to ExclusiveLock

Merge pull request #13216 from ovh/bp-osd-updateable-throttles-kraken

kraken: osd: allow client throttler to be adjusted on-fly, without restart

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

Merge pull request #14321 from shinobu-x/wip-kraken-15025

kraken: osd: New added OSD always down when full flag is set

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

Merge pull request #13091 from dzafman/wip-18624-kraken

kraken: osd: Revert "PrimaryLogPG::failed_push: update missing as well"

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

Merge pull request #12790 from SUSE/wip-18418-kraken

kraken: osd: leveldb corruption leads to Operation not permitted not handled and assert

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

Merge pull request #13172 from smithfarm/wip-18713-kraken

kraken: rgw: radosgw-admin period update reverts deleted zonegroup

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

Merge pull request #13176 from smithfarm/wip-18709-kraken

kraken: rgw: multisite: sync status reports master is on a different period

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

Merge pull request #13864 from smithfarm/wip-19156-kraken

kraken: rgw: typo in rgw_admin.cc

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

Merge pull request #14137 from smithfarm/wip-19331-kraken

kraken: rgw: upgrade to multisite v2 fails if there is a zone without zone info

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

Merge pull request #14141 from smithfarm/wip-19342-kraken

kraken: rgw: "period update" does not remove short_zone_ids of deleted zones

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

Merge pull request #14142 from smithfarm/wip-19354-kraken

kraken: rgw: multisite: some 'radosgw-admin data sync' commands hang

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

Merge pull request #14144 from smithfarm/wip-19356-kraken

kraken: rgw: when converting region_map we need to use rgw_zone_root_pool

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

Merge pull request #14485 from zmc/wip-upgrade-openstack

suites/upgrade/hammer-jewel-x: Add volumes

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

qa/tasks/workunit.py: use "overrides" as the default settings of workunit

otherwise the settings in "workunit" tasks are always overridden by the
settings in template config. so we'd better follow the way of how
"install" task updates itself with the "overrides" settings: it uses the
"overrides" as the *defaults*.

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

tasks/workunit.py: specify the branch name when cloning a branch

c1309fb failed to specify a branch when cloning using --depth=1, which
by default clones the HEAD. and we can not "git checkout" a specific
sha1 if it is not HEAD, after cloning using '--depth=1', so in this
change, we dispatch "tag", "branch", "HEAD" using three Refspec classes.

Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Dan Mick <dan.mick@redhat.com>
(cherry picked from commit 9ca7ccf5f1739f731da8bf31260594aea3a2932d)

tasks/workunit.py: when cloning, use --depth=1

Help avoid killing git.ceph.com.  A depth 1 clone takes about
7 seconds, whereas a full one takes about 3:40 (much of it
waiting for the server to create a huge compressed pack)

Signed-off-by: Dan Mick <dan.mick@redhat.com>
(cherry picked from commit c1309fbef300a062138ac40eb5d3e5081b833072)

qa/tasks/workunit: use ceph.git as an alternative of ceph-ci.git for workunit repo

if we run upgrade test, where, for example, "jewel" is not in
ceph-ci.git repo, we should check ceph.git to clone the workunits.

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

qa/tasks/workunit: use the suite repo for cloning workunit

as "workunits" reside in ceph/qa/workunits, it's more intuitive to
respect suite-repo option when cloning workunits.

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

Merge pull request #14098 from shinobu-x/wip-19192-kraken

kraken: tools: ceph-brag fails to count "in" mds

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

Merge pull request #14155 from smithfarm/wip-18947-kraken

kraken: rbd-mirror: additional test stability improvements

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

Merge pull request #14153 from smithfarm/wip-18892-kraken

kraken: librbd: Incomplete declaration for ContextWQ in librbd/Journal.h

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

Merge pull request #14151 from smithfarm/wip-18822-kraken

kraken: tests: run-rbd-unit-tests.sh assert in lockdep_will_lock, TestLibRBD.ObjectMapConsistentSnap

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

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>

pybind: fix incorrect exception format strings

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

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>

suites/upgrade-hammer-jewel-x: Add volumes

Signed-off-by: Zack Cerza <zack@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>

common: fix segfault in public IPv6 addr picking

sockaddr is only 16 bytes big, so declaring net as sockaddr
and then casting to sockaddr_in6 in case of IPv6 cannot
work.

using sockaddr_storage works for both IPv4 and IPv6, and is
used in other code parts as well.

note that the tests did not find this issue as they declared
the bigger structs and casted the references to (sockaddr *)

Fixes: http://tracker.ceph.com/issues/19371
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
(cherry picked from commit ae2ee3d3835fe25b35eeb1a841ee5234cd69eb65)

osd: Calculate degraded and misplaced more accurately

Calculate num_object_copies based on the larger of pool size,
up set size and acting set size.

Calculate num_objects_degraded as the difference between num_object_copies
and all copies found on acting set and backfilling up set OSDs.

Calculate num_objects_misplaced as all copies on acting set OSDs not in up set
less copies that have been backfilled to up set OSDs.

Fixes: http://tracker.ceph.com/issues/18619
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 8423bc40759cca137f61e7b755411719a84369d4)

osd: don't share osdmap with objecter when preboot

Signed-off-by: Mingxin Liu <mingxin@xsky.com>
(cherry picked from commit a5a3644eecc49b4eea890c6999fe87536495dcbe)

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)