Merge pull request #18430 from theanalyst/wip-21695-luminous

luminous: failed CompleteMultipartUpload request does not release lock

Reviewed-By: Casey Bodley <cbodley@redhat.com>
Reviewed-By: Matt Benjamin <mbenjamin@redhat.com>

Merge pull request #18445 from theanalyst/wip-21633-luminous

luminous: s3:GetBucketWebsite/PutBucketWebsite fails with 403

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

Merge pull request #18436 from theanalyst/wip-21789-luminous

luminous: user creation can overwrite existing user even if different uid is given

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

Merge pull request #18435 from theanalyst/wip-21790-luminous

luminous: RGW: Multipart upload may double the quota

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

Merge pull request #18432 from theanalyst/wip-21856-luminous

disable dynamic resharding in multisite enviorment

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

Merge pull request #18429 from theanalyst/wip-21792-luminous

luminous: encryption: reject requests that don't provide all expected headers

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

Merge pull request #17857 from smithfarm/wip-21446-luminous

luminous: rgw:multisite: Get bucket location which is located in another zonegroup, will return 301 Moved Permanently

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

Merge pull request #17856 from smithfarm/wip-21444-luminous

luminous: rgw: setxattrs call leads to different mtimes for bucket index and object

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

Merge pull request #18417 from kmroz/wip-21782-luminous

luminous: cls/journal: possible infinite loop within tag_list class method

Reviewed-By: Jason Dillaman <jdillaman@redhat.com>

Merge pull request #18287 from smithfarm/wip-retract-assertions-luminous

luminous: rgw: Remove assertions in IAM Policy

Reviewed-By: Adam Emerson <aemerson@redhat.com>
Reviewed-By: Abhishek Lekshmanan <abhishek@suse.com>

Merge pull request #17859 from smithfarm/wip-21451-luminous

luminous: rgw: lc process only schdule the first item of lc objects

Reviewed-By: Daniel Gryniewicz <dgryniewicz@redhat.com>

Merge pull request #18433 from theanalyst/wip-21545-luminous

luminous: rgw file write error

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

Merge pull request #18587 from ceph/luminous-wip-volume-api-change

luminous ceph-volume lvm api refactor/move

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

Merge pull request #18568 from liewegas/wip-fix-rop-leak-luminous-2

luminous: osd/PG: fix recovery op leak due to recovery preemption

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

ceph-volume create an api module to hold common api modules

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

ceph-volume tests move lvm api tests into its new test module

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

ceph-volume tests refactor lvm api import for test_listing

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

ceph-volume tests refactor lvm api import for api tests

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

ceph-volume tests refactor lvm api import for activate tests

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

ceph-volume tests refactor lvm api import in conftest

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

ceph-volume devices.lvm refactor importing api to come from api/lvm.py

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

ceph-volume move lvm/api.py to api/lvm.py so disk can consume it

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

Merge pull request #18498 from liewegas/wip-recovery-fixes-luminous

luminous: osd: fix recovery priority and pg state on recovery->backfill transition

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

Merge pull request #18567 from ceph/backport-wip-bz1491250

luminous: ceph-volume lvm list

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

osd/PG: fix recovery op leak due to recovery preemption

This was fixed in master in a different patch, but are not yet ready to
backport the bits there that came before this.  For now, fix it
specifically for luminous.  We can either sort out the conflicts later
or revert this and backport the master parts conflict-free.

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

Merge pull request #17805 from tchaikov/wip-luminous-pr-17508

luminous: mon: more aggressively convert crush rulesets -> distinct rules

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

Merge pull request #18364 from kmroz/wip-21544-luminous

luminous: mon: osd feature checks with 0 up osds

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

Merge pull request #18413 from kmroz/wip-21693-luminous

luminous: osd: additional protection for out-of-bounds EC reads

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

Merge pull request #18529 from smithfarm/wip-21918-luminous

luminous: Disable messenger logging (debug ms = 0/0) for clients unless overridden.

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

Merge pull request #18540 from liewegas/wip-pr-17894-luminous

luminous: ceph.spec.in,debian/rules: change aio-max-nr to 1048576

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

ceph-volume lvm add listing module to main

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

doc/ceph-volume add lvm/list to the toctree

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

doc/ceph-volume create the reference for the list sub-command

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

