journal: avoid holding lock while sending journal append

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

rbd-mirror: wait for in-flight event commit notifications

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

journal: fix AsyncOpTracker compiler error

The master branch has an async JournalTrimmer which shouldn't be
backported to the Jewel branch yet. This change addresses the
missing sync AsyncOpTracker::wait_for_ops method from the backported
class.

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

common: move AsyncOpTracker to common library

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

Conflicts:
src/journal/CMakeLists.txt: doesn't exist in Jewel

librbd: support deleting image by id instead of name

The rbd-mirror daemon will use this API to delete images instead
of attempting to use the local image name.

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

rbd-mirror: use pool id + global image id as deletion primary key

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

rbd-mirror: concurrent access of event might result in heap corruption

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

rbd-mirror: test: Fixed timeout problem in rbd_mirror_stress.sh

Signed-off-by: Ricardo Dias <rdias@suse.com>
(cherry picked from commit 5c737038dd6d44bd76605587486ddf9457bc2d96)

rbd: Fix race between journal flush and append events

Signed-off-by: Ricardo Dias <rdias@suse.com>
(cherry picked from commit aa959e71fe5a8cec43de75007fc9cef8de5ee3a5)

journal: make librados call async in ObjectRecorder

Signed-off-by: Ricardo Dias <rdias@suse.com>
(cherry picked from commit 7b740f5b4ac1c66ac3c80782d2d34e846d00fddd)

journal: increase concurrency of journal recorder

Signed-off-by: Ricardo Dias <rdias@suse.com>
(cherry picked from commit 5c88edd68a1ee7c77f11e4113251fbe5768b8d99)

journal: send update notification when tag allocated

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

librbd: new journal listener event for force promotion

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

librbd: helper class for quiescing in-flight async ops

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

librbd: unify journal event callbacks into single interface

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

journal: expose ability to retrieve partial tag list

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

qa/workunits/rbd: fix remove mirrored image race conditions

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

qa/workunits/rbd: new mirroring forced promotion test

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

test/rbd: fix possible mock journal race conditions

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

qa/workunits/rbd: before removing image make sure it is not bootstrapped

If an image is being bootstrapped, it implies that the rbd-mirror
daemon currently has the image open. The removal API will prevent the
removal of any image that is opened by another client.

Works-around: http://tracker.ceph.com/issues/16555
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
(cherry picked from commit 9737a8d6cbaf1b79bbc6008249d39acbae883941)

librbd: fix journal create compilation error

The synchronous journal create method no longer exists on the master
branch and the associated change to introduce an asynchronous journal
creation state machine should be delayed to provide more testing time
on the master branch before being backported to jewel.

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

test: fixed unused function warnings in unittest_rbd_mirror

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

rbd-mirror: prevent syncing to non-primary image after failover

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

rbd-mirror: demote/promote in same cluster results in split-brain

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

librbd: normalize journal promotion/demotion events

A non-primary image's commit possition won't accurately reflect
the current demotion/promotion chain. Therefore, directly specify
the predecessor for promotion events.

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

librbd: block RPC requests when demoting the image

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

librbd: separate journal::TagData predecessor data into new struct

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

rbd-mirror: include tag tid in bootstrap debug log messages

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

qa/workunits/rbd: demote/promote image on same cluster

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

rbd-mirror: option to automatically resync after journal client disconnect

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

Conflicts:
src/common/config_opts.h: trivial resolution

rbd-mirror: stop replay when client is disconnected

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

rbd-mirror: resync was possible only when image replayer start had succeeded

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

rbd-mirror: decode_client_meta should return false on error

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

rbd: new command to disconnect journal client

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

librbd: optionally flag "laggy" journal clients disconnected

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

journal: allow to trim journal for "laggy" clients

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

cls/journal: add async client_update_state method

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

Merge pull request #11389 from jcsp/wip-17466-jewel

jewel: mon: don't crash on invalid standby_for_fscid

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

Merge pull request #10997 from batrick/i17105-backport

jewel: multimds: allow_multimds not required when max_mds is set in ceph.conf at startup

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

Merge pull request #10958 from ukernel/jewel-16764

jewel: client: fix shutdown with open inodes

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

Merge pull request #10921 from jcsp/wip-client-lock-backport

