Merge pull request #31857 from smithfarm/wip-40947-luminous

luminous:  osd: add hdd, ssd and hybrid variants for osd_snap_trim_sleep

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

Merge pull request #31858 from smithfarm/wip-38205-luminous

luminous: osd: refuse to start if we're > N+2 from recorded require_osd_release

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

Merge pull request #31992 from dzafman/wip-balancer3-luminous

luminous: mgr: Release GIL and Balancer fixes

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

Merge pull request #31846 from smithfarm/wip-42988-luminous

luminous: tests: kernel.sh: update for read-only changes

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>

release note: Add pending release notes for already merged code

Follow on to https://github.com/ceph/ceph/pull/31774

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

common/options.cc, doc: osd_snap_trim_sleep overrides other variants

A value > 0 for osd_snap_trim_sleep, will override the backend specific
variants of osd_snap_trim_sleep.

Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 733df09fe5111e7beca75f8be0afb8669ef9a625)

doc/rados/configuration/osd-config-ref.rst: document snap trim sleep

Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit accf95e9dea257c3aaa64b7a36d077468d7c86ec)

osd: add hdd, ssd and hybrid variants for osd_snap_trim_sleep

This is better than the earlier default, which was set to 0.

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

Conflicts:
src/osd/OSD.cc
src/osd/OSD.h
src/osd/PrimaryLogPG.h
- no OSD::get_osd_delete_sleep() in luminous, no OSD::get_recovery_max_active()
  in luminous
- use cct->_conf->get_val instead of cct->_conf.get_val

osd: refuse to start if release > recorded min_osd_release + 2

If we try to start up the objectstore, we may make writeable changes to
(say) rocksdb that are not backwards compatible.  This happens, for
example, if you start a mimic osd.  Even if the compatset checks fail,
rocksdb may have written something that is not backwards compatible.

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

Conflicts:
src/ceph_osd.cc
- include common/version.h for ceph_release()
- use exit instead of forker.exit

osd: record require_osd_release in objectstore meta

Record the require_osd_release value from the OSDMap in the 'meta' portion
of the osd's metadata that can be accessed without actually mounting the
OSD.  This will be useful as a safety gate to prevent you from mounting
an osd thet is too new that may make incompatible changes to the store.

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

Conflicts:
src/osd/OSD.cc
src/osd/OSD.h
- ignore differences in surrounding context, as they do not seem relevant to
  the fix

Merge pull request #32019 from dzafman/wip-revert-verify-upmap-luminous

luminous: Revert "crush: remove invalid upmap items"

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

Merge pull request #31966 from smithfarm/wip-43100-luminous

luminous: ceph-detect-init: run tox tests on Python 2 only

Reviewed-by: Thomas Bechtold <tbechtold@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Jan Fajerski <jfajerski@suse.com>

ceph-detect-init: run tox tests on Python 2 only

Luminous is EOL upstream and 12.2.13 will be the last point release, so it's
pretty much a given that luminous will not be migrated to py3.

Luminous runs on OS versions where py3 is not a "first-class citizen": compiling
the mgr with a py3 subinterpreter on such systems would be "interesting"...

Python 3 testing was dropped for ceph-disk by
28c545eff5f73e392b70ef4c0cf74f8a896b693b (over 3 years ago) and
ceph-detect-init is a component of ceph-disk.

This commit cannot be cherry-picked from master because ceph-detect-init was
removed in nautilus.

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

Revert "crush: remove invalid upmap items"

This reverts commit 09528ac4663cda9f206eb8d4dcc15926b8e4586f.

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

test: Fix test to use -gt instead of creating an empty file "0"

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

test balancer: Backport specific fixes

Add "ceph balancer sleep" command to set balancer sleep_interval for testing
Remove unavailable "ceph balancer pool" part of testing
Remove setting of nonexistant osd_pool_default_pg_autoscale_mode
Improve balancer module log message
Fix log message test (no pg merging)
Pool balancing isn't grouped by rule, so results different here

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 61dedc249bb93a208e685c68a65a5c07d60870d1)
From mimic backport

