test/libcephfs: avoid buffer overflow when testing ceph_getdents()

The buffer size should be at least "2 * sizeof(struct dirent)".
Otherwise, the code that checks dentry '..' overflow.

Fixes: http://tracker.ceph.com/issues/18941
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit fa6671345b8f3a82dcd232f99e55a982b0a641f1)

Merge pull request #13609 from smithfarm/wip-19064-kraken

kraken: AttributeError: Thrasher instance has no attribute 'ceph_objectstore_tool'

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

Merge pull request #13790 from shinobu-x/wip-18298-kraken

kraken: mon: force_create_pg could leave pg stuck in creating state

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

Merge pull request #13500 from shinobu-x/wip-18587-kraken

 kraken: mon: 'osd crush move ...' doesnt work on osds

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

Merge pull request #13490 from shinobu-x/wip-18820-kraken

kraken: osd: --flush-journal: sporadic segfaults on exit

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

Merge pull request #13295 from asheplyakov/kraken-bp-18497

kraken: osd: publish PG stats when backfill-related states change

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

Merge pull request #13253 from liewegas/wip-enxio-kraken

kraken: osd: do not send ENXIO on misdirected op by default

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

Merge pull request #14322 from shinobu-x/wip-18619-kraken

kraken: osd: ceph degraded and misplaced status output inaccurate

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

Merge pull request #13216 from ovh/bp-osd-updateable-throttles-kraken

kraken: osd: allow client throttler to be adjusted on-fly, without restart

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

Merge pull request #14321 from shinobu-x/wip-kraken-15025

kraken: osd: New added OSD always down when full flag is set

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

Merge pull request #13091 from dzafman/wip-18624-kraken

kraken: osd: Revert "PrimaryLogPG::failed_push: update missing as well"

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

Merge pull request #12790 from SUSE/wip-18418-kraken

kraken: osd: leveldb corruption leads to Operation not permitted not handled and assert

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

Merge pull request #13172 from smithfarm/wip-18713-kraken

kraken: rgw: radosgw-admin period update reverts deleted zonegroup

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

Merge pull request #13176 from smithfarm/wip-18709-kraken

kraken: rgw: multisite: sync status reports master is on a different period

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

Merge pull request #13864 from smithfarm/wip-19156-kraken

kraken: rgw: typo in rgw_admin.cc

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

Merge pull request #14137 from smithfarm/wip-19331-kraken

kraken: rgw: upgrade to multisite v2 fails if there is a zone without zone info

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

Merge pull request #14141 from smithfarm/wip-19342-kraken

kraken: rgw: "period update" does not remove short_zone_ids of deleted zones

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

Merge pull request #14142 from smithfarm/wip-19354-kraken

kraken: rgw: multisite: some 'radosgw-admin data sync' commands hang

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

Merge pull request #14144 from smithfarm/wip-19356-kraken

kraken: rgw: when converting region_map we need to use rgw_zone_root_pool

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

Merge pull request #14485 from zmc/wip-upgrade-openstack

suites/upgrade/hammer-jewel-x: Add volumes

Reviewed-by: Yuri Weinstein <yweins@redhat.com>

Merge pull request #14098 from shinobu-x/wip-19192-kraken

kraken: tools: ceph-brag fails to count "in" mds

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

Merge pull request #14155 from smithfarm/wip-18947-kraken

kraken: rbd-mirror: additional test stability improvements

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

Merge pull request #14153 from smithfarm/wip-18892-kraken

kraken: librbd: Incomplete declaration for ContextWQ in librbd/Journal.h

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

Merge pull request #14151 from smithfarm/wip-18822-kraken

kraken: tests: run-rbd-unit-tests.sh assert in lockdep_will_lock, TestLibRBD.ObjectMapConsistentSnap

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

Merge pull request #14149 from smithfarm/wip-18777-kraken

kraken: rbd: rbd --pool=x rename y z does not work

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

Merge pull request #14315 from smithfarm/wip-19460-kraken

kraken: build/ops: spec file mentions non-existent ceph-create-keys systemd unit file, causing ceph-mon units to not be enabled via preset

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

