mgr/prometheus: add missing 'deep' state to PG_STATES in ceph-mgr prometheus plugin

without this the endpoint throws 500s when any PG is doing a deep scrub.

Signed-off-by: Peter Woodman <peter@shortbus.org>
Fixes: http://tracker.ceph.com/issues/22116
(cherry picked from commit 8c93c0eeaff406af0878916ef5b9ce958896d586)

pybind/mgr/prometheus: don't crash when encountering an unknown PG state

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 67a1b66b06bf74274c2cf1d4b5c900f2c56a990d)

Merge pull request #19925 from jcsp/wip-dashboard-trim-luminous2

luminous: mgr: remove unused static files from dashboard module

Reviewed-by: Sebastien Han <shan@redhat.com>

mgr/dashboard: remove unneeded bits of AdminLTE

AdminLTE is delivered in a handy all-in format,
but we don't need all this stuff at runtime.

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

mgr/dashboard: remove non-minified bootstrap

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

mgr/dashboard: remove un-minified datatables source

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

mgr/dashboard: don't include remote js/css

This will help anyone running away from the internet.

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

mgr/dashboard: re-arrange static files

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

Merge pull request #19880 from jcsp/wip-doc-dashboard-standby-luminous

doc: update mgr/dashboard doc about standbys

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

doc: update mgr/dashboard doc about standbys

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

Merge pull request #19844 from jcsp/wip-22615

luminous: mgr/dashboard: Fix PG status coloring

Reviewed-by: Wido den Hollander <wido@42on.com>
Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #19858 from joscollin/wip-luminous-doc-misc-fixes

luminous: doc: misc fixes for CephFS best practices

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

doc: misc fixes

misc fixes for best-practices.

Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit ecacd1078db5020e6d65436f9d56cc9ed0016666)

doc: fix heading

Fixed 'Which kernel version?' heading not having brown color background.

Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit a068fd842f431a54f9db2d437a71cdc11907a8e1)

Merge pull request #19505 from shinobu-x/wip-22392-luminous

luminous: mds: tell session ls returns vanila EINVAL when MDS is not active

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

Merge pull request #19831 from pdvian/wip-22576-luminous

luminous: qa: configure zabbix properly before selftest

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Wido den Hollander <wido@42on.com>

mgr/dashboard: Fix PG status coloring

This was broken in the 12.2.2 release and PGs would not get a
color anymore.

This commit also makes sure pools/PGs are marked as red when
one or more PGs are inactive, inconsistent, incomplete, down, etc.

Signed-off-by: Wido den Hollander <wido@42on.com>
(cherry picked from commit 450aa2133d05916822083969260ee07622591e33)

Merge pull request #19787 from linuxbox2/luminous-21984

rgw: fix rewrite a versioning object create a new object bug

qa: configure zabbix properly before selftest

Even though the selftest routine doesn't care about
the settings, we should set them to avoid emitting
nasty log/health messages when enabling the module.

Fixes: http://tracker.ceph.com/issues/22514
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit c64c9ff00d2df2177135bcd2735bd7aeac625643)

Merge pull request #19449 from smithfarm/wip-22398-luminous

luminous: doc: man page for mount.fuse.ceph

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

doc: fix typo

Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit a925bb4520797376b4b169bbcfe613cd1fa36429)

doc: add mount.fuse.ceph to index

Added mount.fuse.ceph to index.rst

Fixes: http://tracker.ceph.com/issues/22595
Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit db23f4ce30cd521b5b8909edc8c26dc87aeecd98)

doc: doc for mount.fuse.ceph

Created doc for mount.fuse.ceph.

Fixes: http://tracker.ceph.com/issues/21539
Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit 6c39818eaf39358cab8dd3dce579c932fba0d05d)

rgw: fix rewrite a versioning object create a new object bug

Fixes: http://tracker.ceph.com/issues/21984
Signed-off-by: Enming Zhang <enming.zhang@umcloud.com>
(cherry picked from commit 700a0292362128cb29586a64ef8215a07d96736b)
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>

Merge pull request #19243 from liewegas/wip-fix-statfs-luminous

mon/Monitor: fix statfs handling before luminous switchover happens

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

Merge pull request #19746 from ceph/wip-use-installer0-luminous2

qa/tests - Added options to use both cases: mon.a and installer.0