qa/standalone/ceph-helpers.sh: fix mgr module path

callers of get_python_path were not passing in a $1 parameter, so
ceph_lib was an empty string resulting in an invalid path to the built
cython modules. assume this is called from the `lib` parent directory.

pass path to the manager modules when starting ceph-mgr.

Signed-off-by: Noah Watkins <nwatkins@redhat.com>
(cherry picked from commit 7d3fa9bda3b0160c872e388c9f75cd1cabf9d4b5)

Conflicts:
qa/run-standalone.sh (No get_python_path() to modify)

test: Luminous specific change required due to output difference

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

tools/osdmaptool.cc: do not use deprecated std::random_shuffle()
the use of `std::random_shuffle()` was introduced by
b946308 .

in this change, it is replaced using `std::shuffle()`.

Fixes: https://tracker.ceph.com/issues/43084
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 30dfef208d859a67c1f1b13c314735861c536e85)

Conflicts:
src/tools/osdmaptool.cc (randomizing pools here instead of rules)

Merge pull request #31934 from smithfarm/wip-tox-luminous

luminous: rpm: explicitly declare python-tox build dependency

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>

test: Add test case based on Xie script in commit comment

Other test fixes to reflect changes

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

Conflict:
src/test/cli/osdmaptool/upmap-out.t (older output format)
src/test/cli/osdmaptool/upmap.t (older output format)

osd: ceph_pg_upmaps() use any overfull when there are still underfull

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

osd: Create more_underfull with below target that aren't in underfull

Use more_underfull for finding remaps for overfull OSDs

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

osd: calc_pg_upmaps() pick most overfull remap from try_pg_upmap()

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

osd: ceph_pg_upmaps() use max_deviation to determine perfect distribution

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

Conflicts:
src/pybind/mgr/balancer/module.py (upmap_max_deviation config option
   handled differently)

tools: osdmaptool: Perform upmap calculation as ceph-mgr does

This is the backportable commit that works with older balancer module.py

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

osd: For balancer crush needs the rule passed to get_parent_of_type()

Fixes: https://tracker.ceph.com/issues/42718
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 3eb69fd0cb15974e33e675babdd5d232d69c3c6d)

osdmaptool: Match default max value of 10

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

tools: odsmaptool truncate target upmap file

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

mgr: Improve balancer module status

Add balancer status fields so that slow optimizations can be detected

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

test: Test balancer module commands

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

mgr: Release GIL before calling OSDMap::calc_pg_upmaps()

Prevent optimize and execute commands from running with active balancer

Fixes: https://tracker.ceph.com/issues/42432
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit e2a35e8c8e9f381a635ad0ca01326a2c512590a9)

Conflicts:
src/pybind/mgr/balancer/module.py (trivial)
src/test/cli-integration/balancer/misplaced.t (doesn't exist)

rpm: explicitly declare python-tox build dependency

"make check" needs python-tox to run, but until 71ac2163831ffd764bf3da6a3efa76ef02e5e884
("ceph.spec: added dashboard_v2 development and runtime dependencies")
this was not explicitly declared in the spec file. It does not make sense to
backport that commit to luminous, though, because the dashboard itself was never
backported to luminous.

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

Merge pull request #31664 from hillpd/wip-38714-luminous

luminous: rgw: resolve bugs and clean up garbage collection code

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

Merge pull request #31655 from smithfarm/wip-40496-luminous

luminous: doc: fixed --read-only argument value in multisite doc

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

Merge pull request #31647 from smithfarm/wip-39603-luminous

luminous: doc/rgw: document CreateBucketConfiguration for s3 PUT Bucket api

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

qa: kernel.sh: update for read-only changes

Snapshot existence validation code was removed from krbd.  It was racy
and relied on having watch established for snapshots.

Fixes: https://tracker.ceph.com/issues/42916
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 6fb544045e743c5dc73dac2f62aeeb964dcd62bc)

Merge pull request #31696 from k0ste/wip-42849-luminous

luminous: pybind/mgr: Cancel output color control

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

Merge pull request #31587 from k0ste/wip-42784-luminous