Merge pull request #13875 from smithfarm/wip-19172-kraken

kraken: rgw: S3 create bucket should not do response in json

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

Merge pull request #13873 from smithfarm/wip-19164-kraken

kraken: rgw: radosgw-admin: add the 'object stat' command to usage

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

Merge pull request #13245 from smithfarm/wip-18776-kraken

kraken: rbd: qemu crash triggered by network issues

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

Merge pull request #13247 from smithfarm/wip-18456-kraken

kraken: rbd: attempting to remove an image with incompatible features results in partial removal

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

Merge pull request #13132 from rjfd/wip-18609-kraken

kraken: librbd: allow to open an image without opening parent image

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

Merge pull request #13185 from smithfarm/wip-18721-kraken

kraken: build/ops: systemd restarts Ceph Mon to quickly after failing to start

Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Wido den Hollander <wido@42on.com>

Merge pull request #13845 from smithfarm/wip-19147-kraken

kraken: rgw: DUMPABLE flag is cleared by setuid preventing coredumps

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

Merge pull request #13555 from smithfarm/wip-18707-kraken

kraken: mds: failed filelock.can_read(-1) assertion in Server::_dir_is_nonempty

Reviewed-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #13488 from shinobu-x/wip-18955-kraken

kraken: ceph-disk: Fix getting wrong group name when --setgroup in bluestore

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

Merge pull request #13112 from jcsp/wip-18678

kraken: mds: finish clientreplay requests before requesting active state

Reviewed-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>

Merge pull request #14048 from asheplyakov/reindex-on-pg-split-kraken

kraken: osd: pg log split does not rebuild index for parent or child

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

Merge pull request #13116 from smithfarm/wip-18403-kraken

kraken: mon: cache tiering: base pool last_force_resend not respected (racing read got wrong version)

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

Merge pull request #13487 from shinobu-x/wip-18819-kraken

kraken: common: possible lockdep false alarm for ThreadPool lock

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #14147 from smithfarm/wip-18769-kraken

kraken: rbd: [  FAILED  ] TestJournalTrimmer.RemoveObjectsWithOtherClient

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

Merge pull request #13026 from SUSE/wip-18606-kraken

kraken: tools: ceph-disk prepare writes osd log 0 with root owner

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

suites/upgrade-hammer-jewel-x: Add volumes

Signed-off-by: Zack Cerza <zack@redhat.com>

Merge pull request #13497 from shinobu-x/wip-17821-kraken

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

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

osd: Calculate degraded and misplaced more accurately

Calculate num_object_copies based on the larger of pool size,
up set size and acting set size.

Calculate num_objects_degraded as the difference between num_object_copies
and all copies found on acting set and backfilling up set OSDs.

Calculate num_objects_misplaced as all copies on acting set OSDs not in up set
less copies that have been backfilled to up set OSDs.

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

osd: don't share osdmap with objecter when preboot

Signed-off-by: Mingxin Liu <mingxin@xsky.com>
(cherry picked from commit a5a3644eecc49b4eea890c6999fe87536495dcbe)

systemd: remove all occurence of ceph-create-keys

ceph-create-keys unit file does not exist anymore so there is no need to
call it.

Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit 205cff12b3fe577a02db119ed3084d5c46ba76ce)

systemd: remove ceph-create-keys from presets

ceph-create-keys unit file was removed here:

* https://github.com/ceph/ceph/commit/8bcb4646b6b9846bb965cdec3ca2a21eb3b26bab
* https://github.com/ceph/ceph/commit/dc5fe8d415858358bd0baf5d8dce0a753f5e0cea

As a consequence the systemctl preset command now fails to run since the
unit does not exist anymore. Due to the redirection in /dev/null we
don't know what's happening.

Ultimately the mon unit doesn't get enabled and the mon service won't
start after reboot.
Removing the old/non-existent unit makes the command succeed now.

Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit 151c0ce213186b2196531ce74478ed7671eb9819)

Merge pull request #14163 from trociny/wip-19368

kraken: librbd: possible race in ExclusiveLock handle_peer_notification

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

