Merge pull request #14543 from smithfarm/wip-19173-kraken

kraken: rbd: rbd_clone_copy_on_read ineffective with exclusive-lock

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

Merge pull request #14974 from dillaman/wip-19872-kraken

kraken: rbd-mirror: failover and failback of unmodified image results in split-brain

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

Merge pull request #14934 from dillaman/wip-19833-kraken

kraken: cls_rbd: default initialize snapshot namespace for legacy clients

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

Merge pull request #14539 from smithfarm/wip-18771-kraken

kraken: rbd: Improve compatibility between librbd + krbd for the data pool

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

Merge pull request #14065 from asheplyakov/19212-bp-kraken

kraken: rgw: "cluster [WRN] bad locator @X on object @X...." in cluster log

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

Merge pull request #16092 from smithfarm/wip-20150-kraken

kraken: ceph-disk: fails if OSD udev rule triggers prior to mount of /var

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

Merge pull request #14604 from asheplyakov/19647-kraken

kraken: ceph-disk: enable directory backed OSD at boot time

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

Merge pull request #14616 from smithfarm/wip-18723-kraken

kraken: osd: calc_clone_subsets misuses try_read_lock vs missing

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

ceph-disk: do not setup_statedir on trigger

trigger may run when statedir is unavailable and does not use it.

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

Merge pull request #14852 from yehudasa/wip-rgw-support-ragweed-kraken

kraken: rgw: add apis to support ragweed suite

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

Merge pull request #13514 from rzarzynski/wip-rgw-controllable-204-kraken

kraken: rgw: make sending Content-Length in 204 and 304 controllable

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

Merge pull request #14403 from shinobu-x/wip-17331-kraken

kraken: ceph-disk list reports mount error for OSD having mount options with SELinux context

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

librbd: introduce new constants for tracking max block name prefix

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

librbd: acquire exclusive-lock during copy on read

Fixes: http://tracker.ceph.com/issues/18888
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 7dba5311b12011a4a6e8564e68150e54c5af5ddd)

Conflicts:
    src/librbd/AioImageRequestWQ.h:
      - in master this file has morphed into src/librbd/io/ImageRequestWQ.h
      - kraken has AioImageRequest<ImageCtx> instead of ImageRequest<ImageCtx>
    src/librbd/image/RefreshRequest.cc:
      - rename image context element to "aio_work_queue" (from "io_work_queue")
        because kraken doesn't have de95d862f57b56738e04d77f2351622f83f17f4a
    src/test/librbd/image/test_mock_RefreshRequest.cc:
      - rename image context element to "aio_work_queue" (from "io_work_queue")
        because kraken doesn't have de95d862f57b56738e04d77f2351622f83f17f4a

PrimaryLogPG::try_lock_for_read: give up if missing

The only users calc_*_subsets might try to read_lock an object which is
missing on the primary.  Returning false in those cases is perfectly
reasonable and avoids the problem.

Fixes: http://tracker.ceph.com/issues/18583
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 3833440adea6f8bcb0093603c3a9d16360ed57ec)

ReplicatedBackend: take read locks for clone sources during recovery

Otherwise, we run the risk of a clone source which hasn't actually
come into existence yet being used if we grab a clone which *just*
got added the the ssc, but has not yet actually had time to be
created (can't rely on message ordering here since recovery messages
don't necessarily order with client IO!).

Fixes: http://tracker.ceph.com/issues/17831
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 68defc2b0561414711d4dd0a76bc5d0f46f8a3f8)

Merge pull request #16069 from smithfarm/wip-20345-kraken

kraken: make check fails with Error EIO: load dlopen(build/lib/libec_FAKE.so): build/lib/libec_FAKE.so: cannot open shared object file: No such file or directory

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

ceph.spec.in, debian/control: Add bc to build dependencies

The bc is missing for ceph-helpers.sh

Fixes: http://tracker.ceph.com/issues/18876
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@gmail.com>
(cherry picked from commit 3ff4be6d6896346b7b9ec7f158fcde8866faeb38)

qa/workunits/ceph-helpers: do not error out if is_clean

it would be a race otherwise, because we cannot be sure that the cluster
pgs are not all clean or not when run_osd() returns, but we can be sure
that they are expected to active+clean after a while. that's what
wait_for_clean() does.

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

qa/workunits/ceph-helpers: display rejected string

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

rgw: new rest api to retrieve object layout

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 2768583dc486109e49d209243675b99fdd39e92c)

rgw: rest api to read zone config params

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit a220a2efbfd675e6abf14ae33c21005bcbf6dadf)

librbd: add no-op event when promoting an image

The rbd-mirror process needs an event in the journal
to properly detect the transition between primary and
non-primary state between peers.

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

Conflicts:
src/librbd/journal/DemoteRequest.cc: logic exists in Journal.cc

rbd-mirror: prevent infinite loop when computing replay status

If the image had a non-primary predecessor epoch whose tag tid
duplicates an epoch within its own journal, an infinite loop
would result.

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

Merge pull request #15869 from smithfarm/wip-swift-task-move-kraken

tests: move swift.py task from teuthology to ceph, phase one (kraken)