qa/tests - Added options to use both cases: mon.a and installer.0

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
(cherry picked from commit 10fc85089c3bb64ced8c3a0ea17987e9ec5f46a2)
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>

qa/tests: run ceph-ansible task on installer.0 role/node

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
(cherry picked from commit 3b2a26d919c173c887fd193f186ea56c33fcd9ae)

Merge pull request #19741 from joscollin/luminous

luminous: doc: update Blacklisting and OSD epoch barrier

doc: fix grammar mistake

Fixed grammar mistake in a sentence.

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

doc: update Blacklisting and OSD epoch barrier

Updated missing OSD epoch barrier section, which is referenced by http://docs.ceph.com/docs/luminous/cephfs/full/#hammer-and-later.

Fixes: http://tracker.ceph.com/issues/22552
Signed-off-by: Jos Collin <jcollin@redhat.com>

Merge pull request #19721 from tchaikov/wip-luminous-boost-un-submodule

luminous: boost un-submodule

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

make-dist: exclude unused bits in boost

the docs, examples and tests are not used. so drop them. we could go
further by removing unused components in boost. but that'd be an issue
if somebody added a component in CMakeLists but forgets to update this
script. also, we need to remove boost/$component and lib/$component to
achieve this goal. this also introduces extra complicity. so leave it
for another change.

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

make-dist: repackage boost in the correct path

before this change, boost is put into ./src. after this change, it is
put into $outfile/src. i.e. something like
ceph-12.1.2-4592-gf5f2ced624/src .

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

make-dist,cmake: Try multiple URLs to download boost before failing

Remove SPOF during boost download for make-dist and later cmake > 3.7

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit 598556f98b65a03ad40ad076623b9cc8b507810e)

make-dist,cmake: move boost tarball location to download.ceph.com

Sourceforge is down.  Also, we can hammer our servers instead of
theirs.

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

make-dist: download and repackage boost

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

boost: remove boost submodule

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

Merge pull request #19680 from tchaikov/wip-luminous-22220

luminous: install-deps.sh: revert gcc to the one shipped by distro

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

Merge pull request #19048 from shinobu-x/wip-22196-luminous

luminous: mgr[zabbix] float division by zero (osd['kb'] = 0)

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

install-deps.sh: update g++ symlink also

we need to update g++ symlink also, if it points to the wrong version

http://tracker.ceph.com/issues/22220
Signed-off-by: Kefu Chai <kchai@redhat.com>
Conflicts: the libboost issue does not affect master. as master builds
     boost from source. so, it's not cherry-picked from master.
(cherry picked from commit 248a157635b46d3cf23e37ae263c62b0dc4e0e59)

install-deps.sh: readlink /usr/bin/gcc not /usr/bin/x86_64-linux-gnu-gcc

See: http://tracker.ceph.com/issues/22220
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 5be6ff11e536cb492dd50dedf8a04fb9acc1222e)

install-deps.sh: point gcc to the one shipped by distro

to define a struct in a method is legal in C++11, but it causes internal
compiler error due to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82155
if we are using GCC-7. so we need to either workaround in our source
code by moving the struct definition out of the member method or revert
to a GCC without this bug. but if we go with the first route, the jewel
build still fails, because GCC-7 starts to use the new CXX11 ABI, which
is not compatible with the libboost we use in jewel. the libboost was
still built with the old ABI for backward compatibility. so let's just
fix the install-deps.sh to point gcc to the origin one.

See: http://tracker.ceph.com/issues/22220
Signed-off-by: Kefu Chai <kchai@redhat.com>
Conflicts: the libboost issue does not affect master. as master builds
 boost from source. so, it's not cherry-picked from master.
(cherry picked from commit ccc4dea90e483ea8bf6bee0721ef929e7f48ff5a)

Merge pull request #18771 from ceph/wip-yuriw-22048-luminous

tests - Initial checkin for luminous point-to-point upgrade

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

Merge pull request #19522 from ceph/wip-ceph-disk-deprecation-revert

Revert "ceph-disk add deprecation warnings in favor of ceph-volume"

Reviewed-By: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

tests - Initial checkin for luminous point-to-point upgrade

Fixes http://tracker.ceph.com/issues/22048
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>

Merge pull request #19532 from ceph/luminous-rm22297

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

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

Merge pull request #19530 from ceph/luminous-rm22326

luminous ceph-volume: warn on missing ceph.conf file

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

ceph-volume configuration allow inlined comments for # and ;

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

