mon: osd crush set crushmap need sanity check

The sanity check verifying the new crushmap does not remove crush rules
that are in use is not exclusive to ceph setcrushmap.

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

 crush: when take place the crush map should consider the rule is in used

Signed-off-by: song baisen song.baisen@zte.com.cn
(cherry picked from commit 09bf6f2858d09c8c314a8c242a9c70d2834718dc)

Merge pull request #16059 from vumrao/wip-vumrao-20353

jewel: osd: Add heartbeat message for Jumbo Frames (MTU 9000)

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

Merge pull request #15726 from asheplyakov/20314-bp-jewel

jewel: mon: fail to form large quorum; msg/async busy loop

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Haomai Wang <haomai@xsky.com>

Merge pull request #15719 from Vicente-Cheng/wip-20146-jewel

jewel: rgw: 'gc list --include-all' command infinite loop the first 1000 items

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

Merge pull request #15477 from smithfarm/wip-19767-jewel

jewel: rgw: Delete non-empty bucket in slave zonegroup

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

Merge pull request #16015 from asheplyakov/19208-bp-jewel

jewel: osd: osd_internal_types: wake snaptrimmer on put_read lock, too

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

Merge pull request #15762 from smithfarm/wip-17385-jewel

jewel: ceph cli: Rados object in state configuring race

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

Merge pull request #15474 from smithfarm/wip-19559-jewel

jewel: osd: objecter full_try behavior not consistent with osd

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

Merge pull request #15947 from asheplyakov/20428-bp-jewel

jewel: osd: unlock sdata_op_ordering_lock with sdata_lock hold to avoid missing wakeup signal

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Liu-Chunmei <chunmei.liu@intel.com>
Reviewed-by: Xie Xingguo <xie.xingguo@zte.com.cn>

Merge pull request #15475 from tchaikov/wip-16239-jewel

qa: add a sleep after restarting osd before "tell"ing it

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

Merge pull request #15473 from smithfarm/wip-20080-jewel

jewel: build/ops: rpm: set subman cron attributes in spec file

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

Merge pull request #15460 from smithfarm/wip-17843-jewel

jewel: rbd: object-map: batch updates during trim operation

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

Merge pull request #15488 from dillaman/wip-20023-jewel

jewel: rbd: rbd-mirror: ensure missing images are re-synced when detected

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

Merge pull request #15602 from tchaikov/wip-20175-jewel

jewel: tests: decouple ceph_test_librbd_api from libceph-common

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

Merge pull request #16124 from smithfarm/wip-19174-jewel

jewel: rbd: rbd_clone_copy_on_read ineffective with exclusive-lock

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

Merge pull request #15760 from smithfarm/wip-20325-jewel

libradosstriper silently fails to delete empty objects in jewel

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

Merge pull request #16061 from weiqiaomiao/wqm-wip-ceph-disk-jewel

jewel: ceph-disk: remove the special check to bcache devices

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Zhu Shangzhong <zhu.shangzhong@zte.com.cn>

Merge pull request #15503 from Vicente-Cheng/wip-20011-jewel

jewel: tools: ceph-disk: separate ceph-osd --check-needs-* logs

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

Merge pull request #14874 from ceph/wip-19805-jewel

jewel: rbd: default features should be negotiated with the OSD

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

Merge pull request #14977 from dillaman/wip-19873-jewel

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

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

Merge pull request #15461 from smithfarm/wip-19795-jewel

jewel: tests: test_notify.py: assert(not image.is_exclusive_lock_owner()) on line 147

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

Merge pull request #15463 from smithfarm/wip-20017-jewel

jewel: rbd: rbd-nbd: kernel reported invalid device size (0, expected 1073741824)

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

Merge pull request #15464 from smithfarm/wip-20153-jewel

jewel: rbd: Potential IO hang if image is flattened while read request is in-flight

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

Merge pull request #15455 from smithfarm/wip-19838-jewel

jewel: rgw: reduce log level of 'storing entry at' in cls_log

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

Merge pull request #15456 from smithfarm/wip-20003-jewel

jewel: rgw: rgw_file:  v3 write timer does not close open handles

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

Merge pull request #15457 from smithfarm/wip-20018-jewel