luminous: mgr/prometheus: assign a value to osd_dev_node when obj_store is not filestore or bluestore

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

Merge pull request #31360 from idryomov/wip-krbd-udev-fixes-luminous

luminous: krbd: avoid udev netlink socket overrun and retry on transient errors from udev_enumerate_scan_devices()

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Dongsheng Yang <dongsheng.yang@easystack.cn>

Merge pull request #31654 from smithfarm/wip-40350-luminous

luminous: rgw/OutputDataSocket: actually discard data on full buffer

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

Merge pull request #31653 from smithfarm/wip-40359-luminous

luminous: rgw: set null version object acl issues

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

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>

rgw: resolve bugs and clean up garbage collection code

Does a number of things to clean up rgw gc code:

  * adds additional logging to make future debugging easier.
  * resolves bug where the truncated flag was not always set correctly
    in gc_iterate_entries
  * resolves bug where marker in RGWGC::process was not advanced
  * resolves bug in which gc entries with a zero-length chain
    were not trimmed
  * resolves bug where same gc entry tag was added to list for
    deletion multiple times

Fixes: http://tracker.ceph.com/issues/38454
Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit 73d7d36)

Conflicts:
src/rgw/rgw_gc.cc dout() vs ldpp_dout()

Note: This was a clean cherry-pick from Mimic, which already resolved
      dout() vs ldpp_dout() conficts.

Signed-off-by: Dan Hill <daniel.hill@canonical.com>
(cherry picked from commit a598ccce2e)

pybind/mgr: Cancel output color control

When I do "ceph osd status" command, the units are not visible
when using a black background, So cancel outpul color control

Fixes: https://tracker.ceph.com/issues/42517
Signed-off-by: Zheng Yin <zhengyin@cmss.chinamobile.com>
(cherry picked from commit ca2675e215acc8fbfb2d730b9c1f9f3aafc3e67d)

Conflicts:
- path: rc/pybind/mgr/mgr_util.py
  comment: mgr_util.py in luminous is status/module.py

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

doc: fixed --read-only argument value in multisite doc

Fixes: https://tracker.ceph.com/issues/40458
Signed-off-by: Chenjiong Deng <dengchenjiong@umcloud.com>
(cherry picked from commit c65832c1ff03e802f98cb7f4bda620e1e515264f)

rgw/OutputDataSocket: actually discard data on full buffer

A dout message in OutputDataSocket::append_output() states that
data will be dropped when appending would cause data_max_backlog
to be exceeded--but the method appends it anyway.

Log output discards at level 0, as messages will be lost.  Suppress
repeated warnings mod 100.  Switch to vector.

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

Conflicts:
src/common/OutputDataSocket.cc
src/common/OutputDataSocket.h

rgw: set null version object acl issues

1.set null version object acl will create empty index
RGWRados::set_attrs did not clear instance, so index prepare, complete got instance=null,
which lead to empty index 1000_<obj>_i_null.
there is no harm to create empty index, but listomapkeys to find that key.

2.if object is exist with versioned key, we can set none exists null version object
order:
1) enable bucket version
2) put obj
3) disable bucket version
4) set versoned_id=null acl will succeed which should not

Fixes: http://tracker.ceph.com/issues/36763
Signed-off-by: Tianshan Qu <tianshan@xsky.com>
(cherry picked from commit ca6e5c89e8d6da498da15f0eea4bcd4d271b44e9)

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)

doc/rgw: document CreateBucketConfiguration for s3 PUT Bucket api

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

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)

mgr/prometheus: initializing osd_dev_node = None

Signed-off-by: jiahuizeng <jhzeng93@foxmail.com>
(cherry picked from commit d7e84a0be1d6113d527a3b525647041775f643e2)

mgr/prometheus: assign a value to osd_dev_node when obj_store is not filestore or bluestore

Fixes: https://tracker.ceph.com/issues/42017
Signed-off-by: jiahuizeng <jhzeng93@foxmail.com>
(cherry picked from commit f5b51a35930bda5499531c75f0c80816afe4ab24)

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>