Merge pull request #31652 from smithfarm/wip-40132-luminous

luminous: rgw: TempURL should not allow PUTs with the X-Object-Manifest.

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

Merge pull request #31651 from smithfarm/wip-40127-luminous

luminous: rgw: parse_copy_location defers url-decode

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

Merge pull request #31649 from smithfarm/wip-39747-luminous

luminous: rgw: delete_obj_index() takes mtime for bilog

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

Merge pull request #31648 from smithfarm/wip-39733-luminous

luminous: rgw: cls/user: cls_user_set_buckets_info overwrites creation_time

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

Merge pull request #31220 from less-is-morr/wip-39732-luminous

luminous: rgw: allow radosgw-admin to list bucket w --allow-unordered

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

Merge pull request #31218 from smithfarm/wip-39696-luminous

luminous: rgw: return ERR_NO_SUCH_BUCKET early while evaluating bucket policy

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

Merge pull request #30946 from smithfarm/wip-40852-luminous

luminous: rgw/multisite: Don't allow certain radosgw-admin commands to run on non-master zone

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

Merge pull request #30984 from k0ste/luminous_backports

luminous: rgw: add list user admin OP API

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

Merge pull request #31598 from smithfarm/wip-42796-luminous

luminous: osd/OSDMap.cc: don't output over/underfull messages to lderr

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

Merge pull request #29122 from taodd/barckport-26564

luminous: rgw: LC: handle resharded buckets

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

Merge pull request #31674 from smithfarm/wip-42834-luminous

luminous: os/bluestore: fix improper setting of STATE_KV_SUBMITTED.

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>

Merge pull request #31449 from batrick/i41031-luminous

luminous: qa: malformed job

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Sidharth Anupkrishnan <sanupkri@redhat.com>

Merge pull request #31450 from batrick/i42672

luminous: qa: cfuse_workunit_kernel_untar_build fails on Ubuntu 18.04

Reviewed-by: Sidharth Anupkrishnan <sanupkri@redhat.com>

Merge pull request #31573 from ukernel/luminous-42774

luminous: mds: add command that config individual client session

Reviewed-by: Sidharth Anupkrishnan <sanupkri@redhat.com>

os/bluestore: fix improper setting of STATE_KV_SUBMITTED.

Fixes: https://tracker.ceph.com/issues/42209
The issue is Nautilus and earlier releases specific as master already has
some changes making the case even worse and then fixing the whole bunch.
See https://tracker.ceph.com/issues/42189

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit f8ed28a812bd068d07d4fe5013a731100038bf17)

Conflicts:
src/os/bluestore/BlueStore.cc
- luminous assert became ceph_assert later

rgw: TempURL should not allow PUTs with the X-Object-Manifest.

Fixes: http://tracker.ceph.com/issues/20797
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
(cherry picked from commit 40e602bc3866598952eb0dd68ecec947dd7b70d6)

rgw: parse_copy_location defers url-decode

don't url-decode until after we search for the ?, or we'll truncate
object names that contain a url-encoded ?

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

rgw: delete_obj_index() takes mtime for bilog

writing an empty timestamp to the bilog prevents other zones from
applying the delete. this means that the --bypass-gc flag for
'radosgw-admin bucket rm' doesn't work in multisite

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

test/rgw: add multisite test_bucket_creation_time()

does not create any buckets itself, but checks that all creation times
match on buckets created by other tests

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 8df991c5cc48a6709185edf506d8bdec4d28e371)

cls/user: cls_user_set_buckets_info overwrites creation_time

metadata sync of a new bucket entrypoint may call rgw_link_bucket()
(which in turn calls into cls user) without deleting/unlinking the
previous bucket entrypoint. this prevented the new bucket entrypoint
from overwriting the creation_time of the old one

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

Added single check to avoid duplication. Included few more commands.

Signed-off-by: Shilpa Jagannath <smanjara@redhat.com>
(cherry picked from commit 14c3b4b3ebb6ef2fc44d24f8020beb2977c8e46e)

Conflicts:
        src/rgw/rgw_admin.cc
- cherry-pick was clean, but there was a build failure "error: 'class RGWRados'
has no member named 'svc'", which was fixed by making the following change:

-  bool non_master_cmd = (!store->svc.zone->is_meta_master() && !yes_i_really_mean_it);
+  bool non_master_cmd = (!store->is_meta_master() && !yes_i_really_mean_it);