jewel: rgw: multisite: memory leak on failed lease in RGWDataSyncShardCR

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

Merge pull request #15459 from smithfarm/wip-20144-jewel

jewel: rgw: rgw_file: cannot delete bucket w/uxattrs

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

Merge pull request #15465 from smithfarm/wip-20155-jewel

jewel: rgw: fix crash caused by shard id out of range when listing data log

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

librbd: clean up object map update interface, revisited

In master, the "batch update" change [1] was merged before the "order
concurrent updates" [2], while in jewel the latter is already
backported [3]. A backport of [1] to jewel was attempted, and was
necessarily applied on top of [3] - i.e. in the reverse order compared
to how the commits went into master. This reverse ordering caused the
automated cherry-pick to miss some parts of [1] which this commit is
adding manually.

[1] https://github.com/ceph/ceph/pull/11510
[2] https://github.com/ceph/ceph/pull/12420
[3] https://github.com/ceph/ceph/pull/12909

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>

librbd: batch ObjectMap updations upon trim

Shrinking a clone which has snapshots and does not share
majority of objects with its parent (i.e., there are less
objects to be copied up) involves huge number of object
map updates -- two (pre, post) per object. This results
in lots of requests to be send to OSDs especially when
trimming a gigantus image. This situation can be optimized
by sending batch ObjectMap updates for an object range
thereby significantly cutting down OSD traffic resulting
in faster trim times.

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

Merge PR #16248 into jewel

* refs/remotes/upstream/pull/16248/head:
client: don't re-send interrupted flock request
mds/flock: properly remove item from global_waiting_locks
mds/flock: properly update ceph_lock_state_t::client_waiting_lock_counts
mds/flock: don't import ceph_lock_state_t::waiting_locks

Reviewed-by: Zheng Yan <zyan@redhat.com>

Merge pull request #15454 from smithfarm/wip-19775-jewel

jewel: rgw: multisite: realm rename does not propagate to other clusters

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

Merge pull request #15453 from smithfarm/wip-19768-jewel

jewel: rgw: multisite: operating bucket's acl&cors is not restricted on slave zone

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

Merge pull request #15452 from smithfarm/wip-19765-jewel

jewel: rgw: when uploading objects continuously into a versioned bucket, some objects will not sync

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

Merge pull request #15451 from smithfarm/wip-19764-jewel

jewel: rgw: set latest object's acl failed

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

Merge pull request #15450 from smithfarm/wip-19758-jewel

jewel: rgw: multisite: after CreateBucket is forwarded to master, local bucket may use different value for bucket index shards

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

qa/workunits/rados/test-upgrade-v11.0.0: skip ListObjectsError

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

qa/workunits/rados/test-upgrade-v11.0.0: skip more tests

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

Merge pull request #16870 from liewegas/wip-20929-jewel

jewel: ceph-disk: dmcrypt cluster must default to ceph

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

Merge pull request #14659 from asheplyakov/19473-jewel

jewel: rgw: add the remove-x-delete feature to cancel swift object expiration

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

Merge pull request #15322 from gregsfortytwo/jewel-19931-snaptrim-shutdown

jewel: osd: Reset() snaptrimmer on shutdown and do not default-abort on leaked pg refs

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

Merge pull request #15236 from asheplyakov/20036-bp-jewel

jewel: mon: factor mon_osd_full_ratio into MAX AVAIL calc

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

Merge pull request #14346 from ceph/wip-ceph-disk-fix-jewel

jewel: build/ops: Add fix subcommand to ceph-disk, fix SELinux denials, and speed up upgrade from non-SELinux enabled ceph to an SELinux enabled one

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

Merge pull request #15083 from asheplyakov/19926-bp-jewel

jewel: mon: crash on shutdown, lease_ack_timeout event

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

Merge pull request #14663 from smithfarm/wip-19228-jewel

jewel: rbd: Enabling mirroring for a pool with clones may fail

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

Merge pull request #15050 from asheplyakov/19265-bp-jewel

jewel: core: an OSD was seen getting ENOSPC even with osd_failsafe_full_ratio passed

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

Merge pull request #15065 from asheplyakov/19915-bp-jewel

jewel: osd: PrimaryLogPG: do not call on_shutdown() if (pg.deleting)

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