Merge pull request #14200 from dzafman/wip-18533-again

Fixes: http://tracker.ceph.com/issues/19391
Reviewed-by: Josh Durgin <jdurgin@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)

kraken: librbd: possible race in ExclusiveLock handle_peer_notification

This is a direct commit to kraken -- the master diverged after
ManagedLock refactoring and is not affected.

Fix: http://tracker.ceph.com/issues/19368
Signed-off-by: Mykola Golub <mgolub@mirantis.com>

qa/workunits/rbd: resolve potential rbd-mirror race conditions

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

librbd: Include WorkQueue.h since we use it

We use m_work_queue of type ContextWQ in handle_update function but we
do not include common/WorkQueue.h that defines ContextWQ. This results
in dereference of an incomplete type and causes build error in latest
Fedora rawhide (future 26).

Fixes: http://tracker.ceph.com/issues/18862
Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit 480f82847ad1fc7959f1fe5a90761a5a24550993)

librbd: avoid possible recursive lock when racing acquire lock

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

rbd: destination pool should be source pool if it is not specified

Currently if user perform image rename operation and user give pool
name as a optional parameter (--pool=<pool_name>) then currently
its taking this optional pool name for source pool and making
destination pool name default pool name.
With this fix if user provide pool name as a optional pool name
parameter then it  will consider both soruce and destination pool
name as optional parameter pool name.

Fixes: http://tracker.ceph.com/issues/18326
Reported-by: МАРК КОРЕНБЕРГ <socketpair@gmail.com>
Signed-off-by: Gaurav Kumar Garg <garg.gaurav52@gmail.com>
(cherry picked from commit 01f23aa99fb694da326ab408e75b33c640ce660b)

journal: stop processing removal after error

Fixed: http://tracker.ceph.com/issues/18738
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 040004f53f7d334fc9452e3f5fd80169cad5f65e)

rgw: use rgw_zone_root_pool for region_map like is done in hammer

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

rgw: use separate http_manager for read_sync_status

concurrent users of read_sync_status() use different cr managers, when get_resource must
use http_manager related to the cr manager.

Fixes: http://tracker.ceph.com/issues/19236
Signed-off-by: Shasha Lu <lu.shasha@eisoo.com>
(cherry picked from commit c412024889f8995d98096ac863bafee71624bd70)

rgw: clear old zone short ids on period update

the short ids of old, removed zones were being kept in the period to
guard against hash collisions with new zones

but for a hash collision to cause a wrong object to sync, that object
would have to be uploaded simultaneously to two different zones that had
the same short id

to avoid this, we just have to prevent the period from containing two
colliding zones at the same time - we don't have to remember old zone
short ids forever

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

rgw: skip conversion of zones without any zoneparams

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

rgw: better debug information for upgrade

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit e9f3bf8eab1dd46a92f54b0f7afe1f4c0e4204db)

rgw/rgw_rados.cc: prefer ++operator for non-primitive iterators

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
(cherry picked from commit 7086cf9a73f2ec1eb96c0e752beb1b74fca18570)

brag: count the number of mds in fsmap not in mdsmap

this change was introduced in 4e9b953

Fixes: http://tracker.ceph.com/issues/19192
Signed-off-by: Peng Zhang <zphj1987@gmail.com>
(cherry picked from commit 2d25a9c0c760664d3de33ecca0e0272c1031cd46)

osd/PGLog: avoid return by value on ginormous log

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

osd/PGLog: reindex properly on pg log split

When pg_log_t::split_out_child() runs it builds the list, which means the
old indexes are wrong (the point to bad memory), but index() will not
rebuild them because ever since b858e869e78927dccebaa350d246bd74af7f1de9
we won't rebuild them if they are already built.

Fix that by calling unindex() before the split.

Further, the new child log also needs to be indexed.  Fix that too.

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

doc: rgw: make a note abt system users vs normal users

Mention that system users don't behave like normal users in context of
normal rest operations

Fixes: http://tracker.ceph.com/issues/18889
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit a47bcf70c9f51a6601b809cba219f5615b204d34)

