Merge pull request #8581 from emenguy/pgnum_pools_documentation

doc: adding pg_num to pools documentation

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>

Merge pull request #8595 from qhjindev/fix-LFNIndex

os: fix typo in LFNIndex.h

Merge pull request #8623 from rmechler/wip-15504

pybind: removed unneccesary parentheses from if statements

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

Merge pull request #8631 from stiopaa1/buffer_fwd

image_watcher/Notifier: remove header file

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

Merge pull request #8644 from tchaikov/wip-doc-os-recommendations

doc/start/os-recommendations.rst: add Jewel requires

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

Merge pull request #8650 from scienceluo/wip-lkx-fixesdoc

doc: Fixes "branch -b" and "Qemu"

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>

Merge pull request #8674 from yatinkumbhare/doc-fix2

doc: fix broken link to monitor quorum

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>

Merge pull request #8630 from roidayan/xio-log_prefix

xio: add log prefix for log prints outside the XioMessenger class

Reviewed-by: Haomai Wang <haomai@xsky.com>

Merge pull request #8701 from cernceph/wip-bsweight

ceph-osd-prestart.sh: compute correct defaultweight for bluestore

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

Merge pull request #8691 from flyd1005/master

cleanup: Fix typos, change prefered to preferred

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

compute correct defaultweight for bluestore

The default crush weight should be the size of the block device, not
the tiny 10M xfs partition.

Backport: jewel
Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>

os/bluestore/BlueFS: Record the correctly perfcouter

os/bluestore/BlueFS: record the correctly perfcounter

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

os/bluestore/BlueFS: Record the correctly perfcouter.

After "log_writer->append(bl)", the length of bl become zero.
So tune the order.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>

Merge pull request #8696 from cernceph/wip-util

osd: fix backwards min/max osd utilization

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

Merge pull request #8676 from runsisi/wip-fix-init-exlock

librbd: fix potential double free of SetSnapRequest instance

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

librbd: fix potential double free of SetSnapRequest instance

if image feature EXCLUSIVE_LOCK is not enabled we should not try to
initialize the exclusive lock, or we may end with two async Contexts
to finish the same SetSnapRequest instance

Fixes: http://tracker.ceph.com/issues/15571
Signed-off-by: runsisi <runsisi@zte.com.cn>

Merge pull request #8530 from wjwithagen/patch-6

ceph-helpers.sh: only use mon*pid files when killing MONs

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

Merge pull request #8662 from majianpeng/nvmedevice-cleanup

os/bluestore/NVMEDevice: Remove the duplicated code.

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Kefu Chai <kefu@redhat.com>

Merge pull request #8697 from vumrao/wip-vumrao-15568

man : ceph-deploy add config keyword in ceph-deploy

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

man : ceph-deploy add config keyword in ceph-deploy
      config push and pull command

Fixes: http://tracker.ceph.com/issues/15568
Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>

osd: fix backwards min/max osd utilization

Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>

Fix typos, change prefered to preferred

Merge pull request #8539 from vuhuong/wip-xio-heavy-msgrs

Wip Xio heavy messengers and resources

Merge pull request #8649 from dzafman/wip-test-cot-fix

test: Fix ceph-objectstore-tool test to run manually from src non-cmake

Merge remote-tracking branch 'gh/jewel'

doc/release-notes: v10.2.0 jewel

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

Merge pull request #8667 from SUSE/wip-15549

rpm: refrain from installing systemd unit files twice

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

doc: fix broken link to monitor quorum

Link pointing in Monitor Quorum section to
ceph configuration file was broken.
Fixing it to point to configuration section.

Signed-off-by: Yatin Kumbhare yatinkumbhare@gmail.com

Merge pull request #8643 from ceph/wip-udev

udev: remove 60-ceph-partuuid-workaround-rules

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>

rpm: refrain from installing systemd unit files twice

These files are already installed by systemd/Makefile.am

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

os/bluestore/NVMEDevice: Remove the duplicated code.