doc/ceph-volume add create and list to the index

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

ceph-volume tests create a unit test module for listing features

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

ceph-volume tests create a small factory fixture

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

ceph-volume tests ensure Volume.as_dict gets populated correctly

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

ceph-volume lvm.listing initial take on listing command

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

ceph-volume lvm.api be able to return a dictionary repr of a Volume object

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

ceph-volume process allows to fully mute terminal output on commands

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

ceph-volume lvm.api use a helper to get an lv from an arg

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

Merge pull request #18456 from liewegas/wip-21882-luminous

luminous: messages/MOSDMap: do compat reencode of crush map, too

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

qa/suites/upgrade/jewel-x: make sure min compat client is hammer for straw2

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

ceph.spec.in,debian/rules: change aio-max-nr to 1048576

when osd is more than 14 in one host,it report error that aio is not enough.
As the default aio-max-nr is 65536, one OSD needs 4096 aios and other programs may use aios.
This patch change aio-max-nr to 1048576 when install ceph-osd rpm package and debian package

Signed-off-by: chenliuzhong <liuzhong.chen@easystack.cn>
(cherry picked from commit 36326dc7104fc2f20f19d51b6f618a029ba072d7)

common/common_init: disable ms subsystem log gathering for clients

The log gathering causes large performance degradation to clients
with high message throughputs. This is hopefully a short-term
workaround until per-message logging can be replaced with an
efficient data recording system for post-incident analysis
use-cases.

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

Merge pull request #18503 from liewegas/wip-21878-luminous

luminous: os/bluestore/BlueFS: fix race with log flush during async log compaction

Reviewed-by: Varada Kari <varada.kari@gmail.com>

Merge pull request #18501 from liewegas/wip-21766-luminous

luminous: os/bluestore: handle compressed extents in blob unsharing checks

Merge pull request #18459 from liewegas/wip-pr-18457-luminous

luminous: qa/suites/rados/rest/mgr-restful: whitelist more health

osd/PrimaryLogPG: clear DEGRADED at recovery completion even if more backfill

We may have log recovery *and* backfill to do, but cease to be degraded
as soon as the log recovery portion is done.  If that's the case, clear
the DEGRADED bit so that the PG state is not misleading.

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

Merge pull request #18491 from liewegas/wip-21573-luminous

luminous: buffer: fix ABI breakage by removing list _mempool member

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

os/bluestore/BlueFS: fix race with log flush during async log compaction

During async log compaction we rely on _flush-and_sync_log to update the
log_writer to jump_to.  However, if racing threads are also trying to flush
the log and manage to flush our new log events for us, then our flush will
turn into a no-op, and we won't update jump_to correctly at all.  This
results in a corrupted log size a bit later one.

Fix by ensuring that there are no in-progress flushes before we add our
log entries.  Also, add asserts to _flush_and_sync_log to make sure we
never bail out early if jump_to is set (which would indicate this or
another similar bug is still present).

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

os/bluestore: handle compressed extents in blob unsharing checks

If the blob is compressed, we aren't mapping to a range within
the allocated extents, but rather referencing the entire blob.

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

osd/PG: on recovery done, requeue for backfill

We were keeping our existing recovery reservation slot (with a high
priority) and going straight to waiting for backfill reservations on
the peers.  This is a problem because the reserver thinks we're doing
high priority work when we're actually doing lower-priority backfill.

Fix by closing out our recovery reservation and going to the
WaitLocalBackfillReserved state, where we'll re-request backfill at the
appropriate priority.

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

osd/PG: move local_reserver recovery cancel to Recovering state transition

This is easier to follow than canceling the reservation in the next state.

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

qa/suites/upgrade/jewel-x/parallel: run some jewel after completed upgrade

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

qa/suites/upgrade/jewel-x/: set up compat weight-set after cluster upgrade

...but before we run some client workloads.  This will hopefully ensure
that older clients will behave.

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

mon/OSDMonitor: add 'osd crush set-all-straw-buckets-to-straw2'

This is a common and recommended step that users should take once they
have clients that support straw2 (hammer!).  Let's make it easy.

This may result in a small amount of data movement, but usually it is
very little.

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

crush/CrushWrapper: add bucket_set_alg()

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

buffer: remove list _mempool member