tests: swift.py: tweak imports

The ".." form only works within the teuthology repo. With swift.py now in the
Ceph repo, we have to be explicit.

Error message was: "ValueError: Attempted relative import beyond toplevel
package

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

Merge branch 'master' of /home/smithfarm/src/ceph/upstream/teuthology into wip-swift-task-move-kraken

tests: move swift.py task to qa/tasks

In preparation for moving this task from ceph/teuthology.git into ceph/ceph.git

The move is necessary because jewel-specific changes are needed, yet teuthology
does not maintain a separate branch for jewel. Also, swift.py is a
Ceph-specific task so it makes more sense to have it in Ceph.

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

Merge pull request #13181 from smithfarm/wip-18548-kraken

kraken: rgw: multisite: segfault after changing value of rgw_data_log_num_shards

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

Merge pull request #13838 from smithfarm/wip-19049-kraken

kraken: rgw: multisite: some yields in RGWMetaSyncShardCR::full_sync() resume in incremental_sync()

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

Merge pull request #13224 from smithfarm/wip-18780-kraken

kraken: rgw: Swift API: spurious newline after http body causes weird errors

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

Merge pull request #13174 from smithfarm/wip-18711-kraken

kraken: rgw: slave zonegroup cannot enable the bucket versioning

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

rgw: fix off-by-one in RGWDataChangesLog::get_info

Fixes: http://tracker.ceph.com/issues/18488
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit a0974fdcf62e60cf31bc15588e7b718da6f6ade3)

radosgw/swift: clean up flush / newline behavior.

The current code emits a newline after swift errors, but fails
to account for it when it calculates 'content-length'.  This results in
some clients (go github.com/ncw/swift) producing complaints about the
unsolicited newline such as this,
Unsolicited response received on idle HTTP channel starting with "\n"; err=<nil>

This logic eliminates the newline on flush.  This makes the content length
calculation correct and eliminates the stray newline.

There was already existing separator logic in the rgw plain formatter
that can emit a newline at the correct point.  It had been checking
"len" to decide if previous data had been emitted, but that's reset to 0
by flush().  So, this logic adds a new per-instance variable to separately
track state that it emitted a previous item (and should emit a newline).

Fixes: http://tracker.ceph.com/issues/18473
Signed-off-by: Marcus Watts <mwatts@redhat.com>
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 5f229d6a33eae4906f22cdb90941835e47ee9f02)

rgw: fix for broken yields in RGWMetaSyncShardCR

Fixes: http://tracker.ceph.com/issues/18076
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit e62d48a9bf2e309eab1a863f167af5267ebcc371)

rgw: complete versioning enablement after sending it to meta master

Fixes: http://tracker.ceph.com/issues/18003
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit 2d8aafb9dbe64bd9dd2b7d5ed50c6e9550cbe1ab)

Merge pull request #15421 from dzafman/wip-20125

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

osd: Object level shard errors are tracked and used if no auth available

Shards with object mismatch are tracked to mark them inconsistent
Fix test because storing omap_digest in object_info not behaving as before

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

Merge pull request #14345 from ceph/wip-ceph-disk-fix-kraken

ceph-disk: Add fix subcommand kraken back-port

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>

ceph-disk: Add --system option for fix command

This adds the ability to restore the labels of the underlying system
data in addition to ceph data.

Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit 8d81af42fd507c7b92c8279eb114b0a733ac1da6)

ceph-disk: Add more fix targets

It turns out I forgot several more directories that needs to be fixed by
this script. We need to fix /var/log/ceph, /var/run/ceph and /etc/ceph
as well.

Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit ae139307d6b2bfba47e21d29d6dbd3c8dc01b5b5)

ceph-disk: Add unit test for fix command

This will simulate the command* functions to not actually run anything
thus excercising the python code directly. It also checks that the
proper (sub-strings) are in the output.

Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit 1ec53dee9a690134936bdc3a09c9a02fecf13a9d)

ceph-disk: Add fix subcommand

This subcommand will fix the SELinux labels and/or file permissions on
ceph data (/var/lib/ceph).

The command is also optimized to run the commands in parallel (per
sub-dir in /var/lib/ceph) and do restorecon and chown at the same time
to take advantage of the caching mechanisms.

Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit 6d5d30f6ed7538271579cc2ef4e2e364f01a4a6f)

Merge pull request #14983 from liewegas/wip-denc-dump-kraken

ceph-object-corpus: kraken objects (kraken)

test/encoding/readable.sh: join children at finish

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

test/encoding/readable: fix passing of results to parent

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

messages/MCommand: fix type on decode

Wow, this has been broken since v0.38, but apparently
the message never made it into the object corpus so
we never noticed!

In reality the bug is harmless: decode_message() will
set_header which clobbers whatever version the default
ctor fills in, so this only affects ceph-dencoder's
test.

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

ceph-object-corpus: kraken objects

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

test/encoding/generate-corpus-objects: fix typo

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

test/encoding/generate-corpus-objects.sh: simplify object corpus population

Script that generates corpus objects.

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

qa/workunits/rgw/run-s3tests.sh: run s3-tests