Merge pull request #14943 from shinobu-x/wip-18293-jewel

jewel: osd: leaked MOSDMap

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

Merge pull request #14699 from smithfarm/wip-19679-jewel

jewel: mds: damage reporting by ino number is useless

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

Merge pull request #14673 from smithfarm/wip-19466-jewel

jewel: mds: log rotation doesn't work if mds has respawned

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

qa/workunits/rados/test-upgrade-v11.0.0.sh: more tests skipped

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

Merge pull request #15442 from Vicente-Cheng/wip-20025-jewel

jewel: cephfs: osdc/Filer: truncate large file party by party

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>

Merge pull request #14691 from smithfarm/wip-19571-jewel

jewel: tests: upgrade:client-upgrade/firefly-client-x: drop CentOS

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

librbd: default features should be negotiated with the OSD

Derived from f066ce8f80bce929edc209590efd47cce2196ae2

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

cls/rbd: add get_all_features on client side

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
(cherry picked from commit 84f6d5c109911923c25414de639308921983e438)

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

Merge pull request #15448 from smithfarm/wip-19615-jewel

jewel: rgw: multisite: bucket zonegroup redirect not working

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

tests: upgrade:client-upgrade/firefly-client-x: drop CentOS

The RBD suite needs ceph-cm-ansible to install qemu-kvm on CentOS, but doing
that breaks the firefly install on CentOS because:

1. the qemu-kvm that gets installed is from hammer (0.94.5)
2. qemu-kvm brings in librados2, librbd1 as dependencies

As a result, the hammer librados2 and librbd1 are installed on the test nodes
even before the teuthology install task starts. When it does start and tries
to install firefly, it fails because firefly librados2 and librbd1 cannot be
installed over their hammer versions.

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

Merge pull request #15197 from smithfarm/wip-20007-jewel

jewel: rgw: remove unnecessary 'error in read_id for object name: default'

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

Merge pull request #15051 from asheplyakov/19910-bp-jewel

jewel: build/ops: extended, customizable systemd ceph-disk timeout

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

Merge pull request #15428 from smithfarm/wip-20162-jewel

jewel: build/ops: deb: Fix logrotate packaging

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

Merge pull request #15447 from smithfarm/wip-19613-jewel

jewel: rgw: multisite: rest api fails to decode large period on "period commit"

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

test: remove hard-coded image name from RBD metadata test

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

librbd: relax "is parent mirrored" check when enabling mirroring for pool

If the parent is in the same pool and has the journaling feature enabled
we can assume the mirroring will eventually be enabled for it.

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

Merge pull request #15196 from smithfarm/wip-20006-jewel

jewel: build/ops: rpm: fix python-Sphinx package name for SUSE

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>

qa/workunits/rados/test/test-upgrade-v11.0.0: skip Quota test

This makes a pool go full which confounds the wait for healthy check
during restarts.

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

qa/workunits/rados/test-upgrade-v11.0.0: skip api_io *CmpExt*

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

qa/workunits/rados/test-upgrade-11.0.0: skip RoundTrip3

This does the crc op, which isn't in jewel.

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

Merge pull request #16343 from dillaman/wip-20630-jewel

jewel: tests: qa/tasks: rbd-mirror daemon not properly run in foreground mode

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

ceph-disk: dmcrypt cluster must default to ceph

If ceph_fsid is not found, which is the case for legacy dmcrypted OSD,
the cluster must default to ceph, as it was before support for non
standard cluster names was introduced.

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

Merge pull request #13507 from shinobu-x/wip-18468-jewel

jewel: mon: Disallow enabling 'hashpspool' option to a pool without some kind of --i-understand-this-will-remap-all-pgs flag

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

osdc/Filer: truncate large file party by party

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

Conflicts:
src/osdc/Filer.h
src/osdc/Filer.cc
    - add parameter to fit _modify (need onack parameter)
src/mds/MDCache.cc
    - make truncate() consistency

jewel:ceph-disk:remove the special check to bcache devices

if we skip partition when coming cross the bcache device in ceph-disk,
the udev can't detect the osd in such devices when we reboot the osd's host,
so the osd who deploy in bcache device can't auto start when the host restart.

