ceph-volume tests do not include admin keyring in OSD nodes

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 08760632743040520588e1bc03adc17746ff2eca)

Merge pull request #21938 from pdvian/wip-23985-luminous

luminous: librbd: prevent watcher from unregistering with in-flight actions

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

Merge pull request #22142 from pdvian/wip-24084-luminous

luminous: rbd-mirror: ensure remote demotion is replayed locally

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

Merge pull request #22143 from pdvian/wip-24059-luminous

luminous: Deleting a pool with active notify linger ops can result in seg fault

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

Merge pull request #22172 from pdvian/wip-24086-luminous

luminous: [rbd-mirror] potential races during PoolReplayer shut-down

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

Merge pull request #21412 from ukernel/luminous-23698

luminous: mds: misc load balancer fixes

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #21897 from batrick/i24055

luminous: VolumeClient: allow ceph_volume_client to create 'volumes' without namespace isolation

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #22354 from ukernel/luminous-24369

luminous: client: void sending mds request while holding cap reference

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #21968 from ceph/backport-21605

luminous: mon: High MON cpu usage when cluster is changing

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

Merge pull request #22253 from jdurgin/wip-stat-decode

luminous - osd/osd_types: fix object_stat_sum_t decode

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

Merge pull request #22331 from pdvian/wip-24245-luminous

luminous : mon/MgrMonitor: change 'unresponsive' message to info level

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

Merge pull request #22351 from pdvian/wip-24247-luminous

luminous: os/bluestore: simplify and fix SharedBlob::put()

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

Merge pull request #22360 from tchaikov/luminous-24361

luminous: mon: enable level_compaction_dynamic_level_bytes for rocksdb

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

Merge pull request #22400 from yuriw/wip-yuriw-p2p-luminous

qa/tests - moved point-to-point suite into own folder

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

Merge pull request #21437 from pdvian/wip-23683-luminous

luminous: rgw: radosgw-admin should not use metadata cache for readonly commands

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

Merge pull request #21724 from smithfarm/wip-23231-luminous

luminous: rgw: rgw_statfs should report the correct stats

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

Merge pull request #21738 from cbodley/wip-23906

luminous: rgw: fix use of libcurl with empty header values

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

Merge pull request #22177 from pdvian/wip-24120-luminous

luminous: rgw: trim all spaces inside a metadata value

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>

Merge pull request #22302 from linuxbox2/wip-luminous-irange

luminous: rgw: add configurable AWS-compat invalid range get behavior

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

Merge pull request #22352 from pdvian/wip-24252-luminous

luminous: rgw: Do not modify email if argument is not set

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

Merge pull request #22363 from mdw-at-linuxbox/wip-luminous-rgw-implt

luminous: rgw: making implicit_tenants backwards compatible

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

Merge pull request #21316 from pdvian/wip-23607-luminous

luminous: rbd: improve 'import-diff' corrupt input error messages

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

Merge pull request #22180 from pdvian/wip-24156-luminous

luminous: [rbd-mirror] potential deadlock when running asok 'flush' command

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

Merge pull request #22370 from dillaman/wip-24378-luminous

luminous: librbd: commit IO as safe when complete if writeback cache is disabled

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

Merge pull request #21699 from jcsp/wip-mgr-doc-bal-luminous

luminous: doc/mgr/balancer: document

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

rgw: making implicit_tenants backwards compatible.

In jewel, "rgw keystone implicit tenants" only applied to swift. As of
luminous), this option applies to s3 also.
Sites that used this feature with jewel now have outstanding data that
depends on the old behavior.

The fix here is to expand "rgw keystone implicit tenants" so that it
can be set to any of "none", "all", "s3" or "swift" (also 0=false=none,
1=true=all).  When set to "s3" or "swift", the actual id lookup
is also partitioned.

Formerly "rgw keystone implicit tenants" was a legacy opt.
This change converts it to the new style of option,
including support for dynamically changing it.

Fixes: http://tracker.ceph.com/issues/24348
Signed-off-by: Marcus Watts <mwatts@redhat.com>
(cherry picked from commit a28a38f6e91da3abe59c34fad0e059eeaf29a65f)

Merge pull request #22375 from dzafman/wip-scrub-omap-luminous

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

Merge pull request #21187 from smithfarm/wip-23157-luminous

luminous: mds: underwater dentry check in CDir::_omap_fetched is racy

Merge pull request #21278 from batrick/i22696

luminous: client: dirty caps may never get the chance to flush

mds: fix check of underwater dentries