ceph-volume tests verify that INI comments can be inlined

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

Merge pull request #19525 from ceph/backport-19363

luminous: ceph-volume: removed the explicit use of sudo

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

ceph-volume test logging ignored ceph.conf file

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

ceph-volume main warn on inability to load ceph.conf, don't raise

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

Merge pull request #19528 from ceph/luminous-rm22305

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

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

Merge pull request #19527 from ceph/luminous-rm22299

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

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

Merge pull request #19526 from ceph/luminous-rm22280

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

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>
(cherry picked from commit c98731ecede09d8d15dca99c57e331212747060e)

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

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

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

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

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

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

ceph-volume test leading whitespace is handled in configurations

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

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

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

ceph-volume: removed the explicit use of sudo

This will allow users to run ceph-volume on systems that do
not have sudo installed.

Fixes: http://tracker.ceph.com/issues/22282
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit aee71a3f5169043f750fd768e7fea9c74309e12d)

Revert "ceph-disk add deprecation warnings in favor of ceph-volume"

This reverts commit b8bf0d047868054135592188c7ebe186181310c5.

Deprecation warnings for ceph-disk will no longer be present in any
Luminous release beyond 12.2.2 - but are still present in master and any
newer release.

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

pybind: return error message when ceph_mds_command() returns error

Returned the error message when ceph_mds_command() returns error.

Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit 941b58c968f6b0e359f279c8bc9e7decf51e75d1)

mds: Fix error message when mds not active

Fix error message for mds not active state. Also fixed the 'unrecognized command' logic by avoiding the new stringstream local object.

Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit 10f93cf5828afbc8ff25ef81b2437ef5c0362396)

Merge pull request #19042 from liewegas/wip-22128

mon/OSDMonitor: fix ruleset-* to crush-* fixup

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>

Merge pull request #19355 from tchaikov/wip-18589-luminous

luminous: build/ops: move ceph-*-tool binaries out of ceph-test subpackage

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

debian/control: adjust ceph-{osdomap,kvstore,monstore}-tool feature move

this is a follow-up of #19328. we need to get this change into 12.2.3.
so better off do the switch somewhere after 12.2.2 which has been
tagged, and before 12.2.3, which is not tagged yet.

please note, this is not targetting master, because i want to make
sure the change number (the <num> in << 12.2.2-<num>) is correct. it
does not hurt if it's not, as long as it is ">> 12.2.2", so the replace
machinery in 12.2.3 works, and it covers the releases where the
ceph-{osdomap,kvstore,monstore}-tool are not move yet. but why don't
make it more right?

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

debian/control: adjust ceph-{osdomap,kvstore,monstore}-tool feature move

The backport didn't make 12.2.2, but it will be in 12.2.3.

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

doc: add ceph-kvstore-tool's man

Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
(cherry picked from commit 0667db4eb61338887743d17c93a61c0e89868b08)

debian: fix package relationships after d3ac8d18

d3ac8d18 moves ceph-client-debug from ceph-test to ceph-base without
updating the package relationships between the two involved packages.
which results in:

dpkg: error processing archive /var/cache/apt/archives/ceph-test_12.2.1-241-g43e027b-1trusty_amd64.deb (--unpack):
 trying to overwrite '/usr/bin/ceph-client-debug', which is also in package ceph-base 10.2.10-14-gcbaddae-1trusty
dpkg-deb: error: subprocess paste was killed by signal (Broken pipe)

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

debian: fix package relationships after 40caf6a6

we have issues when running upgrade tests:

dpkg: error processing archive /var/cache/apt/archives/ceph-osd_13.0.0-2201-g6cc0b41-1trusty_amd64.deb (--unpack):
trying to overwrite '/usr/bin/ceph-osdomap-tool', which is also in package ceph-test 10.2.10-14-gcbaddae-1trusty

in 40caf6a6, we moves some tools from ceph-test out into ceph-osd,
ceph-mon and ceph-base respectively. but didn't update the relationships
between these packages accordingly. this causes the upgrade failure.

see https://www.debian.org/doc/debian-policy/#document-ch-relationships
for more details on "Breaks" and "Conflicts".

the reason why the package version to be replaced/conflicted is 12.2.2
is that: i assume that this change will be backported to luminous, and
the next release of it will be 12.2.2 .

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

build/ops: deb: move ceph-*-tool binaries out of ceph-test subpackage