jewel: client: add missing client_lock for get_root

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

Merge pull request #11400 from ceph/wip-rbd-cli-jewel

jewel: krbd-related CLI patches

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

Merge pull request #11171 from ceph/wip-rasize-doc-jewel

jewel: doc: fix description for rsize and rasize

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

rbd: expose rbd unmap options

Reuse rbd map -o infrastructure to expose rbd unmap options in
a similar fashion.  Currently it's just one bool option, but we may
need more in the future.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 620f5e1455fdcb05cd3873c1e260141849829e35)

Conflicts:
doc/man/8/rbd.rst [ PR #9151 ("rbd: add methods to set and get
  snapshot limits") not in jewel ]

rbd: fix up terminology in help texts

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit ba8f9ee791d55c4cf25ad751213ea6ba770b7434)

rbd: recognize lock_on_read option

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit e857b7896527b676155d6e01c78567337dc33b1c)

doc: clarify rbd size units

It wasn't clear from the man page that --size defaults to M.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit d38dc29ed588b8933da3b66e46e1f0dd4cbb2cf4)

Conflicts:
doc/man/8/rbd.rst [ PR #9066 ("rbd: introduce a simple bench
  for read") not in jewel ]

Merge pull request #10812 from SUSE/wip-17094-jewel

jewel: build/ops: ceph-osd-prestart.sh fails confusingly when data directory does not exist

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

Merge pull request #11335 from linuxbox2/jewel-nfs

jewel: rgw: nfs backports

Merge pull request #11332 from linuxbox2/jewel-ldap

jewel: rgw: combined LDAP backports

mds: remove max_mds config option

It is now required that all changes to max_mds use the run-time `ceph fs
set max_mds` command. The rationale for this change is that it is
confusing to have a configuration for max_mds which is only observed at
file system creation.

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

Merge pull request #10761 from dachary/wip-16377-jewel

jewel: msgr/async: Messenger thread long time lock hold risk

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

Merge pull request #10278 from SUSE/wip-16667-jewel

jewel: incorrect value of CINIT_FLAG_DEFER_DROP_PRIVILEGES

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

mds: make mds_role_t member order match constructor

Previously this was mildy confusing.

Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 63d711d4e9decd2940c55aa697e6a588593da23a)

mon: don't crash on invalid standby_for_fscid

Fixes: http://tracker.ceph.com/issues/17466
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 92fdcf36bd7d57b97f5d887d0370a181860e388c)

messages: fix MMDSBeacon constructor

This was leaving garbage in some fields during decode
when decoding messages with an older version.

Fixes: http://tracker.ceph.com/issues/17466
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit f1fb667dfd21cd241f4f45ce9ef3f8393d114c60)

Merge pull request #10794 from SUSE/wip-17082-jewel

jewel: disable LTTng-UST in openSUSE builds

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

Merge pull request #9739 from vumrao/wip-vumrao-16337

jewel: osd: add peer_addr in heartbeat_check log message

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

Merge pull request #9388 from vumrao/wip-vumrao-16069

jewel: mon: Display full flag in ceph status if full flag is set

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

Merge pull request #10496 from Abhishekvrshny/wip-16583-jewel

jewel: mon crash: crush/CrushWrapper.h: 940: FAILED assert(successful_detach)

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

Merge pull request #11018 from ceph/wip-17223-jewel

jewel: krbd qa scripts and concurrent.sh test fix

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

rgw_file:  pre-assign times

Set unix timestamps based on RGW values for creation, modification
time for buckets, objects in stat requests.  Regard any saved
value of these in unix attributes as an overlay.

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

Fixes: http://tracker.ceph.com/issues/17394

rgw_file: fix set_attrs operation

The effective part of this change is to always set a value
for RGW_ATTR_UNIX_KEY1 (because it is expected later).

Secondarily, do not pass the address of the to-set attributes
buffer::list as remove attrs--this is confusing.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 08afb40b2812270a6af3cd1965e8c03c10392ace)

Fixes: http://tracker.ceph.com/issues/17393

rgw_file: implement rgw_setattr

Introduce a new RGWSetattrs RGWOp descendant, to create or replace
sets of attrs on buckets or objects.

This version of the change uses the standard RGWRADOS::set_attrs op
(we want attribute changes to (e.g.) sync with other changes).