- drop OPT_MFA_CREATE, OPT_MFA_REMOVE, and OPT_MFA_RESYNC which were added
  post-luminous (by 3ab463f9f538a08fd11db2b654004449994dd0fe)

rgw: Fail radosgw-admin commands on non-master zone that modify metadata
but with an option to override, allowing changes only on the local zone.

Fixes: http://tracker.ceph.com/issues/39548
Signed-off-by: Shilpa Jagannath <smanjara@redhat.com>
(cherry picked from commit 79d884eb018cd2fea9ee9e763d0339b3e8626e6d)

rgw_admin.cc: do not compare int with boolean

Fix for:

[src/rgw/rgw_admin.cc:5862]: (warning) Comparison of a boolean
 expression with an integer.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
(cherry picked from commit d5419143ac5ab0ad8d9e31bd251978b4d9355e46)

osd/OSDMap.cc: don't output over/underfull messages to lderr

There can be cases where overfull and underfull(see example in
https://tracker.ceph.com/issues/42756) will be empty, which is not
necessarily an error. These error messages can end up spamming
the ceph-mgr log.

Fixes: https://tracker.ceph.com/issues/42756
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 3cf28f09a2ebdd922fc5c1d29c65469f8331e741)

qa/cephfs: test case for timeout config of individual session

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

 Conflicts:
qa/tasks/cephfs/test_client_recovery.py

mds: add command that config individual client session

For now, the command only can change session's timeout config

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

 Conflicts:
src/mds/MDSDaemon.cc
src/mds/MDSRank.h
src/mds/mdstypes.h

mds: allow client to specify its session timeout

This is for ganesha client (it is expected to be reclaimed if it dies)
The default session timeout may be too short to reliably get ganesha
back up.

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

 Conflicts:
src/client/Client.cc
src/client/Client.h
src/include/cephfs/libcephfs.h
src/libcephfs.cc
src/mds/Server.cc

Merge pull request #31433 from smithfarm/wip-42663-luminous

luminous: tests: qa/tasks/ceph.py: pass cluster_name to get_mons

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

qa/tasks/ceph: keep mon addrs in ctx namespace

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

qa/tasks/mon_seesaw: make get_mon_status use mon addr

We don't have the 'mon addr' config property any more.

This commit cannot be cherry-picked from master because qa/tasks/mon_seesaw.py
was dropped in nautilus.

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

qa/tasks/ceph_manager: make get_mon_status use mon addr

We don't have the 'mon addr' config property any more.

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

qa/tasks/ceph.py/create_simple_monmap: use split_role

This cannot be cherry-picked from master because it fixes an issue that was
introduced into luminous by a bad backport.

Fixes: c543810cd426819538b07d2f60ebd8cdd76b9b93
Fixes: https://tracker.ceph.com/issues/42658
Signed-off-by: Nathan Cutler <ncutler@suse.com>

qa/tasks/ceph.py: pass cluster_name to get_mons

This cannot be cherry-picked from master because it fixes an issue that was
introduced into luminous by a bad backport.

Fixes: c543810cd426819538b07d2f60ebd8cdd76b9b93
Fixes: https://tracker.ceph.com/issues/42658
Signed-off-by: Nathan Cutler <ncutler@suse.com>

Merge PR #31286 into luminous

* refs/pull/31286/head:
mds: cleanup truncating inodes when standby replay mds trim log segments

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

qa: use recent kernel to kernel build testing

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

Conflicts:
qa/cephfs/begin.yaml : Resolved for extra_system_packages
(cherry picked from commit 1cf09acdca619407c8d3438049138a42fb845d70)

qa: use cephfs standard configs for kclient

Specifically, qa/cephfs/begin.yaml.

Fixes: http://tracker.ceph.com/issues/26967
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 862b84c1e8f496be71666c35c11c665c5c259a43)
(cherry picked from commit 8e483d9bb27a193c85b233b6da4231b30b63e0f4)

qa: fix malformed suite config

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

Merge pull request #31234 from smithfarm/wip-42548-luminous

luminous: crush: remove invalid upmap items

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>

Merge pull request #30329 from smithfarm/wip-41626-luminous

luminous: rgw: RGWCoroutine::call(nullptr) sets retcode=0

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

Merge pull request #30674 from smithfarm/wip-41382-luminous