Underwater dentry is dentry that is dirty in our cache from journal
replay, but had already been flushed to disk before the mds failed.
To decide if an dentry is underwater, original code compares dirty
dentry's version to on-disk dirfrag's version. This method is racy
because CDir::log_mark_dirty() can increase dirfrag's version without
adding log event. After mds failover, version of dirfrag from journal
replay can be less than on-disk dirfrag's version. So newly dirtied
dentry can be equal to or less than the on-disk dirfrag's version.

The race can cause incorrect fragstat/rstat

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

Conflicts:
src/mds/CDir.cc - conditional being replaced by "if (!dn)" is different
                          in luminous

qa/tests - moved point-to-point suite into own folder

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>

client: make mark_caps_clean and mark_caps_dirty as member function to Inode

Signed-off-by: dongdong tao <tdd21151186@gmail.com>
(cherry picked from commit 06ce613779a810dd979cb2eb15b510131a81fd74)

client: fix dirty caps might never be flushed

Fixes: http://tracker.ceph.com/issues/22546
Signed-off-by: dongdong tao <tdd21151186@gmail.com>
(cherry picked from commit aeb920be8ab5f0e5e47d82943c214b012bb8ec5c)

Conflicts:
src/client/Client.cc

Merge pull request #22258 from yuriw/wip-yuriw-fix-luminous

luminous: qa/tests: added missed ubuntu_latest

client: void sending mds request while holding cap reference

Client::_write() calls is_quota_bytes_approaching() while holding Fw
cap reference. The later function may send lookup_name request to mds.
This can cause deadlock (mds delays handling the lookup_name request
because subtree is freezing. The subtree stays in freezing state because
mds is revoking the Fw cap and client does not release it)

This patch isn't cherry-picked from master because quota implementation
has been changed in master (introduced quota realm).

Fixes: http://tracker.ceph.com/issues/24369
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>

mds: don't decay load counters when printing load

Changing load counters while printing load results confusing output.

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 831c5d91cc3863c8ec6ef76ff71f4b7d237ee089)

Merge pull request #21475 from pdvian/wip-23704-luminous

luminous: fuse: wire up fuse_ll_access

Merge pull request #22119 from pdvian/wip-24049-luminous

luminous: ceph-fuse: missing dentries in readdir result

Merge branch 'luminous' into wip-24049-luminous

Merge branch 'luminous' into wip-23704-luminous

Merge pull request #21495 from pdvian/wip-23770-luminous

luminous: ceph-fuse: return proper exit code

Merge pull request #22176 from pdvian/wip-24107-luminous

luminous: mds: set could_consume to false when no purge queue item actually exe…

Merge pull request #22310 from ukernel/luminous-24341

luminous: mds: fix some memory leak

Merge pull request #22271 from pdvian/wip-24205-luminous

luminous: mds: broadcast quota to relevant clients when quota is explicitly set

Merge pull request #22221 from pdvian/wip-24201-luminous

luminous: client: fix issue of revoking non-auth caps

Merge pull request #22208 from pdvian/wip-24188-luminous

luminous: kceph: umount on evicted client blocks forever

Merge pull request #22171 from ukernel/luminous-24108

luminous: mds: avoid calling rejoin_gather_finish() two times successively

Merge pull request #22168 from ukernel/luminous-24207

luminous: client: avoid freeing inode when it contains TX buffer head

Merge pull request #22118 from pdvian/wip-24050-luminous

luminous: mds: include nfiles/nsubdirs of directory inode in MClientCaps

Merge pull request #22018 from batrick/i23991

luminous: client: hangs on umount if it had an MDS session evicted

Merge pull request #21990 from batrick/i23935

luminous: mds: don't discover inode/dirfrag when mds is in 'starting' state

Merge pull request #21989 from batrick/i24130

luminous: mds: handle imported session race

Merge pull request #21922 from pdvian/wip-23984-luminous

luminous: mds: mark new root inode dirty

Merge pull request #21921 from pdvian/wip-23982-luminous

luminous: qa: fix blacklisted check for test_lifecycle

Merge pull request #21901 from pdvian/wip-23951-luminous

luminous: mds: kick rdlock if waiting for dirfragtreelock

Merge pull request #21900 from pdvian/wip-23946-luminous

luminous: mds: crash when failover

Merge pull request #21874 from pdvian/wip-23936-luminous

luminous: cephfs-journal-tool: wait prezero ops before destroying journal

Merge pull request #21841 from pdvian/wip-23931-luminous

luminous: qa: remove racy/buggy test_purge_queue_op_rate

Merge pull request #21730 from joscollin/wip-23933-luminous