ceph-osdomap-tool into ceph-osd subpackage
ceph-monstore-tool into ceph-mon subpackage
ceph-kvstore-tool into the ceph-base subpackage

Fixes: http://tracker.ceph.com/issues/21762
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 40caf6a6d85fbde930b74df57a62381f6225c3fd)

build/ops: rpm: move ceph-*-tool binaries out of ceph-test subpackage

ceph-osdomap-tool into ceph-osd subpackage
ceph-monstore-tool into ceph-mon subpackage
ceph-kvstore-tool into the ceph-base subpackage

Fixes: http://tracker.ceph.com/issues/21762
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit d7b493a7108a68302bc0f48337bf3c253a720266)

Merge pull request #19299 from tchaikov/wip-pr-19196-luminous

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

Reviewed-by: Alfredo Deza <adeza@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>
(cherry picked from commit f77934b19939796d7ab52daf4dac44846a2ad162)

Merge remote-tracking branch 'gh/luminous' into luminous

Merge pull request #19001 from tchaikov/wip-pr-18848-luminous

luminous: mgr/dashboard: fix audit log loading

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

Merge pull request #19270 from tchaikov/wip-pr-19225-luminous

luminous: qa/suites/rados/singleton: more whitelist

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

qa/suites/rados/singleton: more whitelist

* SLOW_OPS is normal in a cluster with flattering OSDs
* so is OBJECT_MISPLACED.

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

12.2.2

Merge pull request #19240 from tchaikov/wip-22266-luminous

luminous: tools/ceph_monstore_tool: rebuild initial mgrmap also

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

mon/Monitor: fix statfs handling before luminous switchover happens

After the mons are luminous but before we switch over to using the
MgrStatMonitor's new info, the version on mgrstat will generally be <<
than that of pgmon, and the client will send that version with the
request.  This means that the statfs message will perpetually appear to be
in the future and fail the is_readable() check.

Fix this with any ugly hack that resets the version to 1 if we haven't
completed the luminous upgrade yet.

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

Merge pull request #19230 from tchaikov/wip-22247-luminous

luminous: mon/PGMap: Fix %USED calculation

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

Merge pull request #19239 from ceph/luminous-bz1518264

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

Reviewed-by: Andrew Schoen <aschoen@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>
(cherry picked from commit f63d1da4afa3463730ecbc0be29df6375b79fa8f)

ceph-volume lvm.activate correct detection and fallback of objectstore flags

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

ceph-volume tests.devices.lvm verify objectstore flags in activate

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

Merge pull request #19217 from liewegas/wip-p2p-app-warning-luminous

upgrade/jewel-x/parallel: debug fuse

mon/PGMap: Fix %USED calculation bug.

Previous code forgot to multiple raw_used_ratio to calculate
used byte.

Fixes: http://tracker.ceph.com/issues/22247
Signed-off-by: Xiaoxi Chen <xiaoxchen@ebay.com>
(cherry picked from commit d10c6c26f9ef7372e2c95da79d23b07ce5f4e0e5)

qa/suites/upgrade/jewel-x/point-to-point: whitelist more stuff

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

qa/suites/upgrade/jewel-x/parallel: only mount ceph-fuse once

Otherwise we do 4 mounts for no good reason.

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

upgrade/jewel-x/parallel: debug fuse

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

Merge pull request #19216 from liewegas/wip-p2p-app-warning-luminous

qa/suites/upgrade/jewel-x/point-to-point: fix suppression of pool app warning

qa/suites/upgrade/jewel-x/point-to-point: fix suppression of pool app warning

It's generated on the mgr.

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

Merge pull request #19205 from tchaikov/wip-22136-luminous

luminous: qa/ceph-disk: enlarge the simulated SCSI disk

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

Merge pull request #19152 from smithfarm/wip-22235-luminous

luminous: ceph-disk flake8 test fails on very old, and very new, versions of flake8

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

qa/ceph-disk: enlarge the simulated SCSI disk

100MB will be allocated for journal, and the remaining 100MB is for data
device. taking the inode into consideration, there will be approximately
87988 kB available for the activated OSD. and it will complain with a
"nearfull" state.

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

Merge pull request #19173 from smithfarm/wip-22251-luminous

luminous: build/ops: macros expanding in spec file comment

Reviewed-by: David Disseldorp <ddiss@suse.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>