In spdk/pci.h spdk/nvme.h, it alread contain those code:
extern "C" {
 So remove the duplicated code.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>

Merge pull request #8664 from theanalyst/doc/rgw/fix-multisite-zone

doc: multisite: fix json output for zone create

10.2.0

doc: mutlisite: fix json output for zone create

creation of ``us-west`` was wrongly showing ``us-east-2`` output

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>

Merge pull request #8658 from ceph/wip-cmake

cmake: Added CMAKE_CEPH_*_VIRTUALENV var to fix build

cmake: Added CMAKE_CEPH_*_VIRTUALENV var to fix build

Signed-off-by: Ali Maredia <amaredia@redhat.com>

Merge pull request #8636 from ceph/wip-rgw-leak

rgw leaks fixes

Merge pull request #8653 from theanalyst/doc/fix-multisite-pools

doc: rgw multisite, add pools section & minor cosmetic improvements

rgw: drop rest op reference in error path

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

doc: rgw multisite, add pools section & minor cosmetic improvements

`Pool Configuration` was mentioned previously but didn't contain any
info, adding this section and minor cosmetic changes to a few headings
after looking at the html view.

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>

test: Fix ceph-objectstore-tool test to run manually from src non-cmake

Fix init-ceph to handle it when CEPH_* values set

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

Merge pull request #8564 from theanalyst/fix/15251

rgw_admin: improve period update errors

rgw_admin: improve period update errors

If we do a period update on a realm with multiple masters, we fail
stating invalid argument, improving this to suggest that we have
actually errored out because of multiple master zg in a realm, and
printing both of these zonegroups. RGWPeriodMap::update takes
CephContext as an argument, so that we can use ldout. Also dropping the
error messages reporting invalid arguments on period.update() as these
are handled within the function itself whenever it manifests itself.

Fixes: http://tracker.ceph.com/issues/15251
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>

Merge pull request #8645 from tchaikov/wip-fix-test.sh

test: set a default $CEPH_ROOT env variable

test: set a default $CEPH_ROOT env variable

in cf24535, we use $CEPH_ROOT to specify the $top_srcdir to unify
cmake and autotools, but this breaks ceph-qa-suite/tasks/workunit.py,
as it only clones the necessary qa/workunits directory, and does not
pass $CEPH_ROOT to the test scripts. so we need to set a default
$CEPH_ROOT if it is not set.

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

doc/start/os-recommendations.rst: add Jewel requires

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

udev: remove 60-ceph-partuuid-workaround-rules

These were added to get /dev/disk/by-partuuid/ symlinks to work on
wheezy.  They are no longer needed for the supported distros (el7+,
jessie+, trusty+), and they apparently break dm by opening devices they
should not.

Fixes: http://tracker.ceph.com/issues/15516
Signed-off-by: Sage Weil <sage@redhat.com>

Merge pull request #8612 from xiexingguo/xxg-wip-rpg

osd/ReplicatedPG: fix implementation of register_on_success()

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

rgw: clean async rest ops in calling cr

Need to drop a reference to the async rest op when done.

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

rgw: drop async cr reference on simple cr completion

Added a new callback for simple cr that is called anyway when done. Then
drop the reference to the async operation there and not at the destructor.

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

rgw: RGWRealmWatcher::watch_restart() also unwatches watch

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

rgw: stop cr manager in destructor

callers don't need to call it explicitly

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

Merge pull request #8590 from liewegas/wip-jewel

doc/release-notes: jewel updates

Reviewed-by: Nathan Cutler <ncutler@suse.cz>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #8526 from dreamhost/wip-rgw-xmlns

rgw: Ensure xmlns is consistent on S3 responses.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Reviewed-by: Abhishek Lekshmanan <alekshmanan@suse.com>

Merge pull request #8563 from linuxbox2/rgw-file-unix

rgw: file unix

Merge pull request #8592 from zaitcev/wip-5073-multen-1

rgw: Add a test for multi-tenancy

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Reviewed-by: Matt Benjamin <mbenjami@redhat.com>

Merge pull request #8597 from oritwas/wip-rgw-remove-bucket-instance

rgw: handle no current_period in is_syncing_bucket_meta

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

Merge pull request #8601 from jmunhoz/fix-aws4-unsigned-payload

rgw: aws4: handle UNSIGNED-PAYLOAD under header auth

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

xio: add log prefix for log prints outside the XioMessenger class

Signed-off-by: Roi Dayan <roid@mellanox.com>

image_watcher/Notifier: remove header file

Remove inclusion of buffer.h and instead just include forward
declaration header - buffer_fwd.h

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>

osd: fix noisy debug line

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

Merge pull request #8628 from SUSE/wip-ceph-common-pre-scriptlet

ceph.spec.in: terminate if statement in %pre scriptlet

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

doc/release-notes.rst: clarify ceph UID/GID assignment on SUSE

This patch attempts to describe the semantics by which the ceph UID/GID
is assigned on SUSE distros.

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

doc/release-notes.rst: minor grammar and style corrections

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

doc/release-notes: expand distro/arch section to include arm64 info

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

doc/release-notes: more detail about the ext4 checks

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

doc/release-notes: include changes in rcs

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

doc/release-notes: clean up jewel notes

- add notes for the rc's
- move upgrade info up to 10.2.0 (draft)

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

doc/release-notes: fix rados scrub summary

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

ceph.spec.in: terminate if statement in %pre scriptlet

One of the if statements in the ceph-common %pre scriptlet was not properly
terminated.

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

Merge pull request #8620 from yehudasa/wip-rgw-region-fixes

rgw : region to zonegroup related fixes
Reviewed-by: Orit Wasserman <owasserm@redhat.com>

doc: Fixes "branch -b" to "checkout -b"

Signed-off-by: luokexue <luo.kexue@zte.com.cn>

doc: Fixes all "Qemu" to "QEMU"

Signed-off-by: luokexue <luo.kexue@zte.com.cn>

Merge pull request #8617 from liewegas/wip-15098

debian: start ceph-mon-all and ceph-osd-all on package install …

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Dan Mick <dmick@redhat.com>
Tested-by: Yuri Weinstein <yweinste@redhat.com>

Merge pull request #8613 from liewegas/wip-debug-map-trim

osd: some debug output for old osdmap trimming

common: typo-fix for osd_check_max_object_name_len_on_startup

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

pybind: removed unneccesary parentheses from if statements

Signed-off-by: Roland Mechler <rmechler@cisco.com>

rgw: Add a test for multi-tenancy

This is a very rudimentary test for now. For one thing, it
only creates a tenantized user, but does not even try to run
the radosgw and access it with Boto. And it already has several
XXX tags. But baby steps.

Two areas of exising code had to be fixed up.

 - We forgot to patch an argument through in RGWcluster.rgw_admin()

 - We must not process the arguments of a command through eval(1)
   in test-rgw-call.sh. This causes a double-eval with the function
   x() in test-rgw-common.sh, and as a result arguments with spaces
   or dollars cannot be used. There is no way to escape or quote.
   But we need the dollar for the tenant!

Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>

common: typo-fix for osd_check_max_object_name_len_on_startup

Fixes a typo introduced in 02f5885114eab8ce21dedb8c3337422d89cc0d9b

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

Merge pull request #8560 from liewegas/wip-lfn-startup

osd: refuse to start if object name limits are not possible

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

Merge pull request #7984 from rldleblanc/wpq-starvation

common: WeightedPriorityQueue Re-Add Round Robin for Classes

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Karol Mroz <kmroz@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #8505 from liewegas/wip-15391

osd/ReplicatedPG: make handle_watch_timeout no-op if !active

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

Merge pull request #8545 from xiexingguo/xxg-wip-lfn

os/filestore: fix return type mismatch for lfn parse

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

Merge pull request #8555 from avnerbh/fixes_no_3

msg/xio: simple fixes

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

Merge pull request #8570 from xiexingguo/xxg-wip-scrub

osd: clear requeue_scrub_on_unblock flag after requeue scrub

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

Merge pull request #8586 from liewegas/wip-15441

osd: fix watch reconnect race

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Samuel Just <sjust@redhat.com>

Merge pull request #8619 from yehudasa/wip-rgw-jewel-fixes

rgw: fix binfo_cache, RGWShardCollectCR

rgw: cross rgw request need to send 'zonegroup' http header

instead of 'region'.

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

rgw: fix get_zonegroup()

was passing in the wrong param

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

Merge pull request #8281 from theanalyst/doc/multisite-rgw

doc: rgw adding a very basic multisite doc

doc: add multisite to index

Signed-off-by: Abhishek Lekshmanan <alekshmanan@suse.com>

doc: rgw multisite documentation

Adding basic documentation for new multisite features, with an example
showing 3 zones in a zonegroup.

Fixes: http://tracker.ceph.com/issues/15247
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>

rgw: binfo_cache is now a RGWRados member

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

rgw: RGWShardCollectCR does not need a cct member

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

Merge pull request #7912 from ceph/wip-cmake-make-check

Wip cmake make check

Merge pull request #8614 from liewegas/wip-fsmap-underscore

mds/FSMap: use _ in key name

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

debian: start ceph-mon-all and ceph-osd-all on package install

This matches ceph-mds-all and ceph-all behavior.

Fixes: http://tracker.ceph.com/issues/15098
Signed-off-by: Sage Weil <sage@redhat.com>

Merge pull request #8615 from theanalyst/fix-mailmap-self

mailmap: Abhishek Lekshmanan affiliation

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

mailmap: Abhishek Lekshmanan affiliation

Adding an entry to normalize the personal email id and work email id
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>

mds/FSMap: use _ in key name

No space or else it isn't valid XML.

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