This works out of the box with a vstart environment and

 RGW=1 ../src/vstart.sh -n -l
 PATH=bin:$PATH ../qa/workunits/rgw/run-s3tests.sh

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

include/denc: support ENCODE_DUMP

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

cls_rbd: default initialize snapshot namespace for legacy clients

Creating a snapshot on >=Kraken OSDs using <=Jewel clients can result
in an improperly initialized snapshot namespace. As a result, attempting
to remove the snapshot using a >=Kraken client will result in an -EINVAL
error.

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

Conflicts:
src/cls/rbd/cls_rbd.h: trivial resolution

mgr/DaemonServer: do not crash on bad authorizer

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

Merge pull request #14506 from smithfarm/wip-19119-kraken

kraken: doc: PendingReleaseNotes: warning about 'osd rm ...' and #13733

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

Merge pull request #14692 from smithfarm/wip-fix-hammer-jewel-x

qa/suites/upgrade: add tiering test to hammer-jewel-x

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

Merge pull request #14425 from smithfarm/wip-19564-kraken

kraken: build/ops: ceph-base missing dependency for psmisc in Ubuntu Xenial

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

Merge pull request #13494 from shinobu-x/wip-18516-kraken

kraken: build/ops: systemd: Start OSDs after MONs

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

Merge pull request #14588 from asheplyakov/19618-kraken

kraken: mon/MonClient: make get_mon_log_message() atomic

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

Merge pull request #13543 from shinobu-x/wip-18954-kraken

kraken: ceph-disk prepare get wrong group name in bluestore

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

Merge pull request #12746 from SUSE/wip-18387-kraken

kraken: tests: use ceph-kraken branch for s3tests

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

qa/suites/upgrade: add tiering test to hammer-jewel-x

Related: http://tracker.ceph.com/issues/19185
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit e8c04a027b5d108b30e63ab759760add57d43198)

Merge pull request #14620 from smithfarm/wip-19659-kraken

kraken: librbd: corrected resize RPC message backwards compatibility

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

Merge pull request #14574 from smithfarm/wip-19620-kraken

kraken: cephfs: MDS server crashes due to inconsistent metadata.

Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #14573 from smithfarm/wip-19483-kraken

kraken: cephfs: No output for ceph mds rmfailed 0 --yes-i-really-mean-it command

Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #14572 from smithfarm/wip-19335-kraken

kraken: cephfs: MDS heartbeat timeout during rejoin, when working with large amount of caps/inodes

Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #14571 from smithfarm/wip-19045-kraken

kraken: cephfs: buffer overflow in test LibCephFS.DirLs

Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #14570 from smithfarm/wip-18950-kraken

kraken: cephfs: mds/StrayManager: avoid reusing deleted inode in StrayManager::_purge_stray_logged

Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #14569 from smithfarm/wip-18899-kraken

kraken: cephfs: test_open_inode fails

Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #14568 from smithfarm/wip-18706-kraken

kraken: cephfs: fragment space check can cause replayed request fail

Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #14567 from smithfarm/wip-18700-kraken

kraken: cephfs: client: fix the cross-quota rename boundary check conditions

Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #14566 from smithfarm/wip-18616-kraken

kraken: cephfs: segfault in handle_client_caps

Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #14565 from smithfarm/wip-18566-kraken

kraken: cephfs: MDS crashes on missing metadata object

Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #14564 from smithfarm/wip-18562-kraken

kraken: cephfs: test_client_recovery.TestClientRecovery fails

Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #14563 from smithfarm/wip-18552-kraken

kraken: cephfs: ceph-fuse crash during snapshot tests

Reviewed-by: John Spray <john.spray@redhat.com>

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>

librbd: corrected resize RPC message backwards compatibility

Commit d1f2c557 incorrectly changed the order of variables within
the payload. This resulted in breaking the resize RPC message
with older versions of Ceph.

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

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>

ceph-disk: enable directory backed OSD at boot time

https://github.com/ceph/ceph/commit/539385b143feee3905dceaf7a8faaced42f2d3c6
introduced a regression preventing directory backed OSD from starting at
boot time.

For device backed OSD the boot sequence starts with ceph-disk@.service
and proceeds to

    systemctl enable --runtime ceph-osd@.service

where the --runtime ensure ceph-osd@12 is removed when the machine
reboots so that it does not compete with the ceph-disk@/dev/sdb1 unit at
boot time.

However directory backed OSD solely rely on the ceph-osd@.service unit
to start at boot time and will therefore fail to boot.

The --runtime flag is selectively set for device backed OSD only.

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

mon/MonClient: make get_mon_log_message() atomic

* LogClient: move reset_session() into get_mon_log_message() and add a
  "flush" param to the latter. so it can get_mon_log_message()
  atomically. otherwise another call changing the log queue could sneak
  in between reset_session() and get_mon_log_message().
* MonClient: add a "flush" param to do_send() so we can reset the
  LogClient session once we are connected to a monitor.

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

Conflicts:
src/mon/MonClient.cc: handle_auth: replaced 'log_client->reset_session();
send_log();' sequence with newly introduced 'send_log(true);' like
the original patch does

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>