Merge pull request #19324 from neha-ojha/wip-fix-collectl

qa: install collectl with cbt task

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

Merge pull request #19325 from ceph/wip-ceph-disk-man-fix

doc/man remove deprecation of ceph-disk man page title

Reviewed-by: Brad Hubbard

doc/man remove deprecation of ceph-disk man page title

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

qa: install collectl with cbt task

Signed-off-by: Neha Ojha <nojha@redhat.com>

Merge pull request #19241 from ceph/wip-doc-deprecate-cdisk

doc: update references to use ceph-volume

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

Merge pull request #19321 from ceph/wip-rm22305

ceph-volume should be able to handle multiple LVM (VG/LV) tags

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

Merge pull request #19319 from ceph/wip-rm22297

ceph-volume  handle inline comments in the ceph.conf file

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

ceph-volume tests.api ensure that we can handle non-ceph tags in lvs

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

Merge pull request #19316 from trociny/wip-blkdev-fixup

common/blkdev: fix build in FreeBSD environment

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>

ceph-volume api.lvm only consider 'ceph.' tags in logical volumes

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

doc/install use ceph-volume in manual deployment steps

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

doc/rados update user-management to use ceph-volume

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

doc/rados update bluestore-migration to use ceph-volume

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

doc/rados update add-or-rm-osds to use ceph-volume

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

doc/rados update bluestore config to use ceph-volume

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

doc/rados update auth config examples to use ceph-volume

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

doc/man add deprecation notices to ceph-disk man page

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

Merge pull request #19275 from qrGitHub/wip-rgw-correct-comment

rgw: correct comment in function parse_credentials

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

ceph-volume configuration allow inlined comments for # and ;

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

ceph-volume tests verify that INI comments can be inlined

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

Merge pull request #19314 from ifed01/wip-ifed-affiliation

.githubmap, .mailmap, .organizationmap, .peoplemap: update Igor

Reviewed-By: Abhishek Lekshmanan <abhishek@suse.com>

common/blkdev: fix build in FreeBSD environment

Signed-off-by: Mykola Golub <to.my.trociny@gmail.com>

.githubmap, .mailmap, .organizationmap, .peoplemap: update Igor
Fedotov's affiliation

Signed-off-by: Igor Fedotov <ifedotov@suse.com>

Merge pull request #19196 from shun-s/wip-cephdisk-fix-major-error

ceph-disk: fix signed integer is greater than maximum when call major

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

Merge pull request #19296 from shinobu-x/strange_double_space

osd: Remove double space

osd: Remove double space

Should not break anything but just strange...

Signed-off-by: Shinobu Kinjo <shinobu@redhat.com>

Merge pull request #19161 from xiexingguo/wip-pg-log

osd/PGLog: get rid of ineffective container operations

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

osd/PGLog: get rid of ineffective container operations

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

Merge pull request #19242 from liewegas/wip-21147

qa/suites/rados/thrash: extend mgr beacon grace when many msgr failures injected

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

Merge pull request #19185 from liewegas/wip-trim-mgrmap

mon/MgrMonitor: limit mgrmap history

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

Merge pull request #19285 from ceph/wip-rm22299

ceph-volume Format correctly when vg/lv cannot be used

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

Merge pull request #19259 from ceph/wip-rm22280

ceph-volume: handle leading whitespace/tabs in ceph.conf

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

ceph-volume tests verify proper formatting of RuntimeError on vg/lv error

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

ceph-volume lvm.prepare correctly format argument for vg/lv error

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

Merge pull request #19264 from theanalyst/doc/releases/12.2.2

doc: add 12.2.2 release notes

Reviewed-By: Sage Weil <sage@redhat.com>
Reviewed-By: Nathan Cutler <ncutler@suse.com>

Merge pull request #19284 from theanalyst/changelog/12.2.2

doc: add changelog for v12.2.2

doc: add changelog for v12.2.2

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

Merge pull request #19278 from badone/wip-librgw_file_marker-unused-function-warnings

rgw_file: Silence unused-function warnings

Merge pull request #19281 from qrGitHub/wip-rgw-typo-anynoymous

rgw: fix typo anynoymous to anonymous

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

doc: add 12.2.2 release notes

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

rgw: correct typo anynoymous to anonymous

Signed-off-by: Bingyin Zhang <zhangbingyin@cloudin.cn>

rgw_file: Silence unused-function warnings

Comment out unused insertion operators.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>

rgw: correct comment in function parse_credentials