luminous: rgw: housekeeping of reset stats operation in radosgw-admin and cls back-end

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>

Merge pull request #30254 from smithfarm/wip-41706-luminous

luminous: rgw: fix cls_bucket_list_unordered() partial results

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>

Merge pull request #30198 from taodd/backport-41111

luminous: rgw: fix drain handles error when deleting bucket with bypass-gc option

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

Merge pull request #31277 from dzafman/wip-network-fix-luminous

luminous: core: osd: Fix for compatibility of encode/decode of osd_stat_t

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

Merge pull request #30842 from smithfarm/wip-42264-luminous

luminous: tests: do not take ceph.conf.template from ceph/teuthology.git

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

Merge pull request #30945 from smithfarm/wip-40318-luminous

luminous: tests: qa/workunits/rados/test_librados_build.sh: install build deps

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

Merge pull request #31272 from badone/wip-luminous-restful-node-items

luminous: restful: Query nodes_by_id for items

Reviewed-by: Boris Ranto <branto@redhat.com>

Merge pull request #31278 from tchaikov/wip-luminous/42580

luminous: tests: install python3-cephfs for fs suite

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

Merge pull request #31293 from smithfarm/wip-42586-luminous

luminous: core: osd: fix out of order caused by letting old msg from down osd be processed

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

Merge pull request #30446 from tchaikov/wip-luminous-37866

luminous: mgr/localpool: pg_num is an int arg to 'osd pool create'

Reviewed-by: Neha Ojha <nojha@redhat.com>

Merge pull request #30519 from smithfarm/wip-41864-luminous

luminous: mon: ensure prepare_failure() marks no_reply on op

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

Merge pull request #30896 from smithfarm/wip-42037-luminous

luminous: osd/PeeringState: recover_got - add special handler for empty log

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>

Merge pull request #30917 from smithfarm/wip-41458-luminous

luminous: osd: merge replica log on primary need according to replica log's crt

Reviewed-by: Neha Ojha <nojha@redhat.com>

Merge pull request #31030 from smithfarm/wip-42199-luminous

luminous: osd/PrimaryLogPG: skip obcs that don't exist during backfill scan_range

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

Merge pull request #31104 from k0ste/luminous_backports2

luminous: mgr/balancer: python3 compatibility issue

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>

Merge pull request #31105 from k0ste/luminous_backports3

luminous: mgr/prometheus: replace whitespaces in metrics' names

Reviewed-by: Jan Fajerski <jfajerski@suse.com>

Merge pull request #31107 from k0ste/luminous_backports4

luminous: mgr/prometheus: Cast collect_timeout (scrape_interval) to float

Reviewed-by: Jan Fajerski <jfajerski@suse.com>

Merge pull request #31308 from dzafman/wip-smoke-21376-luminous

luminous: Various whitelists for tests to pass

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

Merge pull request #31294 from smithfarm/wip-qa-ceph-detect-init-luminous

luminous: tests/ceph-disk: drop ceph-detect-init test

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

tests/ceph-disk: drop ceph-detect-init test

This commit fixes an issue with a commit that was cherry-picked into luminous
from mimic.

17bc3dc73a14701f5f6541245955bdd343ffbee2 cherry-picked ceph-detect-init.yaml
from mimic. In mimic, this test works fine because all the supported distros use
systemd. But in luminous we support Ubuntu 14.04 which still uses Upstart
instead of systemd.

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

osd: use next_map to determine if peer is down

or peer was once down after this msg had been sent out

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

mds: cleanup truncating inodes when standby replay mds trim log segments

Standby replay mds first trims expired log segments, then replays new
log segments. It's possible a 'truncate_start' log event is in expired,
but its 'truncate_finish' counterpart is the new log segments. When mds
replays the 'truncate_finish' log event, log segment that contains the
'truncate_start' is already trimmed, so mds does nothing. This causes
leak of Inode::PIN_TRUNCATING and trigger assertion when removing
corresponding inode.

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

Conflicts:
       src/mds/MDCache.cc

Merge pull request #31257 from jan--f/wip-41289-luminous

luminous: doc: update bluestore cache settings and clarify data fraction

Reviewed-by: Igor Fedotov <ifedotov@suse.com>

qa/suites/fs: add python3-cephfs to packages

the default set of packages to install is in
$suite/qa/packages/packages.yaml . see get_package_list() in
teuthology/teuthology/task/install/__init__.py for how we prepare a
package list for install task.