And partition is now supported by bcache devices (https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit/drivers/md/bcache?id=b8c0d911ac5285e6be8967713271a51bdc5a936a),
we can remove this special check now.

This cannot be cherry-picked from master because 'accept bcache devices as data disks' [21f0216](https://github.com/ceph/ceph/commit/21f0216287485e6cce8811f324fee804ef733524)
is a jewel-only feature not present in master.

Signed-off-by: Wei Qiaomiao <wei.qiaomiao@zte.com.cn>

jewel: mon: Fix status output warning for mon_warn_osd_usage_min_max_delta

Fixes: http://tracker.ceph.com/issues/20544
Caued by: 489e810c37ed6fb9d32d1015634041a577501ee4

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

Conflicts:
apply changes to src/mon/PGMonitor.cc instead of src/mon/PGMap.cc

Merge pull request #16289 from cbodley/wip-20513

jewel: rgw: cls: ceph::timespan tag_timeout wrong units

messages/MOSDPing: optimize encode and decode of dummy payload

The dummy payload doesn't need to be processed, we can just skip over
it when decoding and we can use a single bufferptr instead of entire
bufferlist to encode it.

Signed-off-by: Piotr Dałek <piotr.dalek@corp.ovh.com>
(cherry picked from commit 15ce0772841f913d1eef1daebad0834e5f862383)

messages/MOSDPing: fix the inflation amount calculation

If user specifies a min_message_size small enough (or zero to disable
it altogether), OSDs will crash and burn while trying to allocate
almost 4GB of payload (both min_message_size and payload.length() are
unsigned, so it'll roll over back to 4GB and MAX(4GB, 0) will use 4GB).
If the size of dummy payload is 0, don't bother constructing bufferptr
and bufferlist, then encoding that.

Signed-off-by: Piotr Dałek <piotr.dalek@corp.ovh.com>
(cherry picked from commit d959735a7d684018df564573a2ff88092d870fc1)

OSD: mark two heartbeat config opts as observed

"osd heartbeat min size" and "osd heartbeat interval" can be changed
at runtime, because their values, when used, are always taken from
global Ceph configuration. Mark them as observed, so the message
the user sees once they're changed doesn't confuse them.

Signed-off-by: Piotr Dałek <piotr.dalek@corp.ovh.com>
(cherry picked from commit 44b7839c788b20e0b9da76bc3838ae10d3ad2f89)

messages/MOSDPing: initialize MOSDPing padding

This memory must be initialized or else valgrind will be very unhappy.

Avoid the cost of zeroing (or even allocating) the buffer for normal
padding values by (re)using a static zero buffer.

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

osd: heartbeat with packets large enough to require working jumbo frames.

We get periodic reports that users somehow misconfigure one of their switches
so that it drops jumbo frames, yet the servers are still passing them along. In
that case, MOSDOp messages generally don't get through because they are much
larger than the 1500-byte non-jumbo limit, but the MOSDPing messages have kept
going (as they are very small and dispatched independently, even when the
server is willing to make jumbo frames). This means peer OSDs won't mark down
the ones behind the broken switch, despite all IO hanging.
Push the MOSDPing message size over the 1500-byte limit so that anybody in
this scenario will see the OSDs stuck behind a bad switch get marked down.

Fixes: http://tracker.ceph.com/issues/20087
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 2096113d9e1589c571d96e34dd9cd841308a2567)

 Conflicts:
src/messages/MOSDPing.h
         - Changed HEAD_VERSION to 3 and kept COMPAT_VERSION to 1.
         - In class MOSDPing removed following line:
               if (header.version >= 2)
         - To keep ::decode(stamp, p) without condition because HEAD_Version
           is already 3 now and this condition is removed in the backport commit.

qa/tasks: rbd-mirror daemon not properly run in foreground mode

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

10.2.9

Merge pull request #16282 from smithfarm/wip-20599-jewel

jewel: cephfs: Damaged MDS with 10.2.8

Reviewed-by: Yan, Zheng <zyan@redhat.com>

rgw: allow larger payload for period commit

testing with 3 zonegroups and 3 zones each, the period json grew larger
than 4k and caused decode failures on period commit

updated to use the new config variable rgw_max_put_param_size

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

Conflicts:
    src/rgw/rgw_rest_realm.cc - in RGWOp_Period_Post::execute(), set max_size
        explicitly instead of backporting rgw_max_put_param_size

rgw: when create_bucket use the same num_shards with info.num_shards

pr #14388 only fix the num_shards in BucketInfo, "init_bucket_index" function still use local num_shards

Fixes: http://tracker.ceph.com/issues/19745
Signed-off-by: Shasha Lu <lu.shasha@eisoo.com>
(cherry picked from commit 4ce64a190b4ff36985e785e574c077d39796feea)

Conflicts:
src/rgw/rgw_rados.cc: init_bucket_index() called earlier

rgw: using the same bucket num_shards as master zg when create bucket in secondary zg

create bucket in secondary zonegroup will forward to master. The master may have different num_shards option.
So when create bucket in local, should use master's num_shards instead of local num_shards option.

Fixes: http://tracker.ceph.com/issues/19745
Signed-off-by: Shasha Lu <lu.shasha@eisoo.com>
(cherry picked from commit a34c4b8fb13dd5590eb3c6ecb5e55207ed8e3ee8)

Conflicts:
    src/rgw/rgw_op.cc
    - different argument list of store->create_bucket() in jewel, compared to
      master
    - no RGWBulkUploadOp:: in jewel; modifications to
      RGWBulkUploadOp::handle_dir() omitted

rgw: cls: ceph::timespan tag_timeout wrong units

In rgw_dir_suggest(), the ceph::timespan tag_timeout is intended
to be a value in seconds, but has been taken as something much
smaller (millis?).  The incorrect time scale likely induces a race
condition with object deletes.

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

Revert "osdc/Journaler: make header write_pos align to boundary of flushed entry"

This reverts commit 2e299b50de4a297fee2aec21290632336d239857.

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

Revert "osdc/Journaler: avoid executing on_safe contexts prematurely"

This reverts commit 06cf9f365033f7913051bdf4060f0bc6fc0444d7.

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

Merge pull request #16273 from smithfarm/wip-jewel-pending-release-notes

jewel: doc: clarify status of jewel PendingReleaseNotes

doc: zero PendingReleaseNotes in preparation for v10.2.9

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

doc: clarify status of jewel PendingReleaseNotes

Status as of 10.2.8 release

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

client: don't re-send interrupted flock request

don't re-send interrupted flock request in cases of mds failover
and receiving request forward.

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

 Conflicts:
src/client/Client.cc: UserPerms not in jewel

mds/flock: properly remove item from global_waiting_locks

ceph_lock_state_t::remove_waiting() uses wrong key to search
global_waiting_locks. It should use item in waiting_locks as
key.

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

mds/flock: properly update ceph_lock_state_t::client_waiting_lock_counts

no item is added to waiting_locks when deadlock check fails

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

mds/flock: don't import ceph_lock_state_t::waiting_locks

Item in waiting_locks is associated with flock mds request in
exporter mds. If client re-sends the flock mds request to the
importer, the importer starts a new MDRequest. The new one's
'flock_was_waiting' is false.

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

rpm: Fix undefined FIRST_ARG

If FIRST_ARG is undefined, the rpms will show an error on upgrade
because the condition in the postun script gets broken.

This was a regression introduced by commit for issue 20077 that moved
ceph-disk unit files to ceph-base.

Fixes: http://tracker.ceph.com/issues/20077
Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit 562816914ccca8e4e7d9c31f333db2f0da6f7c99)

selinux: Install ceph-base before ceph-selinux

We need to have ceph-base installed before ceph-selinux to use ceph-disk
in %post script. The default ordering is random and so the installation
randomly failed to relabel the files.

Fixes: http://tracker.ceph.com/issues/20184
Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit e69086645d3411a2ed781609b670eb5f16ac4810)
Conflicts:
ceph.spec.in: No _epoch_prefix in jewel

test/librbd: decouple ceph_test_librbd_api from libceph-common

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

Conflicts: master has switched from autotools to cmake, so this is
  somewhat an equivalent in automake to the cherry-picked change on
  CMakeLists.txt

test/librados: extract functions using libcommon in test.cc into test_common.cc

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

Conflicts: since master has switched to cmake. the changes in this
  commit on .am files are ported from counterpart of CMakeLists.txt.