rgw: Let the object stat command be shown in the usage

Fixes: http://tracker.ceph.com/issues/19013
Signed-off-by: Pavan Rallabhandi <PRallabhandi@walmartlabs.com>
(cherry picked from commit 0fe76f83d19be098ef54fb0492a376fef3aa9e23)

rgw: Fixes typo in rgw_admin.cc

Issue: http://tracker.ceph.com/issues/19026
Signed-off-by: Ronak Jain <ronakjain@outlook.in>
(cherry picked from commit 58837ef6ce8cbcfc2cac29d5f833b2cf62d8737a)

rgw: set dumpable flag after setuid post ff0e521

ff0e521 resolved the issue for the other daemons but not for rgw since
it calls setuid (via civetweb) after the new code sets PR_SET_DUMPABLE.
Add another prctl call before wait_shutdown.

Fixes: http://tracker.ceph.com/issues/19089
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit bc458d39630b599e0e1ca9fe25ad7455fcffdd10)

Merge pull request #13501 from shinobu-x/wip-18371-kraken

 kraken: ceph-disk: error on _bytes2str

common: Unskew clock

In preparation to deglobalizing CephContext, remove the CephContext*
parameter to ceph_clock_now() and ceph::real_clock::now() that carries
a configurable offset.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit 750ad8340c827d2f8896e1251e45f921dddb9f30)

Conflicts:
src/mon/PGMonitor.cc

mon/PGMonitor: fix force_create_pg

We weren't carefully registering the creating PG.  In
particular, the current osd mappings (acting, up, etc.)
weren't getting filled in, which meant the PG wasn't
(necessarily) mapped to an OSD until the OSDMap updated
and we recalculated mappings.

Fix by sending us through the common code path so that
all fields get updated properly.

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

Conflicts:
src/mon/PGMonitor.cc

mon/PGMonitor: clean up some send_pg_creates cruft

ff1fd4b4b69b52ef5ae734115b1d733aad03b03e already removed most of
this; remove the now useless stub and clean up the unneede con
check.

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

Conflicts:
src/mon/PGMonitor.cc

mon/MonCommands: remove send_pg_creates from cmd table

Forgot this in 6cbdd6750cf330047d52817b9ee9af31a7d318ae

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

Merge pull request #13757 from liewegas/wip-pgp-kraken

qa/tasks: set pgp = pg num on thrashing finish

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

test: Thrasher: do not update pools_to_fix_pgp_num if nothing happens

we should not update pools_to_fix_pgp_num if the pool is not expanded or
the pg_num is not increased due to pgs being created. this prevent us
from fixing the pgp_num after done with thrashing if we actually did
nothing when fixing the pgp_num when thrashing, but we removed the pool
from pools_to_fix_pgp_num after set_pool_pgpnum() returns.

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

test: Thrasher: update pgp_num of all expanded pools if not yet

otherwise wait_until_healthy will fail after timeout as seeing warning
like:

HEALTH_WARN pool cephfs_data pg_num 182 > pgp_num 172

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

Merge pull request #13707 from zmc/wip-openstack-volumes-kraken

qa/suites/ceph-deploy: Drop OpenStack volume count

qa/suites/ceph-deploy: Drop OpenStack volume count

Looks like we only need two per node, since there is only one OSD per
node, and ceph-deploy wants two disks per OSD to account for the
journal.

Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit 87072e277c9ef259c9ee2ae1f761e252aa216713)

Merge pull request #13673 from zmc/wip-openstack-volumes-kraken

qa/suites/{ceph-ansible,rest}: OpenStack volumes

qa/suites/rest: Openstack volumes

Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit 99d942145f4206c00aca30c0bb74f0edc4bac798)

qa/suites/ceph-ansible: Openstack volumes

Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit 964b983bdbd412311bce56184d12d1b6d43c7f28)

Merge pull request #13485 from shinobu-x/wip-18644-kraken

kraken: osd: condition object_info_t encoding on required (not up) features

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

Merge pull request #13641 from zmc/wip-fs-openstack-kraken

qa/suites/fs: Add openstack volume configuration