luminous: client: avoid second lock on client_lock

Merge pull request #21617 from pdvian/wip-23835-luminous

luminous: mds: fix occasional dir rstat inconsistency between multi-MDSes

Merge pull request #21600 from joscollin/wip-23475-luminous

luminous: ceph-fuse: trim ceph-fuse -V output

Merge pull request #21616 from joscollin/wip-23308-luminous

luminous: doc: Fix -d description in ceph-fuse

Merge pull request #21899 from pdvian/wip-23950-luminous

luminous: mds: trim log during shutdown to clean metadata

Merge pull request #21589 from pdvian/wip-23818-luminous

luminous: client: add client option descriptions

Merge pull request #21687 from batrick/i23638

luminous: ceph-fuse: getgroups failure causes exception

librbd: commit IO as safe when complete if writeback cache is disabled

We do not need to flush IO to ensure its safe if the writeback cache is
disabled when performing a journal replay. Instead, immediately mark the
IO as safe and let the journal's periodic commit throttle handle updating
the position.

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

Conflicts:
src/test/rbd_mirror/test_ImageReplayer.cc: removed "md_config_t::get_val" usage

mon: enable level_compaction_dynamic_level_bytes for rocksdb

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

rgw: Do not modify email if argument is not set

The RGW Admin OPS API overwrites the users email either it is not set via argument, e.g. when executing /{admin}/user?uid=test5&suspended=true.

Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit c6792a8be2fc1496e7a76b0e6b2579d32556b6b3)

osd: Handle omap and data digests independently

Caused by: be078c8b7b131764caa28bc44452b8c5c2339623
The original attempt above to fix the omap_digest handling when
data_digest isn't present had 2 errors.  First, it checked
is_data_digest() and is_omap_digest() instead of digest_present and
omap_digest_present which indicate the source digest is available.
Second, MAYBE could only be set if both digests are available.

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

cleanup: Remove debug option osd_debug_scrub_chance_rewrite_digest

This option seems pointless and there are no test cases that use it.

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

osd/PrimaryLogPG: do not set data/omap digest blindly

As bluestore has bulitin csum, we generally no longer generate
object data digest for now. The consequence is that we should
handle data/omap digest more carefully to make certain ops,
such as copy_from/promote, to work properly since they heavily
relies on data digest for data transfer correctness.

Example of failure:
http://pulpito.ceph.com/xxg-2017-09-30_11:46:34-rbd-master-distro-basic-mira/1690609/

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

Conflicts:
src/osd/PrimaryLogPG.cc (still have snapdir)

os/bluestore: simplify and fix SharedBlob::put()

There is a narrow race possible:

A: lookup foo
A: put on foo
A:   foo --nref == 0
B: lookup foo
B: put foo
B:   foo --nref == 0
B: try_remove() succeeds, removes
A: try_remove() tries to remove foo again, probably crashes

We could fix this by flagging the object in some way to indicate it was
removed (maybe clearing parent?), but then we need to be careful about
dereferencing foo to get parent from put().

Fix this by moving to a simpler model: make lookup fail if nref == 0.
This eliminates the races around put() entirely because once nref reaches
0 it never goes up again.

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

client: fix error operator precedence

    /home/pdonnell/ceph/src/client/Client.cc: In member function ‘int Client::mount(const string&, const UserPerm&, bool)’:
    /home/pdonnell/ceph/src/client/Client.cc:5681:23: warning: suggest parentheses around ‘+’ inside ‘<<’ [-Wparentheses]
        return CEPH_FUSE_NO_MDS_UP;
                    ~~^~

Found by gcc. I am ashamed.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 75f980d85256e22b7b79e5f64bfa3fc6018328b5)

ceph-fuse: exit with failure on failed mount

Fixes: https://tracker.ceph.com/issues/23665
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 7740fcde942603750029322ad2c16c18a7b546ab)

Conflicts:
src/ceph_fuse.cc : Resolved in main

common: ignore errors during preforker exit

Caller can't do anything useful and it obsecures the error the caller wants to
return.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 3f0b7d96f5cb96ff61c935777671ab7ddd94cfd3)

client: do not overload system errnos

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 26f717361ea025462bc8016aca5a7c130048e769)

rbd: improve 'import-diff' corrupt input error messages

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

rbd: import with option --export-format fails to protect snapshot

Fixes: http://tracker.ceph.com/issues/23038
Signed-off-by: songweibin <song.weibin@zte.com.cn>
(cherry picked from commit 8f43eff6da4dc5e7da7da082e08157dd55667b21)