Previous versions of this changed incorrectly masked the values
of st->st_ino in RGWFileHandle::stat(), now fixed.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 4de1c3c260265f821ebee842d49cb35bf49d8e4e)

Fixes: http://tracker.ceph.com/issues/17311
Fixes: http://tracker.ceph.com/issues/17332

rgw: remove duplicated calls to getattr

Signed-off-by: Weibing Zhang <zhangweibing@unitedstack.com>
(cherry picked from commit 87b550ed2fba472d4ef2e1f771bb5f9fd248804f)

Fixes: http://tracker.ceph.com/issues/17327

rgw: rgw file fix bug of rgw_lookup can not exact match file name

bug reproduce steps:
in nfs-client (connect to nfs-ganesha server):
1. mv file file.rename
2. stat file // get file attrs, not return with -ENOENT

the reason is that:
RGWStatLeafRequest does not exact match the file name,
just take file name as a prefix filter

Signed-off-by: Min Chen <chenmin@xsky.com>
(cherry picked from commit 9d813bafc8e197507457c58ab4f365ccdb7f3589)

Fixes: http://tracker.ceph.com/issues/17326

rgw: fix the wrong return value

Here `parent->readdir` will return negative numbers When there is an error.
so we should just return it.

Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
(cherry picked from commit c979be7810793534715c24c6a9f7c8b0ed31de8d)

Fixes: http://tracker.ceph.com/issues/17325

rgw_file: restore local definition of RGWLibFS gc interval

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 31936caa09b46e86700faad969adfa9d43176206)

Fixes: http://tracker.ceph.com/issues/17323

rgw_file:  explain semantics of RGWFileHandle::commit

Add a comment explaining why the method currently returns 0
unconditionally.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit b1da1354320cc5f69277b225a293a03cc2a5054f)

ceph_timer: prefer using directive to typedef

This change replaces the existing member-hook typedef as well as
the new set-type typedefs, so committed separately.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit f7d4d418658d2091652033045abdb4bfbeb637aa)

librgw: add API version defines for librgw and rgw_file

This change borrows the major, minor+extra format used by libcephfs.
The version numbering is starting at 1,1,0 on the theory that the
implicit version at Jewel is 1,0,0.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 355ccc5ded7f0b459bca24bc8b504b41807c583d)

rgw file: allow RGWLibFS::write_completion_interval_s to be set in conf

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 70dad0fba561edaf0bb4e746e29b92a4e9b014b2)

rgw_file:  log on write completion events at level 10

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit d1e512d8c0e20df5a96ccb5f775a7a2ca123efbe)

rgw_file: add RGW_OPEN_FLAG_STATELESS as a synonym for V3

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit da596eb3af69c2cdf191893eb44a8947662634cf)

rgw_file: implement stateless write completion timer

Implements a temporal mechanism to enforce write completion for setups
which lack open state tracking (e.g., NFS3).

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 2c83ed4bd43fcb5d5497151a157b1dc08022fed9)

rgw_file: fix/update rgw_create flag arguments

Allow passing POSIX open flags as well as api call flags.  Needed
for NFS3 support.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 2d0ea2b4649e76cbbb87f44c57754d7ea9c46dce)

rgw_file: fix/update rgw_open flag arguments

Allow passing POSIX open flags as well as api call flags.  Needed
for NFS3 support.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit ada29f7f8323be2301588941bcd5c60190b32a4b)

rgw file: remove busy-wait in RGWLibFS::gc()

This is a background thread.  However, CPU is wasted.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit ca33241286f52d849dbde8092507131b8b1108cc)

Fixes: http://tracker.ceph.com/issues/17321
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>

rgw_file: unlock() must precede out label

In lookup_handle(...).

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 9f64f34e481278a683e962b17c7aa811005783a8)

rgw nfs: fix write continuations

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit b4d079f2b5a4d49b2ba7576b272a2a3f3b0d66c8)

rgw nfs: don't leak fh->mtx in lookup_handle()

This change fixes a serious latent locking problem, noticed after
updating the ganesha/rgw driver invalidation after renames.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit d74d46170d7104a6553674f111bbdbe3a116cf54)

rgw file: refuse to rename directories

