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

Merge pull request #15360 from liewegas/wip-jewel-master-mixed

qa/workunits/rados/test-upgrade-*: whitelist tests for master

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

qa/workunits/rados/test-upgrade-*: whitelist tests for master

The jewel-x upgrade test now runs this script against a mixed cluster on
a machine with code from master installed.  That means we have to skip
any new tests that will fail on a mixed cluster.

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

Merge pull request #15208 from liewegas/wip-sortbitwise-jewel

mon: fix 'sortbitwise' warning on jewel

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

Merge pull request #14851 from yehudasa/wip-rgw-support-ragweed-jewel

jewel: rgw: add apis to support ragweed suite

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

Merge pull request #14765 from smithfarm/wip-18972-jewel

jewel: ceph-disk does not support cluster names different than 'ceph'

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

qa/suites/rados/singleton-nomsgr/*: set sortbitwise after upgrade

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

mon/OSDMonitor: fixup sortbitwise flag warning

"ceph -s" does not report warning when using
command "ceph osd unset sortbitwise" to drop
sortbitwise flag.
we should use "osdmap.get_up_osd_features() &
CEPH_FEATURE_OSD_BITWISE_HOBJ_SORT"
instead of "(osdmap.get_features(CEPH_ENTITY_TYPE_OSD, NULL) &
CEPH_FEATURE_OSD_BITWISE_HOBJ_SORT)",
because osdmap.get_features only get local "features"

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
(cherry picked from commit c25ee187e28724846d0011cd8145e16956d3636e)

mon: remove config option to disable no sortbitwise warning

We'll require this soon.

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

Merge pull request #13450 from dreamhost/wip-18887-jewel

jewel: msg: IPv6 Heartbeat packets are not marked with DSCP QoS - simple messenger

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

msg/simple/Pipe: manual backport of fix in PR#14795

Manual backport of errno fixup from PR#14795
(6f1037e22c2a304795895498cdc955e0ef80f8e3), as noted by
https://github.com/ceph/ceph/pull/13450#discussion_r114696885.

Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>

Merge pull request #14667 from smithfarm/wip-18699-jewel

jewel: client: fix the cross-quota rename boundary check conditions

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>

Merge pull request #14332 from shinobu-x/wip-19396-jewel

 jewel: Objecter::epoch_barrier isn't respected in _op_submit()

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

Merge pull request #14204 from dzafman/wip-18533-jewel

jewel: core: two instances of omap_digest mismatch

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

Merge pull request #13884 from shinobu-x/wip-19119-jewel

jewel: pre-jewel "osd rm" incrementals are misinterpreted

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

Merge pull request #13647 from mslovy/wip-19083-jewel

jewel: osd: preserve allocation hint attribute during recovery

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>

Merge pull request #14791 from smithfarm/wip-19774-jewel

jewel: osd: promote throttle parameters are reversed

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

Merge pull request #14763 from smithfarm/wip-19562-jewel

jewel: api_misc: [  FAILED  ] LibRadosMiscConnectFailure.ConnectFailure

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

rgw: new rest api to retrieve object layout

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 2768583dc486109e49d209243675b99fdd39e92c)

rgw: rest api to read zone config params

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit a220a2efbfd675e6abf14ae33c21005bcbf6dadf)

Merge pull request #14481 from dillaman/wip-19468-jewel

jewel: librbd: is_exclusive_lock_owner API should ping OSD

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

Merge pull request #14666 from smithfarm/wip-19612-jewel

jewel: librbd: Issues with C API image metadata retrieval functions

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

Merge pull request #14664 from smithfarm/wip-19325-jewel

jewel: rbd: [api] temporarily restrict (rbd_)mirror_peer_add from adding multiple peers

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

Merge pull request #14694 from ceph/wip-bp-systemd

[backport] qa/tasks: systemd test backport to jewel

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

Merge pull request #13544 from shinobu-x/wip-18932-jewel

jewel: tests: 'ceph auth import -i' overwrites caps, should alert user before overwrite

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

filestore, tools: Fix logging of DBObjectMap check() repairs

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

osd: Simplify DBObjectMap by no longer creating complete tables

Bump the version for new maps to 3
Make clone less efficient but simpler
Add rename operation (use instead of clone/unlink)
For now keep code that understands version 2 maps

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

No ghobject_t::operator>() so use Kraken cmp_bitwise() instead
Need to use MIN_GHOBJ/MAX_GHOBJ instead of std::min/std::max

ceph-osdomap-tool: Fix seg fault with large amount of check error output

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

osd: Add automatic repair for DBObjectMap bug

Add repair command to ceph-osdomap-tool too

Under some situations the previous rm_keys() code would
generated a corrupt complete table.  There is no way to
figure out what the table should look like now.  By removing
the entries we fix the corruption and aren't much worse off
because the corruption caused some deleted keys to re-appear.

This doesn't breaking the parent/child relationship during
repair because some of the keys may still be contained
in the parent.

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

Conflicts:
src/os/filestore/DBObjectMap.h (trivial)

ceph-osdomap-tool: Fix tool exit status

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

DBObjectMap: rewrite rm_keys and merge_new_complete

Leverage the updated in_complete_region and needs_parent to simplify
these methods.

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit c4dffb68eaafe724f7fdae93a4285a7f8003ea29)

DBObjectMap: strengthen in_complete_region post condition

Previously, in_complete_region didn't guarantee anything about
where it left complete_iter pointing.  It will be handy for
complete_iter to be pointing at the lowest interval which ends
after to_test.  Make it so.

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 97b35f4d7d4862da4b6f50ecaef0d292a671fd04)

DBObjectMap: fix next_parent()

The previous implementation assumed that
lower_bound(parent_iter->key()) always leaves the iterator
on_parent().  There isn't any guarantee, however, that that
key isn't present on the child as well.

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 74a7631d0938d7b44894f022224eab10a90d5cec)

test_object_map: add tests to trigger some bugs related to 18533

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit f131dbcf5bb17107c029f942a57e9bf4432a26ee)

test: Add ceph_test_object_map to make check tests

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

ceph-osdomap-tool: Add --debug and only show internal logging if enabled

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

osd: DBOjectMap::check: Dump complete mapping when inconsistency found

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

test_object_map: Use ASSERT_EQ() for check() so failure doesn't stop testing

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

tools: Check for overlaps in internal "complete" table for DBObjectMap

Changed check to return an error count and fix tool error message

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

Conflicts:
src/os/filestore/DBObjectMap.h (trivial)

tools: Add dump-headers command to ceph-osdomap-tool

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

Conflicts:
src/os/filestore/DBObjectMap.h (trivial)

tools: Add --oid option to ceph-osdomap-tool

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

osd: Remove unnecessary assert and assignment in DBObjectMap

Fix and add comment(s)

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

Merge pull request #14809 from tchaikov/wip-18193-jewel

jewel: tests: test/librados/tmap_migrate: g_ceph_context->put() upon return

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

Merge pull request #14701 from smithfarm/wip-18193-jewel

jewel: core: transient jerasure unit test failures

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

Merge pull request #14776 from linuxbox2/jewel-pullup-civet-chunked

[DNM] jewel: pullup civet chunked

Merge pull request #14416 from smithfarm/wip-19557-jewel

jewel: tests: upgrade/hammer-x failing with OSD has the store locked when Thrasher runs ceph-objectstore-tool on down PG

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

civetweb:  pullup chunked encoding by Marcus

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

os: make zero values noops for set_alloc_hint() in FileStore

Signed-off-by: yaoning <yaoning@unitedstack.com>
(cherry picked from commit e2ec24f61b55457caccefecd56f9f08b98264802)

test/librados/tmap_migrate: g_ceph_context->put() upon return

Signed-off-by: Kefu Chai <kchai@redhat.com>
Conflict: test/librados/tmap_migrate.cc
  this change is not cherry-picked from master, because tmap_migrate was
removed in master. so we are applying the same change in
cb1cda96713b2ec0f6418c4cbe3d964c2020729c to this test.

Fix reveresed promote throttle default parameters.

Signed-off-by: Mark Nelson <mnelson@redhat.com>
(cherry picked from commit 793ceac2f3d5a2c404ac50569c44a21de6001b62)

Merge pull request #14686 from smithfarm/wip-19686-jewel

jewel: osd: Give requested scrubs a higher priority

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

Merge pull request #14605 from asheplyakov/19476-jewel

jewel: rgw: don't return skew time in pre-signed url

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

Merge pull request #14660 from smithfarm/wip-19478-jewel

jewel: rgw: zonegroupmap set does not work

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

Merge pull request #14607 from asheplyakov/19607-jewel

jewel: rgw: multisite: fetch_remote_obj() gets wrong version when copying from remote

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

Merge pull request #14587 from asheplyakov/19617-jewel

jewel: mon/MonClient: make get_mon_log_message() atomic

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

test/ceph_crypto: do not read ceph.conf in global_init()

ForkDeathTest.MD5 expect an empty output while global_init() complains
if ceph.conf is missing if 0 is passed in as the `flags`. this test
passes if ceph.conf is in current working directory, but jenkins does
not prepare this file for this test.

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

Conflicts:
        src/test/ceph_crypto.cc - jewel does not have
             5af29540675b674c1985ff98b28a783ed124acf6

tests: fix erasure-code premature deallocation of cct

The setup function returns before the run function, the cct variable
must be a data member, not a local variable that gets de-allocated
before run() starts.

Signed-off-by: Loic Dachary <loic@dachary.org>
(cherry picked from commit efa1e54362423d4cfd1541fb8c68237b7b9ebbe3)

rbd-nbd: no need create asok file for unmap and list-mapped commands.

Fixes: http://tracker.ceph.com/issues/17951
Signed-off-by: Pan Liu <liupan1111@gmail.com>
(cherry picked from commit 72352653d585ef89043a4ece371b5c0cb3f6f32a)

rbd-nbd: restart parent process logger after forking

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

crushtool: do not release g_ceph_context at exit

it is but a work around of occasionally timeout.

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

common,test: g_ceph_context->put() upon return

prior to this change, global_init() could create a new CephContext
and assign it to g_ceph_context. it's our responsibilty to release
the CephContext explicitly using cct->put() before the application
quits. but sometimes, we fail to do so.

in this change, global_init() will return an intrusive_ptr<CephContext>,
which calls `g_ceph_context->put()` in its dtor. this ensures that
the CephContext is always destroyed before main() returns. so the
log is flushed before _log_exp_length is destroyed.

there are two cases where global_pre_init() is called directly.
- ceph_conf.cc: g_ceph_context->put() will be called by an intrusive_ptr<>
  deleter.
- rgw_main.cc: global_init() is called later on on the success code
  path, so it will be taken care of.

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

Conflicts:
src/ceph_fuse.cc
src/ceph_mgr.cc
src/global/global_init.cc
src/rgw/rgw_main.cc
src/test/compressor/test_compression.cc
src/test/compressor/test_compression_plugin.cc
src/test/compressor/test_compression_plugin_snappy.cc
src/test/compressor/test_compression_plugin_zlib.cc
src/test/compressor/test_compression_snappy.cc
src/test/compressor/test_compression_zlib.cc
src/test/erasure-code/TestErasureCode.cc
src/test/erasure-code/TestErasureCodeExample.cc
src/test/erasure-code/TestErasureCodeIsa.cc
src/test/erasure-code/TestErasureCodeJerasure.cc
src/test/erasure-code/TestErasureCodeLrc.cc
src/test/erasure-code/TestErasureCodePlugin.cc
src/test/erasure-code/TestErasureCodePluginIsa.cc
src/test/erasure-code/TestErasureCodePluginJerasure.cc
src/test/erasure-code/TestErasureCodePluginLrc.cc
src/test/erasure-code/TestErasureCodePluginShec.cc
src/test/erasure-code/TestErasureCodeShec.cc
src/test/erasure-code/TestErasureCodeShec_thread.cc
src/test/fio/fio_ceph_objectstore.cc
src/test/librados/misc.cc
src/test/mon/PGMap.cc
src/test/msgr/test_async_networkstack.cc
src/test/msgr/test_userspace_event.cc
src/test/objectstore/Allocator_test.cc
src/test/objectstore/BitAllocator_test.cc
src/test/objectstore/test_bluefs.cc
src/test/objectstore/test_bluestore_types.cc
src/test/objectstore/test_memstore_clone.cc
src/test/osd/TestPGLog.cc
src/test/rgw/test_http_manager.cc
src/test/rgw/test_rgw_compression.cc
src/test/test_mempool.cc
src/tools/rados/rados.cc

Merge pull request #14665 from smithfarm/wip-19610-jewel

jewel: [librados_test_stub] cls_cxx_map_get_XYZ methods don't return correct value

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

Merge pull request #14653 from smithfarm/wip-19662-jewel

jewel: rgw_file: fix event expire check, don't expire directories being read

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

Merge pull request #14635 from smithfarm/wip-19690-jewel

jewel: doc: Improvements to crushtool manpage

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

crushtool: s/exit(EXIT_FAILURE)/return EXIT_FAILURE/

so the destructor(s) can be called.

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

Conflicts:
src/tools/crushtool.cc - jewel does not have 17feefbcb3105553b763cb7ce123b20b77b95857

global/signal_handler: reset injected segv after test

~CephContext() => ~TypedSingletonWrapper() => ~MempoolObs =>
unregister_command() => ldout() << "unregister_command" =>
Log::submit_entry() => *(volatile int *)(0) = 0xdead;

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

Conflicts:
        src/log/Log.cc - jewel has "namespace log" instead of "namespace
                         logging" (trivial resolution)

test_cors.cc: fix the mem leak

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

ceph-disk: dmcrypt activate must use the same cluster as prepare

When dmcrypt is used, the fsid cannot be retrieved from the data
partition because it is encrypted. Store the fsid in the lockbox to
enable dmcrypt activation using the same logic as regular activation.

The fsid is used to retrive the cluster name that was used during
prepare, reason why activation does not and must not have a --cluster
argument.

Fixes: http://tracker.ceph.com/issues/17821
Signed-off-by: Loic Dachary <ldachary@redhat.com>
(cherry picked from commit 7f66672b675abbc0262769d32a38112c781fefac)

Conflicts:
        src/ceph-disk/ceph_disk/main.py - in master, self.create_key() takes an
            argument (self.args.cluster) but in jewel it takes no argument

Merge pull request #13608 from smithfarm/wip-19063-jewel

jewel: tests: eliminate race condition in Thrasher constructor

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

ceph_test_librados_api_misc: fix stupid LibRadosMiscConnectFailure.ConnectFailure test

Sometimes the cond doesn't time out and it wakes up instead.  Just repeat
the test many times to ensure that at least once it times out (usually
it doesn't; it's pretty infrequent that it doesn't).

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

Merge pull request #14195 from cbodley/wip-19353

jewel: rgw: use separate http_manager for read_sync_status

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

Merge pull request #14066 from asheplyakov/19321-bp-jewel

jewel: rgw: fix break inside of yield in RGWFetchAllMetaCR

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

Merge pull request #14064 from asheplyakov/19211-bp-jewel

jewel: rgw: "cluster [WRN] bad locator @X on object @X...." in cluster log

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

Merge pull request #13842 from smithfarm/wip-19145-jewel

jewel: rgw: a few cases where rgw_obj is incorrectly initialized

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

Merge pull request #13837 from smithfarm/wip-19048-jewel

jewel: rgw: multisite: some yields in RGWMetaSyncShardCR::full_sync() resume in incremental_sync()

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

Merge pull request #13724 from asheplyakov/18626-bp-jewel

jewel: rgw: Use decoded URI when verifying TempURL

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

Merge pull request #14643 from smithfarm/wip-revert-14427

Wip revert 14427

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

use sudo to check check health

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
(cherry picked from commit 7af157ad4ce7f7e2b8de97ee10eeaf64b9099bc0)

Add reboot case for systemd test

test systemd units restart after reboot

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
(cherry picked from commit 7b587304a54d9b21041ffdfbc85fad8d87859c49)

Fix distro's, point to latest version

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
(cherry picked from commit 1947648669971c1bd1ca189870ed9b25bbd48d3a)

Merge pull request #14602 from asheplyakov/19646-jewel

jewel: ceph-disk: enable directory backed OSD at boot time

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

Merge pull request #14449 from smithfarm/wip-test-doc-oversight

tests: fix oversight in yaml comment

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

Merge pull request #13606 from smithfarm/wip-19062-jewel

jewel: build/ops: enable build of ceph-resource-agents package on rpm-based os

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

Merge pull request #14654 from smithfarm/wip-19461-jewel

jewel: admin ops: fix the quota section

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

osd: Give requested scrub work a higher priority

Once started we now queue scrub work at higher priority than
scheduled scrubs.

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

Conflicts:
        src/osd/OSD.h - in jewel, the PGScrub() call is enclosed within
            op_wq.queue(make_pair(...)) instead of enqueue_back()

Merge pull request #14680 from smithfarm/wip-19711-jewel

jewel: [test] test_notify.py: rbd.InvalidArgument: error updating features for image test_notify_clone2

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

test: rbd master/slave notify test should test active features

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

Merge pull request #14402 from shinobu-x/wip-17331-jewel

 jewel: ceph-disk: ceph-disk list reports mount error for OSD having mount options with SELinux context

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #13865 from smithfarm/wip-19158-jewel

jewel: rgw: health check errors out incorrectly

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>

client: fix the cross-quota rename boundary check conditions

We were previously rejecting a rename if either of the involved directories
was a quota root, even if the other directory was part of the same quota
"tree". What we really want to do is identify the correct quota root
(whether local or ancestral) for each directory and compare them. So
now we do.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 8e8892aa46accb519faa4bb9fecf66618f1b11b2)

Conflicts:
        src/client/Client.cc (do not pass perm to get_quota_root() because
        jewel does not have 3caa4d233633fb7a67747f2c79c4a0ab89112294)

librbd: fix rbd_metadata_list and rbd_metadata_get

- properly check for val_len in rbd_metadata_list
- don't expect output buffers are zero pre-filled

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

test/librados_test_stub: fixed cls_cxx_map_get_keys/vals return value

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

rbd: prevent adding multiple mirror peers to a single pool

The rbd-mirror daemon does not currently support replication
from multiple peers. Until that is supported, add a temporary
restriction to prevent confusion.

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

radosgw-admin: use zone id when creating a zone

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

qa: rgw task uses period instead of region-map

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

rgw-admin: remove deprecated regionmap commands

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

Conflicts:
src/rgw/rgw_admin.cc (trivial resolution)

doc: rgw: correct the quota section

Add the missing option and fix typo.

Fixes: http://tracker.ceph.com/issues/19397
Signed-off-by: Chu, Hua-Rong <hrchu@cht.com.tw>
(cherry picked from commit 51a88267f0d7f51aeb62092949b66b9f6c062e15)

rgw_file:  remove unused rgw_key variable

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

rgw_file: fix readdir after dirent-change

Also, fixes link count computation off-by-one, update of state.nlink
after computation, link computation reset at start, and a time print
in debug log.

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

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