Conflicts:
src/tools/rbd/action/Export.cc : Resolved in do_export_diff_fd

rbd:export/import image-meta when we export/import an image

when we do exporting/importing an image, we should export or import the image-meta of this image at the same time

Signed-off-by: PCzhangPC <pengcheng.zhang@easystack.cn>
(cherry picked from commit 2f0b233a31edfa28c6695e5ab1efac7cd7564422)

mon/MgrMonitor: change 'unresponsive' message to info level

We generate a MGR_DOWN health warning at the appropriate points; having
this at WRN level just triggers failed teuthology runs but doesn't much
value for the user.

Clear out teuthology whitelisting for this message.

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

mds: trim log during shutdown to clean metadata

Otherwise the trimming won't advance so that the remaining inodes are marked
clean.

Fixes: http://tracker.ceph.com/issues/23923
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit c60ef1b806c4a0c60362193675990447d82a65f4)

Merge pull request #22191 from alfredodeza/backport-wip-cv-ansible-deps

lumionus ceph-volume tests.functional install new ceph-ansible dependencies

Reviewed-by: Andrew Schoen <aschoen@redhat.com>

mds: fix leak of MDSCacheObject::waiting

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

mds: fix some memory leak

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

rgw: add configurable AWS-compat invalid range get behavior

If rgw_ignore_get_invalid_range is set, treat invalid range
restrictions as a request for the full object.  By default, retain
the RGW behavior to fail with ERANGE.

Fixes: http://tracker.ceph.com/issues/24317
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit b8a3baffddb0f0082a9b250693d26d934eaf2650)
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>

mds: broadcast quota to relevant clients when quota is explicitly set

Try to broadcast quota to relevant clients proactively if quota is
explicitly set by someone, in case that client won't get quota update
for a long time.

Fixes: http://tracker.ceph.com/issues/24133
Signed-off-by: Zhi Zhang <zhangz.david@outlook.com>
(cherry picked from commit b2a7643b102dbbb8221dcb8a785db5e4276ac284)

qa/tests: added missed ubuntu_latest

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>

osd/osd_types: fix object_stat_sum_t decode

Broken by 71bf04775bef90c9291bd825da626bc9de6f9ec1

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

doc: Fix typo in ceph-fuse

Fixes: https://github.com/ceph/ceph/pull/21616#pullrequestreview-122923127
Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit 7fd3189c98b0b1c2885110c2c33487ef36a9596a)

Merge pull request #21603 from joscollin/wip-23151-luminous

luminous: doc: Update ceph-fuse doc

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

client: fix issue of revoking non-auth caps

when non-auth mds revokes caps, Fcb caps can still be issued by auth
auth mds. It's wrong to flush buffer or invalidate cache when non-auth
mds revokes other caps. This bug can cause client to not respond the
revoke.

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
Fixes: https://tracker.ceph.com/issues/24172
(cherry picked from commit 341a9114e0726e1a7cbb7e6f22adb54c2024c506)

Merge pull request #22076 from tchaikov/wip-cmake-build-rocksdb-no-Werror

luminous: cmake: disable FAIL_ON_WARNINGS for rocksdb

Reviewed-by: Nathan Cutler <cutler@suse.cz>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #22197 from dzafman/wip-test-fixes-luminous

luminous: test fixes

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

qa/tasks/cephfs: add timeout parameter to kclient umount_wait

Just make caller happy. there is no easy way to support timeout.

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

mds: reply session reject for open request from blacklisted client

Kernel client and old version libcephfs do not check if themselves
are blacklisted. They can be stuck at opening session after getting
blacklisted. The session reject message can avoid this.

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
Fixes: https://tracker.ceph.com/issues/24054
(cherry picked from commit b7c6cd8a54f094acb58603b8c6bae9e570a73e27)

test: wait_for_pg_stats() should do another check after last 13 second sleep

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

os/bluestore: fix data read error injection in bluestore

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

ceph-volume tests.functional install new ceph-ansible dependencies

Make note that ceph-ansible's requirements.txt can't be used just yet

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 22310f43165e474e8e12732be57217b26e2b5424)

rbd-mirror: make 'flush' asok command asynchronous

Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit 6fce4cabe7874efef780c7adce8479db8571afe7)

rbd-mirror: don't reregister asok hook in process entry thread

It might get stuck if the asok is busy executing a command.
Instead kick status update, which will call reregister on finish.

Fixes: http://tracker.ceph.com/issues/24141
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit 43e50bd582ba2d1b66f55d7f8d2b7f030da99ee6)