Merge pull request #17154 from ktdreyer/doc-cat

doc: eliminate useless cat statement

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

Merge pull request #16127 from ZVampirEM77/wip-obj-acl-bug

rgw: fix obj copied from remote gateway acl full_control issue

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

Merge pull request #17041 from dengxiafubi/EAS-1

rgw: exit early if rgw_bucket_set_attrs() fails

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>

Merge pull request #17065 from tchaikov/wip-20785

mon/OSDMonitor: do not send_pg_creates with stale info

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

Merge pull request #17168 from ceph/wip-volume-man-fix

doc: include ceph-disk and ceph-disk-volume man pages in index

Reviewed-by: Dan Mick <dmick@redhat.com>

doc add ceph-volume and ceph-volume-systemd man pages to CMakeLists file

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

doc: include ceph-disk and ceph-disk-volume man pages in index

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

Merge pull request #16836 from heyingstar/bug-ms_dump_on_send-doubledata

messages/MOSDOp: a fixes of encode_payload

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

Merge pull request #17079 from joscollin/wip-use-after-free

msg: drop the unnecessary polling_stop()

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

Merge pull request #16344 from rzarzynski/wip-rgwqa-tempest

rgw, qa: integrate Tempest to verify RadosGW's compliance with Swift API

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

Merge pull request #16818 from theanalyst/rgw-lc-add-filter-2

rgw_lc: add support for optional filter argument and make ID optional

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

Merge pull request #17116 from Synesis-LLC/fix-20934

rgw: Prevent overflow of cached stats values

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

Merge pull request #17152 from ceph/wip-rm21030

create the ceph-volume and ceph-volume-systemd man pages

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

rpm: include ceph-volume and ceph-volume-systemd man pages

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

debian: include ceph-volume and ceph-volume-systemd man pages

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

doc: eliminate useless cat statement

Useless Use of Cat Award!

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

Merge pull request #17039 from dzafman/wip-18206

osd: Fixes for osd_scrub_during_recovery handling

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

doc index the ceph-volume and ceph-volume-systemd man pages

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

doc/man create the ceph-volume man page

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

doc/man create the ceph-volume-systemd man page

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

Merge pull request #17127 from tchaikov/wip-doc-cleanups

doc/conf.py: do not set html_use_smartypants explicitly

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

Merge pull request #17131 from scienceluo/wip-luo-check-fix-branch

osd: Drop the unused code in OSD::_collect_metadata

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

osd: Drop the unused code in OSD::_collect_metadata

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

doc/conf.py: do not set html_use_smartypants explicitly

because it's deprecated, and is on by default in the specified sphinx
version (v1.6.3):

this change silences following warning:

build-doc/virtualenv/local/lib/python2.7/site-packages/sphinx/environment/__init__.py:683:
RemovedInSphinx17Warning: html_use_smartypants option is deprecated.
Smart quotes are on by default; if you want to disable or customize
them, use the smart_quotes option in docutils.conf.
  RemovedInSphinx17Warning)

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

doc: remove manpage-howto.txt

since manpages are built as part of "make" process, we can dispense with
the manual steps.

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

Merge pull request #17115 from amitkumar50/cov-osd-1

osd: Initialization of pointer cls

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

osd: Fixes for osd_scrub_during_recovery handling

Fixes: http://tracker.ceph.com/issues/18206
Signed-off-by: David Zafman <dzafman@redhat.com>

tests: osd-scrub-snaps.sh minor cleanup

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

Merge PR #17120 into master

* refs/remotes/upstream/pull/17120/head:
rpm: ceph-fuse requires fuse package

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #17097 from ceph/wip-bz1478599

ceph-volume: Use a delimited CLI output parser instead of JSON

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

Merge pull request #17068 from ceph/ceph-volume-docs

ceph-volume docs

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

docs/ceph-volume add lvm/create to the index

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

doc/ceph-volume add the lvm create reference

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

rpm: ceph-fuse requires fuse package

The ceph-fuse(8) man page describes using the "fusermount" tool to mount
CephFS. This utility is in the "fuse" package. Prior to this change, the
ceph-fuse RPM only depends on "fuse-libs", not "fuse".