This broke the C++ ABI by changing the list structure size.  Also, it's
not necessary as we can infer the mempool by looking at the other list
contents.  We don't (currently) have a need to map an empty list to a
particular mempool and have that state stick.

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

buffer: allow mempool to be passed into raw* ctors and create methods

This is more convenient, and also faster than initializing it in
buffer_anon and the immediately moving it elsewhere.

Drop the optionality of the alignment argument.

No users yet.

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

/etc/sysconfig/ceph: remove jemalloc option

This breaks when used with rocksdb, which is now the default.

See http://tracker.ceph.com/issues/20557

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

etc/default/ceph: remove jemalloc option

This breaks when used with rocksdb, which is now the default.

See http://tracker.ceph.com/issues/20557

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

qa/suites/rados/rest/mgr-restful: whitelist more health

The test is fiddling with OSDs.

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

mon/OSDMonitor: improve crush map validation

- move into OSDMap method
- ensure that rules exist for each pool
- ensure pool type matches rule type
- ensure rule mask min/max size cover the pool size

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

mon: more forceful renumbering of legacy ruleset IDs

Previously, the rules were only modified in the trivial case,
so we continued to potentially have CRUSH maps with the
legacy ruleset functionality in use.

In order to ultimately remove rulesets entirely, we need
to do this more aggressively, renumbering all the rules
and then updating any pools as needed.

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

Conflicts:
src/mon/OSDMonitor.cc: the check for multiple rules was removed
in master, but not in luminous. once we renumber the legacy ruleset IDs,
it's not need to check for and to warn the user at seeing the case where
1-to-n mapping from ruleset to rule IDs.

osd: s/crush_ruleset_in_use/crush_rule_in_use/

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

Merge pull request #17773 from xiexingguo/wip-luminous-object-legacy-flag

luminous: osd/PrimaryLogPG: _delete_oid - fix incorrect 'legacy' flag

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

Merge pull request #18362 from kmroz/wip-21543-luminous

luminous: qa/tasks: prolong revive_osd() timeout to 6 min

Merge pull request #18388 from tchaikov/wip-pr-18346-luminous

os/filestore: print out the error if do_read_entry() fails

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

Merge pull request #18398 from smithfarm/wip-21783-luminous

luminous: cli/crushtools/build.t sometimes fails in jenkins' make check run

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

Merge pull request #18401 from liewegas/wip-bluestore-label-luminous

luminous: os/bluestore: ceph-bluestore-tool repair updates and prime-osd-dir support

messages/MOSDMap: do compat reencode of crush map, too

If we are reencoding an incremental, and it embeds a crush map, we need
to reencode that in a compatible way too.  This is especially true now
because we have the compat crush weight-sets.  Otherwise, a client may
learn the crush map through an incremental but not understand choose_args,
and not see/understand the alternate weight set.  It will send requests
to the wrong OSDs where they will just get dropped.

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

mon/OSDMonitor: mon osd feature checks with 0 up osds

get_up_osd_features() returns 0 if no osds are up which causes feature
checks to fail.

Fixes: http://tracker.ceph.com/issues/21471
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit 26ba0ba044846d18f9bdfdbee6e2a9c46882c742)

Conflicts:
src/mon/MonCommands.h
          - removed mimic reference
src/mon/OSDMonitor.cc
          - removed mimic-only command path

osd/OSDMap: ignore xinfo if features == 0

Some old bug (e.g., http://tracker.ceph.com/issues/20751) could
result in an UP+EXISTS osd having features==0.  If that happens,
we shouldn't crash the mon, which (reasonably) does

   if (osdmap.get_epoch()) {
     if (osdmap.get_num_up_osds() > 0) {
       assert(osdmap.get_up_osd_features() & CEPH_FEATURE_MON_STATEFUL_SUB);
       check_subs();
     }
   }

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

rgw: Check bucket Website operations in policy

Add code to check s3:GetBucketWebsite and s3:PutBucketWebsite
operations against bucket policy.

Fixes: http://tracker.ceph.com/issues/21597
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1493896
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit ceed535957ac186e241fcff26b103cf7efa959b1)

rgw: RGWUser::init no longer overwrites user_id

if an admin op specifies a user_id and does not find a user with that
id, but does find a user based on a later field (email, access key,
etc), RGWUser::user_id will be overwritten with the existing user's id