Signed-off-by: Bingyin Zhang <zhangbingyin@cloudin.cn>

Merge pull request #19233 from tchaikov/wip-no-mon-health-to-clog-when-upgrading

qa: disable mon-health-to-clog in upgrade test

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

Merge pull request #19225 from tchaikov/wip-more-whitelist

qa/suites/rados/singleton: more whitelist

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

Merge pull request #19202 from tchaikov/wip-check-pthread-ext

cmake,common/RWLock: check for libpthread extensions

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

Merge pull request #19160 from shinobu-x/bluestore_tool_remove_redundant_code

os/bluestore/bluestore_tool: Move redundant code into one method

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>

Merge pull request #19100 from tchaikov/wip-log-reuse-streambuf

common/log: Speed improvement for log

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

Merge pull request #18124 from amitkumar50/cleanup-Min-Max

cleanup: Replacing MIN,MAX with std::min,std::max

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

Merge pull request #18991 from dmick/wip-ceph-disk-fsid

ceph_disk: allow "no fsid" on activate

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

Merge pull request #19262 from ceph/wip-fix-distro-master

tests - Replaced requests for "centos 7.3" to centos_latest

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

Merge pull request #19164 from hrchu/adminopsBindings

doc: rgw adminops binding libraries

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

doc: add 12.2.2 to releases table

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

doc: cleanup PendingReleaseNotes

drop sections already in previous releases, keeping only Mimic sections
and a new section header for items going post 12.2.2

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

qa: disable mon-health-to-clog in upgrade test

otherwise the cluster will complain that the quorum size is smaller than
that of monmap.

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

tests - Replaced requests for "centos 7.3" to centos_latest

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>

Merge pull request #19247 from shinobu-x/rados_op_crush-map-edits_straw2

doc/rados: Add explanation of straw2

ceph-volume test leading whitespace is handled in configurations

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

ceph-volume trim tabbed/whitespaced configuration files when loading them

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

Merge pull request #19254 from tchaikov/wip-ceph-disk-mock-get-fsid

ceph-disk: mock get fsid

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

ceph-disk: silence deprecate warnings while testing

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

ceph-disk/tests: mock get_fsid

should offer a valid fsid for the ceph-disk under testing.

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

Merge PR #18995 into master

* refs/pull/18995/head:
client: emplace Cap in Inode caps map

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

Merge PR #19009 into master

* refs/pull/19009/head:
client: Switch to new style config options and some cleanup

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge PR #19069 into master

* refs/pull/19069/head:
qa/tasks/ceph_fuse: fix ceph-fuse mount failed

Reviewed-by: Yunfei Guan <yunfei.guan@xtaotech.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Amit Kumar <amitkuma@redhat.com>

githubmap: update contributors

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

Merge PR #19078 into master

* refs/pull/19078/head:
pybind: return error message when ceph_mds_command() returns error
mds: Fix error message when mds not active

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>

Merge PR #19095 into master

* refs/pull/19095/head:
test: pass correct buffer length to ceph_getdents

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

Merge PR #19181 into master

* refs/pull/19181/head:
client: give full error message on failed remount
client: use PATH_MAX for mount path size

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

Merge PR #19207 into master

* refs/pull/19207/head:
mds: handle client reconnect gather race

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

ceph-disk: fix signed integer is greater than maximum when call major
  fix signed integer is greater than maximum when call os.major
  using python 2.7.5 in Centos 7

Signed-off-by: Song Shun <song.shun3@zte.com.cn>

doc/rados: Add explanation of straw2

Signed-off-by: Shinobu Kinjo <shinobu@redhat.com>

Merge pull request #15482 from myoungwon/wip-chunked-manifest

osd,librados: add manifest, operations for chunked object

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

ceph_disk: allow "no fsid" on activate

The intent was to allow "no fsid" configurations when only one
conf file named 'ceph.conf' was present, but the code has a bug
in that ceph-osd --show-config-value will return a default all-0
uuid.  Treat 'all-0' as we were treating 'None'.

Signed-off-by: Dan Mick <dan.mick@redhat.com>

Merge pull request #18974 from liewegas/wip-22145

osd/PG: restart recovery if NotRecovering and unfound found

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>

osd/PG: restart recovery if NotRecovering and unfound found

If we are in recovery_unfound state waiting for unfound objects, and we
find them, we need to restart the recovery reservation process so that we
can recover.  Do this by queueing DoRecover() event instead of calling
queue_recovery() (which won't do anything since we're not in
recoverying|backfilling pg states).