for running python3 tests in
fs/basic_functional/tasks/volume-client, we need to install
python3-cephfs. please note that,
_package_override() in teuthology/teutholoy/task/install/rpm.py will
take care of the different naming on centos/rhel, where the python3
packages are named python34-*.

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

qa: do not install python3 packages in task.install

This reverts commit c1efd59f618e24cf060d564ac0f21d5b0b57fd4a

task.install.rpm installs packages listed in
$suites/qa/packages/packages.yaml, the packge list applies to the
upgrade tests also. but we don't have python3 bindings packages in jewel
-- they were introduced in kraken.

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

restful: Use node_id for _gather_leaf_ids

The _gather_leaf_ids function doesn't need the node structure, it only
needs the id.

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

restful: Query nodes_by_id for items

The node dict that is passed to the _gather_leaf_ids function from the
_gather_osds function does not have 'items' in it. We also can't use
buckets at this point since those only exist for leaf nodes, not all
nodes.

We need to query the nodes_by_id dict to get 'items' for a node inside
the _gather_leaf_ids function instead.

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

doc: update bluestore cache settings and clarify data fraction

Fixes: http://tracker.ceph.com/issues/39522
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 9d8336a7f418fe2bb11361dd74a214403b1e5be7)

Merge pull request #30242 from smithfarm/wip-41489-luminous

luminous: cephfs: client: return -EIO when sync file which unsafe reqs have been dropped

Reviewed-by: Sidharth Anupkrishnan <sanupkri@redhat.com>

Merge pull request #31166 from alfredodeza/wip-rm42292

luminous: qa/ceph-disk: use a Python2.7 compatible version of pytest

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

crush: remove invalid upmap items

We can not cancel in verify_upmap if remap an osd to different root bucket,

cluster topology:
osd.0 ~ osd.29 belongs to datacenter 1
osd30 ~ osd.59 belongs to datacenter 2
crush rule:
  take datacenter 1
  chooseleaf 2 host
  emit
  take datacenter 2
  chooseleaf 2 host
  emit
The pg's primary osd in datacenter 1.

We should cancel the pgid from upmap_items like below
1) from [26,12,54,46] to [30,12,54,46]
pg_upmap_items [26,30]

2) from [16,25,53,31] to [40,25,53,0]
pg_upmap_items [16,20,31,0]

Signed-off-by: huangjun <huangjun@xsky.com>
(cherry picked from commit 712a39e5c9d9848f618ad55a768103d84c0a460f)

Merge pull request #31172 from dzafman/wip-missed-backports

Luminous corrections for tests

Reviewed-by: Neha Ojha <nojha@redhat.com>

Merge pull request #28502 from smithfarm/wip-40166-luminous

luminous: cephfs: client: ceph.dir.rctime xattr value incorrectly prefixes 09 to the nanoseconds component

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: David Disseldorp <ddiss@suse.de>

Merge pull request #29097 from batrick/i40807

luminous: mds: msg weren't destroyed before handle_client_reconnect returned, if the reconnect msg was from non-existent session

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #29226 from smithfarm/wip-40163-luminous

luminous: cephfs: mount: key parsing fail when doing a remount

Reviewed-by: Venky Shankar <vshankar@redhat.com>

Merge pull request #29229 from smithfarm/wip-40218-luminous

luminous: tests: cephfs: TestMisc.test_evict_client fails

Reviewed-by: Venky Shankar <vshankar@redhat.com>

Merge pull request #29829 from batrick/i39691

luminous: mds: check dir fragment to split dir if mkdir makes it oversized.

Reviewed-by: Venky Shankar <vshankar@redhat.com>

Merge pull request #29830 from ukernel/luminous-41000

luminous: cephfs: client: unlink dentry for inode with llref=0

Reviewed-by: Venky Shankar <vshankar@redhat.com>

Merge pull request #28701 from batrick/i40286

luminous: qa: remove ubuntu 14.04 testing

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #30934 from smithfarm/wip-42039-luminous

luminous: client: _readdir_cache_cb() may use the readdir_cache already clear

Reviewed-by: Venky Shankar <vshankar@redhat.com>

rgw: allow radosgw-admin to list bucket w --allow-unordered

Presently the `radosgw-admin bucket list --bucket=<bucket>` lists the
objects in lexical order. This can be an expensive operation since
objects are not stored in bucket index shards in order and a selection
sort process is done across all bucket index shards.