The representation of paths as an aggregate involving any
number of objects argues against ever permitting such
operations.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 297220fd2a96c0cf34701127b8cf724e24e6865f)

rgw_file: refuse ops on deleted targets

Detect these illegal cases, as they are indicate various incorrect
behaviors/bugs.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 34224ecd8360e03603a1a5dd1c1c9f0a31f1c1d5)

rgw_file: implement rgw_setattr

Introduce a new RGWSetattrs RGWOp descendant, to create or replace
sets of attrs on buckets or objects.

This version of the change uses the standard RGWRADOS::set_attrs op
(we want attribute changes to (e.g.) sync with other changes).

Previous versions of this changed incorrectly masked the values
of st->st_ino in RGWFileHandle::stat(), now fixed.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 4de1c3c260265f821ebee842d49cb35bf49d8e4e)

rgw_file: refuse partial, out-of-order writes

A single file object may be opened only once per gateway
instance, and writes to that object must be complete, and in-order.
Enforce this.

If an invalid write is seen, deletes the current write transaction.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 12aded803e24539266ce9698c678088e2158a82a)

rgw_file: fix rename cases and unify unlink

Rather ordinary rename cases failed in the unlink step.  Fix this,
unifying the unlink path while at it.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 05af1fbb870a905ea8903594dfc607d346c9dd31)

add ldap auth custom search filter feature patch - http://tracker.ceph.com/issues/17185

Signed-off-by: Harald Klein <hari@vt100.at>
(cherry picked from commit c935885ae9d5fd413495448a0b0e5fce899c9b73)

Fixes: http://tracker.ceph.com/issues/17185

rgw ldap:  protect rgw::from_base64 from non-base64 input

Also adds unit tests for:
1. empty output from from_base64 (turns out to be harmless)
2. random and specific non-base64 and sort strings
(modified from upstream to avoid alteration of src/test/test_rgw_token.cc)

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 0a4c91ec7652d02673a9b156cd16144d778a3844)

Fixes: http://tracker.ceph.com/issues/17324

rgw ldap: enforce simple_bind w/LDAPv3

Found by Harald Klein <hklein@redhat.com>.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 08d54291435e4d1cb5e02cda3951bc6e8510b0e2)

rgw: add reinit/rebind logic (ldap)

Gracefully handle stale LDAP connections by rebinding--verified
with MS AD.  Rebind is attempted once per request until rebound--
not worse than misconfiguring the environment.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 9b8fccf68789ba5c5986766c544b23aeada0e87e)

Merge pull request #10656 from dachary/wip-16564-jewel

jewel: cors auto memleak

Merge pull request #11252 from ceph/wip-offline-split-jewel

ceph-objectstore-tool: add a way to split filestore directories offline

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

Merge pull request #10866 from dachary/wip-17122-jewel

jewel: COPY broke multipart files uploaded under dumpling

Merge pull request #10890 from dachary/wip-17140-jewel

jewel: rgw: period commit loses zonegroup changes: region_map converted repeatedly

Merge pull request #11021 from cbodley/wip-16794

jewel: rgw: back off bucket sync on failures, don't store marker

Merge pull request #10657 from dachary/wip-16792-jewel

jewel: metadata sync can skip markers for failed/incomplete entries

ceph-objectstore-tool: add a way to split filestore directories offline

Use the usual split code, and split each dir that meets the
usual split criteria.

This can be run with lower than usual split settings, to avoid costly
online splits. To make sure the directories are not merged again, use
a load merge threshold (e.g. filestore merge threshold = 1), and
adjust the split multiplier accordingly.

Fixes: http://tracker.ceph.com/issues/17220
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit e7b0428e0e8d8f5459311dc698d94a3ac4f04684)

Conflicts:
src/os/filestore/FileStore.cc
src/tools/ceph_objectstore_tool.cc
(trivial resolution)

Merge pull request #10888 from dachary/wip-17062-jewel

jewel: tests: fix TestClsRbd.mirror_image failure in upgrade:jewel-x-master-distro-basic-vps

doc: fix description for rsize and rasize

Signed-off-by: Andreas Gerstmayr <andreas.gerstmayr@gmail.com>
(cherry picked from commit a004254a02cafdee848a382f893f89c3c5a9845a)

10.2.3