Make the parent Active state ignore DoRecovery so that if we are already
in some phase of recovery/backfill the event gets ignored.  It is already
handled by the other important substates that care, like Clean (for
repair's benefit).

I'm not sure why states like Activating are paying attention tot his vevent...

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

Merge pull request #18954 from adamemerson/wip-hole-in-the-bucket-dear-liza

rgw: Add try_refresh_bucket_info function
rgw: Add retry_raced_bucket_write
rgw: Handle stale bucket info in RGWPutMetadataBucket
rgw: Handle stale bucket info in RGWSetBucketVersioning
rgw: Handle stale bucket info in RGWSetBucketWebsite
rgw: Handle stale bucket info in RGWDeleteBucketWebsite
rgw: Handle stale bucket info in RGWPutBucketPolicy
rgw: Handle stale bucket info in RGWDeleteBucketPolicy
rgw: Expire entries in bucket info cache

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

Merge pull request #19215 from joscollin/wip-mount-fuse-ceph-typo

doc: Fix typo in mount.fuse.ceph

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #19209 from joscollin/wip-githubman-ktdreyer

githubmap: Add ktdreyer

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #19208 from tchaikov/wip-spdk-17.10

 spdk: update SPDK to v17.10

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

qa/suites/rados/thrash: extend mgr beacon grace when many msgr failures injected

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

Merge pull request #19238 from tchaikov/wip-22266

tools/ceph_monstore_tool: rebuild initial mgrmap also

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

Merge pull request #19079 from adamemerson/wip-static-ptr

Static Pointer

doc: Fix typo in mount.fuse.ceph

Signed-off-by: Jos Collin <jcollin@redhat.com>

Merge PR #19212 into master

* refs/pull/19212/head:
doc: Add section about MDS cache limits

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Merge pull request #19213 from ceph/wip-bz1518264

ceph-volume: correctly fallback to bluestore when no objectstore is specified

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

Merge pull request #18267 from joscollin/wip-update-radosgw-admin-doc

doc: Update commands and options in radosgw-admin
Reviewed-by: Orit Wasserman <owasserm@redhat.com>

tools/ceph_monstore_tool: rebuild initial mgrmap also

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

Merge pull request #18649 from b-ranto/wip-restful-fixes

mgr/restful: A couple of restful fixes

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

qa/tasks/ceph: add mon-health-to-clog option to "restart"

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

doc: Add section about MDS cache limits

Signed-off-by: Bara Ancincova (bara@redhat.com)

doc: Update all OPTIONS sections in radosgw-admin

Updated all OPTIONS sections in RADOSGW-ADMIN doc page, using the latest options from rgw_admin.cc::usage()

Signed-off-by: Jos Collin <jcollin@redhat.com>

qa/tasks/ceph_manager: add inject_args() method

* move Thrasher._set_config() to CephManager, and make it a public
  method, and rename it to inject_args(),
* use this method instead of using 'tell ... injectargs ...' directly

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

cmake,rpm,deb: update to accommodate SPDK v17.10

* cmake/modules/BuildSPDK.cmake: add lvol
* cmake/modules/BuildDPDK.cmake: add pci and bus_pci
* ceph.spec.in, cmake/modules/BuildSPDK.cmake, debian/control:
  re-introduce libuuid dependency, as 17.07 added lvol. and the latter
  depends on uuid.
* cmake/modules/BuildSPDK.cmake: avoid introducing local variable of
  `iface_libs`.
* cmake/modules/patch-dpdk-conf.sh: disable
  CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES, this option introduces the
  balanced allocation of memory. but it also requires libnuma-dev.
  let's disable it for now.

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

Merge pull request #9571 from yehudasa/wip-rgw-redirect-zone

rgw: add a default redirect field for zones

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

Merge pull request #19159 from shinobu-x/drop_using_namespace_std

common: drop namespace using directives for std

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>

Merge pull request #19165 from xiaoxichen/fix_used_pct

mon/PGMap: Fix %USED calculation bug.

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

Merge pull request #19156 from cyx1231st/fix_blkin_tracing

blkin: Fix unconditional tracing in OSD

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

Merge pull request #19149 from rzarzynski/wip-common-perfguards

common:  RAII-styled mechanism for updating PerfCounters

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

Merge pull request #19112 from xiaoxichen/osd_mapped_pool

OSD/admin_socket: add get_mapped_pools command

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