The Debian packaging has always depended on the full "fuse" (previously
"fuse-utils") package, so we should make the RPM packaging do the same.

Fixes: http://tracker.ceph.com/issues/21057
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>

osd: Initialization of cls

Fixes the coverity issue:

** 1322812 Uninitialized pointer field
CID 1322812 (#1 of 1): Uninitialized pointer field (UNINIT_CTOR)
2. uninit_member: Non-static class member cls is not initialized
in this constructor nor in any functions that it calls.

Signed-off-by: Amit Kumar amitkuma@redhat.com

debian: include ceph-volume-systemd CLI tool

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

Merge pull request #16807 from fangyuxiangGL/revert-8765

rgw: revert PR #8765

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

Merge pull request #17024 from cbodley/wip-20906

cls/log: cls_log_list always returns next marker

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

Merge pull request #17048 from theanalyst/rgw-fix-get-obj-tag-attr

rgw: rgw_op: exit early if object has no attrs in GetObjectTagging

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

Merge pull request #17050 from theanalyst/rgw-iam-get-bucket-acl

rgw: evaluate the correct bucket action for GetACL bucket operation

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>

doc ignore ceph-volume when building man pages

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

doc: add LVM tag term to the glossary

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

doc/dev include ceph-volume devel docs

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

docs: include ceph-volume's index file in the main toctree

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

ceph-volume update the systemd docstring to use the new API

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

doc/glossary add terminology used by ceph-volume

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

doc/ceph-volume create the systemd lvm reference

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

doc/ceph-volume create the intro to ceph-volume

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

doc/ceph-volume create the main index

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

doc/ceph-volume add the lvm scan reference

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

doc/ceph-volume create the lvm prepare reference

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

Merge pull request #17098 from dzafman/wip-runs-core

tests: run-standalone.sh skip core_pattern if already set

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>

doc/ceph-volume create the lvm activate reference

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

doc/install use the new mgr-administrator-guide label

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

doc/mgr add a label for the administrator guide

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

doc/dev/ceph-volume add a toctree for the dev docs

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

doc/dev/ceph-volume add systemd reference

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

doc/dev/ceph-volume add plugin interface

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

doc/dev/ceph-volume add the internal lvm api

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

Merge pull request #17044 from baruza/wip-doc-21007

doc: Improve the ceph fs set max_mds command

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

doc: Improve the ceph fs set max_mds command

Fixes: http://tracker.ceph.com/issues/21007
Signed-off-by: Bara Ancincova <bara@redhat.com>

rgw: Prevent overflow of stats cached values

Fixes: http://tracker.ceph.com/issues/20934
Signed-off-by: Aleksei Gutikov <aleksey.gutikov@synesis.ru>

Merge pull request #17112 from optimistyzy/821_spdk

NVMDevice: fix issued caused by #17002

Merge pull request #17107 from Songweibin/wip-spell

misc fix spell errors in osd/OSD and doc

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

Merge pull request #17105 from iliul/add-mailmap-affiliation

.mailmap, .organizationmap: Add Liu Lei's mailmap and affiliation

Reviewed-By: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-By: Jos Collin <jcollin@redhat.com>

Merge pull request #17109 from ashishkumsingh/add-mailmap-affiliation

organizationmap: Add Ashish Singh affiliation

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>

organizationmap: Ashish Singh affiliation

Signed-off-by: Ashish Singh <assingh@redhat.com>

NVMDevice: fix issued caused by #17002

Patch #17002 breaks running osd when using spdk, and
this patch can fix this.

Signed-off-by: Ziye Yang <optimistyzy@gmail.com>

Merge pull request #17078 from dillaman/wip-21029

test/librbd: TestMirroringWatcher unit tests should ignore duplicates

Merge pull request #16647 from tchaikov/wip-osd-exit-directly-on-failure

osd: exit(1) directly without lock if init fails

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

doc: fix a spell error and modify layout

Signed-off-by: songweibin <song.weibin@zte.com.cn>

osd/OSD: fix spell errors

Signed-off-by: songweibin <song.weibin@zte.com.cn>

.mailmap, .organizationmap: Add Liu Lei's mailmap and affiliation

Signed-off-by: iliul <liul124@chinaunicom.cn>

Merge pull request #17086 from optimistyzy/818_write

bluestore/NVMEDevice: fix the bug in write function

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

Merge pull request #17104 from iliul/fix-duplicate-words

doc: delete duplicate words

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

doc: delete duplicate words

Signed-off-by: iliul <liul124@chinaunicom.cn>

Merge pull request #17060 from cyx1231st/fix_reqid_assignment_in_oprequest

osd: fix reqid assignment for reply messages in OpRequest

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

Merge pull request #16687 from Songweibin/wip-xml-format

common: adding line break at end of some cli results

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

mon/OSDMonitor: do not send_pg_creates with stale info

we reset the "creating_pgs" with the newly accepted paxos proposal, but
the creating_pgs_by_osd_epoch is out-of-sync with the new creating_pgs.
so we are at risk of using stale creating_pgs_by_osd_epoch along with
the new creating_pgs.pgs. to avoid this racing, we need to check the
creating_pgs_epoch before sending pg-creates using
creating_pgs_by_osd_epoch.

Fixes: http://tracker.ceph.com/issues/20785
Signed-off-by: Kefu Chai <kchai@redhat.com>

Merge pull request #15118 from squidboylan/fix_15872

debian: lock ceph user during purge

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

Merge pull request #17059 from tchaikov/wip-optional-lz4

compressor: conditionalize on HAVE_LZ4

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

Merge pull request #17015 from lixiaoy1/lat_fix

os/bluestore: Add lat record of deferred_queued and deferred_aio_wait

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

Merge pull request #16955 from xiexingguo/wip-app-ls

mon/OSDMonitor: "osd pool application get" support

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

Merge pull request #17064 from xiexingguo/wip-20970

mon/PGMap: reweight::by_utilization - skip DNE osds

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

Merge pull request #17067 from renhwztetecs/renhw-wip-mon-cleanup

mon: some cleanup

Reviewed-by: Joao Eduardo Luis <joao@suse.de>

Merge pull request #17052 from dzafman/wip-pidfile

tests: Increase sleep in test_pidfile.sh

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

ceph-volume tests adapt tests for the new LVM api parser

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

ceph-volume lvm.api uses the new parser for lvs

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

ceph-volume lvm.api uses the new parses for vgs

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

ceph-volume: lvm add a parser for the delimeted output in the CLI

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

Merge pull request #15691 from vshankar/mirror-ha-policy

rbd-mirror: introduce basic image mapping policy

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

tests: run-standalone.sh skip core_pattern if already set

If sudo requires a password it is nice to be able to avoid
sudo sysctl by setting core_pattern ahead of time.

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

Merge pull request #17076 from ceph/toc-sidebar-fix

doc/templates update toctree call to include hidden entries

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

Merge pull request #17093 from dzafman/wip-runs-message

tests: run-standalone.sh improve error message

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

doc update template call for toctree

Up until version 1.1.3 of Sphinx, this call would show hidden toctree
entries. Most of Ceph's toctree's are hidden, so when the version of
Sphinx was bumped to >1.6, the sidebar stopped showing entries

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

Merge pull request #17026 from dzafman/wip-add-trap

tests: qa/standalone: Add trap for signals to restore the kernel core pattern

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

os/bluestore: Add lat record of deferred_queued and deferred_aio_wait

Originally bluestore defines the two lat deferred_queued_lat and
deferred_aio_wait_lat, but doesn't use it.
This patch is to add the records that each TXC stays on deferred queue
deferred ios.

Signed-off-by: Xiaoyan Li xiaoyan.li@intel.com

rbd-mirror: load/update image map state machine

Signed-off-by: Venky Shankar <vshankar@redhat.com>

rbd-mirror: track on-disk image to instance map

Signed-off-by: Venky Shankar <vshankar@redhat.com>

tests: run-standalone.sh improve error message

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