By allowing the user to add the "--allow-unordered" command-line flag,
a more efficient bucket listing is enabled. This is particularly
important for buckets with a large number of objects.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit 12452c4a91ee56c10d3dcf970dd2b0dd5aeb2401)

rgw: return ERR_NO_SUCH_BUCKET early while evaluating bucket policy

Right now we create a ERR_NO_SUCH_BUCKET ret code but continue further
processing. Since this ret code isn't returned at any stage we end up creating a
bucket instance anyway which shouldn't happen and then succeeding the client
call in cases like put bucket versioning. Return an error code early in these
cases

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

qa/ceph-disk: use a Python2.7 compatible version of pytest

Signed-off-by: Alfredo Deza <adeza@redhat.com>

Merge pull request #30230 from dzafman/wip-network-luminous

luminous: core: Health warnings on long network ping times

Reviewed-by: Neha Ojha <nojha@redhat.com>

Merge pull request #30785 from smithfarm/wip-41919-luminous

luminous: core: osd: scrub error on big objects; make bluestore refuse to start on big objects

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>

Merge pull request #30902 from smithfarm/wip-42138-luminous

luminous: osd: Remove unused osdmap flags full, nearfull from output

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

Merge pull request #31020 from smithfarm/wip-42393-luminous

luminous: common/ceph_context: avoid unnecessary wait during service thread shutdown

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

Merge pull request #31036 from smithfarm/wip-40502-luminous

luminous: core: osd: rollforward may need to mark pglog dirty

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

Merge pull request #31049 from vshankar/wip-mds-session-ref

luminous: mds: add reference when setting Connection::priv to existing session

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

mgr/prometheus: Cast collect_timeout (scrape_interval) to float

If set by user scrape_interval option is returned as non-float by get_localized_module_option.
Metric cache timeout comparison always returns true and data is never refreshed.

Fixes: https://tracker.ceph.com/issues/40997
Signed-off-by: Ben Meekhof <bmeekhof@umich.edu>
(cherry picked from commit 26a74a0d83e068b0bb762c4c7066b4b195187e94)

Conflicts:
- path: src/pybind/mgr/prometheus/module.py
  comment: get_localized_module_option() in master, get_localized_config() in luminous

mgr/prometheus: replace whitespaces in metrics' names

Fixes: https://tracker.ceph.com/issues/39434
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit 843802f43eaa8d0117dd2585b19ac71add3f1024)

Conflicts:
- path: src/pybind/mgr/prometheus/module.py
  comment: resolved new line conflict in promethize()

mgr/balancer: python3 compatibility issue

Fixes: https://tracker.ceph.com/issues/42370
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit 97720eddd92f2fd31599ea0cecf2502f600d3bb9)

Merge pull request #31091 from smithfarm/wip-42415-luminous

luminous: doc/rbd: s/guess/xml/ for codeblock lexer

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

doc/rbd: s/guess/xml/ for codeblock lexer

this change silences the warning of

```
doc/rbd/qemu-rbd.rst:174: WARNING: Pygments lexer name 'guess' is not
known
```

see http://pygments.org/docs/lexers/, we should use "xml" for XML .

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

Merge pull request #30425 from smithfarm/wip-41544-luminous

luminous: test/librbd: set nbd timeout due to newer kernels defaulting it on

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

Merge pull request #30147 from smithfarm/wip-41266-luminous

luminous: rgw: don't throw when accept errors are happening on frontend

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

Merge pull request #30323 from smithfarm/wip-41713-luminous

luminous: rgw: fix refcount tags to match and update object's idtag

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>

mds: fix MDSRank::send_message_client_counted()

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

mds: add reference when setting Connection::priv to existing session

the bug was introduced by commit 72883956c26 "use intrusive_ptr for
holding Connection::priv"

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

qa/tasks/ceph.conf: do not warn on TOO_FEW_OSDS

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

qa/tasks/ceph.py: move methods from teuthology.git into ceph.py directly; support mon bind * options

Having these live in teuthology.git is silly, since they are only consumed
by the ceph task, and it is hard to revise the behavior.

Revise the behavior by adding mon_bind_* options.

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

Conflicts:
    qa/tasks/ceph.py
- the nautilus version of "get_mons()" includes msgr V2 code which is not needed
  in luminous