when this happens on 'radosgw-admin user create', RGWUser::execute_add()
will modify that existing user, instead of trying to create a new user
with the given user_id (and failing due to the conflicting email,
access key, etc)

by preserving the original user_id (when specified), this uid conflict
is detected in RGWUser::check_op() and a "user id mismatch" error is
returned

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

RGW: Multipart upload may double the quota

Fixes: http://tracker.ceph.com/issues/21586
Signed-off-by: Sibei Gao <gaosb@inspur.com>
(cherry picked from commit 97f95e457fb7f9e36031f41e0f2dd3955daedd87)

rgw_file: fix write error when the write offset overlaps.

Signed-off-by: Yao Zongyou <yaozongyou@vip.qq.com>
(cherry picked from commit 872d73f945364002f0fa31762e6976db5b4b3c19)

rgw: disable dynamic resharding in multisite environment

Fixes:http://tracker.ceph.com/issues/21725
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit f1ec7a49bde054a19a0a8fd80f37866e1e40379f)

rgw: release cls lock if taken in RGWCompleteMultipart

Follows Casey's proposal to conditionally release the lock in
::complete(), in order to avoid duplicated code in various early
return cases.

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

rgw: encryption add exception handling for from_base64 on bad input

If calling from_base64 with charactors that is not base64 encoded,
rgw will crash.

Signed-off-by: Enming Zhang <enming.zhang@umcloud.com>
(cherry picked from commit f0b88e51be86d84793b794f6fe87fdda62004a4d)

rgw: encryption fix the issue when not provide encryption mode

Now, in RGW, if someone want to upload an object using server-side
encryption with providing customer key or kms key id, but not
specify the encryption mode in the
"x-amz-server-side-encryption-customer-algorithm" or
"x-amz-server-side-encryption", the object will be uploaded
successfully without encryption.

This is not a correct way to deal with it. It is better to
return error.

Fixes: http://tracker.ceph.com/issues/21581
Signed-off-by: Enming Zhang <enming.zhang@umcloud.com>
(cherry picked from commit f8c4be8a8943096217d89f7c5abd129fa2414b36)

rgw: encryption SSE-KMS add the details of error msg in response

Signed-off-by: Enming Zhang <enming.zhang@umcloud.com>
(cherry picked from commit 3f16785daf4b3609f2bff7c107a35f908103e32a)

rgw: encryption SSE-C add the details of error msg in response

Signed-off-by: Enming Zhang <enming.zhang@umcloud.com>
(cherry picked from commit 9502549ac2133e969a5f268601b92fd4063c1bd9)

cls/journal: fixed possible infinite loop which could kill the OSD

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

test: ceph_test_cls_journal was dropped when converting to cmake

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

osd: additional protection for out-of-bounds EC reads

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

Merge pull request #17692 from smithfarm/wip-21176-luminous

build/ops: python-numpy-devel build dependency for SUSE

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
Reviewed-by: Amit Kumar <amitkuma@redhat.com>

Merge pull request #17730 from xiexingguo/wip-pr-17371

luminous: mon, osd: per pool space-full flag support

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

Merge pull request #17779 from smithfarm/wip-rh-74-luminous

tests: CentOS 7.4 is now the latest

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

Merge pull request #17863 from smithfarm/wip-21343-luminous

luminous: mon: DNS SRV default service name not used anymore

Merge pull request #17864 from smithfarm/wip-21438-luminous

luminous: core: Daemons(OSD, Mon...) exit abnormally at injectargs command

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

Merge pull request #17866 from smithfarm/wip-21320-luminous

luminous: mgr: Quieten scary RuntimeError from restful module on startup

Merge pull request #17951 from smithfarm/wip-21548-luminous

luminous: tests: ceph_manager: bad AssertionError: failed to recover before timeout expired

Merge pull request #18342 from xiexingguo/wip-pr-18318

luminous: bluestore: using bluestore_compression_min_blob_size instead of bluestore_compression_max_blob_size to config comp_min_blob_size

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

os/bluestore: fsync on _write_bdev_label

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

ceph-bluestore-tool: implement 'set-label-key' and 'rm-label-key'

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

os/bluestore: make _write_bdev_label static and public

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

doc/man/8/ceph-bluestore-tool: add man page

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

common/options: document 'key', 'keyfile', 'keyring'

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