Merge pull request #40329 from anthonyeleven/patch-3

luminous: doc/rados/configuration: fix incorrect default values

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

doc/rados: Fix osd_scrub_during_recovery default value

Since 8dca17c, `osd_scrub_during_recovery` defaults to `false`, but the
documentation was still stating that its default value is `true`.

Fixes: https://tracker.ceph.com/issues/46531
Signed-off-by: Benoît Knecht <bknecht@protonmail.ch>
(cherry picked from commit 535b103d1848f8b5322af0815e1bf163267d7f2a)

Change osd op queue cut off default to high

Discussion: https://www.mail-archive.com/ceph-users@ceph.io/msg00166.html

Signed-off-by: Anthony D'Atri <anthony.datri@gmail.com>
(cherry picked from commit be4582c26a82ff9d6b82ff6178cd78223715bba9)

Merge pull request #37062 from trociny/wip-47364-luminous

luminous: os/bluestore: fix collection_list ordering

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>

Merge pull request #39711 from tchaikov/luminous-pr-39395

luminous: ceph-kvstore-tool: use unique_ptr<> manage the lifecycle of bluestore

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

ceph-kvstore-tool: define a noexcept non-default ctor for Deleter

the deleter of a unique_ptr<> should be value-initialized if we use
`unique_ptr()` for constructing the unique_ptr, but somehow, `Deleter`
does have a user-defined constructor which prevents the compiler from
creating a default constructor which could have made Deleter default
constructible.

in this change, a constructor accepts no arguments is explictly defined
to satisfy the requirements for creating `db` using `unique_ptr<>()`.

this change is not cherry-picked from master, as we don't define a
constructor at all for Deleter, so it is *always* value-initialized.

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

ceph-kvstore-tool: use unique_ptr<> manage the lifecycle of bluestore and db

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

 Conflicts:
src/tools/ceph_kvstore_tool.cc

Merge branch 'CVE-2020-27781-luminous' into HEAD

* CVE-2020-27781-luminous:
  tasks/cephfs/test_volume_client: Add tests for authorize/deauthorize
  pybind/ceph_volume_client: Optionally authorize existing auth-ids
  pybind/ceph_volume_client: Preserve existing caps while authorize/deauthorize auth-id
  pybind/ceph_volume_client: Disallow authorize auth_id
  pybind/ceph_volume_client: Fix PEP-8 SyntaxWarning

Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Kotresh Hiremath Ravishankar <khiremat@redhat.com>

tasks/cephfs/test_volume_client: Add tests for authorize/deauthorize

1. Add testcase for authorizing auth_id which is not added by
   ceph_volume_client
2. Add testcase to test 'allow_existing_id' option
3. Add testcase for deauthorizing auth_id which has got it's caps
   updated out of band

Signed-off-by: Kotresh HR <khiremat@redhat.com>
(cherry picked from commit aa4beb3d993649a696af95cf27150cc460baaf70)

Conflicts:
qa/tasks/cephfs/test_volume_client.py

pybind/ceph_volume_client: Optionally authorize existing auth-ids

Optionally allow authorizing auth-ids not created by ceph_volume_client
via the option 'allow_existing_id'. This can help existing deployers
of manila to disallow/allow authorization of pre-created auth IDs
via a manila driver config that sets 'allow_existing_id' to False/True.

Fixes: https://tracker.ceph.com/issues/48555
Signed-off-by: Kotresh HR <khiremat@redhat.com>
(cherry picked from commit 77b42496e25cbd4af2e80a064ddf26221b53733f)

pybind/ceph_volume_client: Preserve existing caps while authorize/deauthorize auth-id

Authorize/Deauthorize used to overwrite the caps of auth-id which would
end up deleting existing caps. This patch fixes the same by retaining
the existing caps by appending or deleting the new caps as needed.

Fixes: https://tracker.ceph.com/issues/48555
Signed-off-by: Kotresh HR <khiremat@redhat.com>
(cherry picked from commit 47100e528ef77e7e82dc9877424243dc6a7e7533)

pybind/ceph_volume_client: Disallow authorize auth_id

This patch disallow the ceph_volume_client to authorize the auth_id
which is not created by ceph_volume_client. Those auth_ids could be
created by other means for other use cases which should not be modified
by ceph_volume_client.

Fixes: https://tracker.ceph.com/issues/48555
Signed-off-by: Ramana Raja <rraja@redhat.com>
Signed-off-by: Kotresh HR <khiremat@redhat.com>
(cherry picked from commit 3a85d2d04028a323952a31d18cdbefb710be2e2b)

pybind/ceph_volume_client: Fix PEP-8 SyntaxWarning

Signed-off-by: Đặng Minh Dũng <dungdm93@live.com>
(cherry picked from commit 3ce9a89a5a1a2d7fa3d57c597b781a6aece7cbb5)

os/bluestore: fix "end reached" check in collection_list_legacy

To preserve the old bluestore behavior it should compare the
current object with the end using bluestore keys, not oids.

Fixes: https://tracker.ceph.com/issues/48153
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit e63489f249f9ba3bc9cb1806568f860effd8a0b6)

test/objectstore: make store_test also run collection_list_legacy

Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit 08fab7a8a9103f87935c685c0a66d28e361bc9f5)

Conflicts:
src/os/ObjectStore.h,
src/os/bluestore/BlueStore.cc,
src/os/bluestore/BlueStore.h:
add collection_list_legacy with "old" signature
src/test/objectstore/store_test.cc:
"old" collection_list signature,
different collection_list arguments in
SyntheticWorkloadState::shutdown,
missing related code

os/kstore: fix collection_list properly set next if end reached

Previously it was setting it to GMAX (happened when one had end
set to not GMAX and max set to INT_MAX).

Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit 2a67fc5e4cf37912b568ad3046f290023d06eb90)

os/kstore: fix collection_list ordering

It has the same key escaping bug as the blustore has, but we
don't need to workaround it here because kstore is not in
production use.

Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit c1eff9f7812b131c10df245ae92450d70623de2b)

os/bluestore: refactor _collection_list

Make it operate with oids only hiding keys in CollectionListIterator.

Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit f2ccd547d8d0b1518f77a08b61f3c7f509af65d3)

Conflicts:
src/os/bluestore/BlueStore.cc: trivial

osd: add and utilize OSD_FIXED_COLLECTION_LIST feature

If all osds from upacting set have this feature set
the backend can use the new "fixed" collection_list method,
otherwise it fallbacks to the legacy method.

Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit 8f9d335bc7cccb221ca7316ee0c8f22198d0f9ef)

Conflicts:
src/include/ceph_features.h: trivial
src/osd/PGBackend.h: trivial
src/osd/PrimaryLogPG.h: PG::get_min_upacting_features instead of
PeeringState::get_min_upacting_features

os: add collection_list_legacy

which provides the old collection_list behaviour on the bluestore.

Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit fb3c7d062e305d577286e9788e5d7536ad44364d)

Conflicts:
src/os/bluestore/BlueStore.h: trivial (std::vector vs vector)
src/os/bluestore/BlueStore.cc: RWLock instead of std::shared_lock,
c++11 compatibility

os/bluestore: fix collection_list properly set next if end reached

Previously it was setting it to GMAX (happened when one had end
set to not GMAX and max set to INT_MAX).

Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit 46d73a806c90b944c8596ad3d9dae3f5cf78d915)

os/bluestore: make get_key_object work with temp keys

Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit fc3faf34332b9d6b684419256825f07e98f7aa19)

os/bluestore: fix collection_list ordering

Fixes: https://tracker.ceph.com/issues/43174
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit a3d94deddaa5a56ade4a4a8a94d31424238b62ee)

Conflicts:
src/os/bluestore/BlueStore.cc: trivial
src/test/objectstore/store_test.cc:
different signature for collection_list,
apply_transaction instead of queue_transaction,
c++11 compatibility

Merge pull request #35776 from aclamk/wip-bluefs-log-replay-rescue-lum

luminous:os/bluestore: Added rescue procedure for bluefs log replay

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

os/bluestore: Add documentation for large bluefs log recovery

Adds additional paragraph to ceph-bluestore-tool documentation,
describing how to use *special* options --bluefs_replay_recovery
and --bluefs_replay_recovery_disable_compact to recover large
bluefs log.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>

os/bluestore: Add ability to disable compaction

This ability only makes sense as a step that allows to perform fsck before commiting recovered bluefs log.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>

os/bluestore: Added rescue procedure for bluefs log replay

This is a procedure tries to find on disk unreachable extents and pretend they were
already a part of bluefs log. If this gives proper crc, accept it.

Fixes: https://tracker.ceph.com/issues/46195
Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>

Merge pull request #34876 from ifed01/wip-ifed-fix-no_compact_bluefs

luminous: os/bluestore/BlueFS: compact log even when sync_metadata sees no work

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>

Merge pull request #35345 from sidharthanup/wip-xlock-luminous

luminous: mds: take xlock in the order requests start locking

Merge PR #35516 into luminous

* refs/pull/35516/head:
doc: mds-config-ref: update 'mds_log_max_segments' value.

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

Merge pull request #34937 from sidharthanup/mds-modify-active-reqs

luminous: mds: Using begin() and empty() to iterate the xlist

Merge pull request #33294 from batrick/i42160

luminous: cephfs: osdc: objecter ops output does not have useful time information

Merge pull request #33293 from batrick/i42123

luminous: client: no method to handle SEEK_HOLE and SEEK_DATA in lseek

Merge pull request #33292 from batrick/i41857

luminous: client: removing dir reports "not empty" issue due to client side filled wrong dir offset

doc: mds-config-ref: update 'mds_log_max_segments' value.

Also drop options that not exists on code:

* mds_log_max_expiring
* mds_log_eopen_size

Signed-off-by: Konstantin Shalygin <k0ste@k0ste.ru>
(cherry picked from commit 3e72a58698f6c14b46177c58449505ddc35b5277)

mds: take xlock in the order requests start locking

this avoid assertion in MutaionImpl::finish_locking()

Fix: https://tracker.ceph.com/issues/45261
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 2e11a35d5b06312e0b2d0aecd83e8eb882ddf719)

mds: Using begin() and empty() to iterate the xlist
Fixes: https://tracker.ceph.com/issues/44316
The item p pointed to maybe cleaned during the process
 of request_kill previous one.

Signed-off-by: Shen Hang <harryshen18@gmail.com>
(cherry picked from 432ea90)

 Conflicts:
       src/mds/Server.cc

os/bluestore/BlueFS: compact log even when sync_metadata sees no work

It's possible that when sync_metadata() is called there won't be any new
log data to flush because it was already flushed for other reasons (e.g.,
because fsync was called).  However, the log may still be large and in
need of compaction.

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

 Conflicts:
src/os/bluestore/BlueFS.cc
 Some pending release stuff that is now absent at both Luminous and
master.

Merge pull request #34712 from ceph/wip-yuriw-clients-upgrades-luminous

qa/tests: removed 2-workload/devstack-tempest-gate.yaml  tests

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

qa/tests: removed 2-workload/devstack-tempest-gate.yaml  tests

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

Merge pull request #34459 from badone/wip-44984-luminous

luminous: selinux: Allow ceph-mgr access to httpd dir

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

selinux: Allow ceph-mgr access to httpd dir

ceph-mgr loads modules which require read access and this causes a
denial on el7.

Fixes: https://tracker.ceph.com/issues/44216
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit 35a7fc8249337c3c59f0c561632abf578f5d20fc)

Merge pull request #34159 from ceph/wip-yuriw-clients-upgrades-luminous-octopus

qa/tests: client-upgrade-luminous-octopus tests

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

qa/tests: use py3 version of rbd scripts

client.1 is upgraded to octopus, so grab the same version of the rbd
workunit and test tree that will run py3 there.

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

qa/tests: skip python-ceph during upgrade

Octopus is python3-only so there are no python 2 packages to install.

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

qa/tests: client-upgrade-luminous-octopus tests

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

Merge pull request #34149 from yuriw/wip-yuriw-clients-upgrades-luminous-octopus

qa/tests: initial check in for client-upgrade-luminous-octopus

qa/tests: initial check in for client-upgrade-luminous-octopus

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

Merge pull request #33019 from shyukri/wip-40315-luminous

luminous: tests: pybind/test_volume_client: print python version correctly

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

Merge pull request #33195 from tchaikov/wip-luminous-17730

luminous: tool: introduce repair command to ceph-kvstore-tool

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

Merge pull request #33619 from jan--f/wip-44333-luminous

luminous: ceph-volume: strip _dmcrypt suffix in simple scan json output

Merge pull request #33307 from smithfarm/wip-43481-luminous

luminous: rgw: change the "rgw admin status" 'num_shards' output to signed int

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>

Merge pull request #32718 from trociny/wip-43626-luminous

luminous: rbd-mirror: fix 'rbd mirror status' asok command output

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

Merge pull request #32955 from smithfarm/wip-43831-luminous

luminous: librbd: don't call refresh from mirror::GetInfoRequest state machine

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

ceph-volume: strip _dmcrypt suffix in simple scan json output

LUKS encrypted OSDs name their block* files with a _dmcrypt suffix.
activate fails on json files like this. Stripping this suffix in scan
fixes this.

Fixes: https://tracker.ceph.com/issues/43966
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 2ddf76d118d77659c590ea076d34ce9a8e351a86)

Merge pull request #33376 from badone/wip-luminous-upgrade-ceph-ansible-and-move-to-lvm

luminous: qa/ceph-ansible: Upgrade to stable-3.2.30 branch

luminous: qa/ceph-ansible: Upgrade to stable-3.2.30 branch

The move to LVM will allow this test to run on smithis once the
teuthology ceph_ansible task supports that.

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

client/MetaRequest: Add age to MetaRequest dump

Fixes: https://tracker.ceph.com/issues/40821
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 7af024345a8c5ef7d65401713fc73eed9ea9c6bb)

osdc/Objecter: Add age to the ops

Fixes: https://tracker.ceph.com/issues/40821
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit ed7ebb198808ab8fb8f76c1663d514d406572fed)

Conflicts:
        src/osdc/Objecter.cc: changed coarse_mono_clock to mono_clock to
                              make types compatible.

rgw: change the 'rgw admin status" nun_shards output to signed int

Fixes: http://tracker.ceph.com/issues/37645
Signed-off-by: Mark Kogan <mkogan@redhat.com>
(cherry picked from commit 9bdc324cb6667244bd32ee09760f91819383b30d)

common/ceph_time: Use fixed floating-point notation for mono_clock

Fixes: https://tracker.ceph.com/issues/40821
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 9c57c9ffa482be08acad38d863244a873ffbf668)

client: add procession of SEEK_HOLE and SEEK_DATA in lseek.

Fixes: https://tracker.ceph.com/issues/42107
Signed-off-by: Shen Hang <harryshen18@gmail.com>
(cherry picked from commit 394720ca6b731e4698f1dbc7896d294363ecb466)

client:fix a bug in lseek
If offset less than 0,the lseek may cause f->pos less than 0.
So read or write may error.

Signed-off-by: Duan Zhang <zhangduan@inspur.com>
(cherry picked from commit e12ba12cd870187e0640ea9dcb1696b0a2f006a4)

Conflicts:
src/client/Client.cc

Backport of this commit included because
394720ca6b731e4698f1dbc7896d294363ecb466 depends on it.

client: nfs-ganesha with cephfs client, removing dir reports not empty

the problem was due to the cephfs client side wrongly filled the
directory offset from its readdir_cache to nfs-ganesha as its mdcache
dirent cookie

Fixes: http://tracker.ceph.com/issues/40746
Signed-off-by: Peng Xie <peng.hse@xtaotech.com>
(cherry picked from commit 2cce2d4c7d5f3a274c206b4090057760f357ecb0)

ceph-kvstore-tool: rename repair -> destructive-repair

This is shown to corrupt otherwise healthy rocksdb databases.  Rename to
make it clear that it is generally not safe to run and shoud only be used
as a last resort.

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

Conflicts:
PendingReleaseNotes: drop this change as "repair" command did
not exist in luminous before this change.
qa/workunits/cephtool/test_kvstore_tool.sh: drop this change,
as this test was not added before this change.
src/tools/ceph_kvstore_tool.cc: trivial resolution.

doc: introduce repair subcommon of ceph-kvstore-tool

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

tools/ceph_kvstore_tool: do not open rocksdb when repairing it

before this change, the `need_open_db` parameter is passed to the
constructor of BlueStore as `min_alloc_size`. and rocksdb will fail to
repair because Repairer::Run() also tries to acquire the db lock, and it
will fail to do so if the lock file is already acquired by
BlueStore::_mount().

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

common, tool: update kvstore-tool to repair our key/value database

Fixes: http://tracker.ceph.com/issues/17730
Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
(cherry picked from commit 4849ce3cc96eac9fee305927198a6c1b90892687)

Conflicts:
src/kv/LevelDBStore.cc
src/kv/RocksDBStore.cc
src/kv/RocksDBStore.h
src/os/bluestore/BlueStore.cc
src/tools/ceph_kvstore_tool.cc: resolve conflicts.

qa/tasks/cephfs/test_volume_client: print py2 or py3 which the test case runs

Fixes: http://tracker.ceph.com/issues/40184
Signed-off-by: Lianne <liyan.wang@xtaotech.com>
(cherry picked from commit 7c7c7870d38902a0df83a0fdecaa56baad556d82)

12.2.13

Merge pull request #32950 from neha-ojha/wip-pcycle-luminous

luminous: qa: install build dependencies for cfuse_workunit_kernel_untar_build.yaml

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

librbd: don't call refresh from mirror::GetInfoRequest state machine

Fixes: https://tracker.ceph.com/issues/43589
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit da46798ab3f56a639cc7a0b885778e8f75505b53)

Conflicts:
src/librbd/api/Mirror.cc
- C_ImageGetInfo ctor takes only two arguments in nautilus
- nautilus does not have LambdaContext as a class; use FunctionContext
  instead

(cherry picked from commit a1e0d623d5026baec9d1e6ed83201c3fb326fc10)

qa: install build dependencies for cfuse_workunit_kernel_untar_build.yaml

Fixes: https://tracker.ceph.com/issues/36076
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 38ef3da8d27e24576193cbf3f9238f2c5b586c09)

Merge pull request #32796 from jan--f/wip-43759-luminous

luminous: ceph-volume: assume msgrV1 for all branches containing mimic

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

ceph-volume: assume msgrV1 for all branches containing mimic

With nautilus and newer OSDs listen on v1 ports and v2 ports. Assume
that if mimic (or luminous) occur in the branch name, the OSDs are
running msgrv1 only.

Fixes: https://tracker.ceph.com/issues/42791
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit b8754919df61b118200e210e0bfc8d6df0261dfd)

rbd-mirror: fix 'rbd mirror status' asok command output

This was broken by def50d04796, and implicitly fixed during
refactoring in the master (octopus) by adf1486e46c, hence it is a
direct commit to nautilus branch.

Fixes: https://tracker.ceph.com/issues/43429
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit 0a0fcc7da4573e8b3c82440226747a2cc377496b)

Conflicts:
src/tools/rbd_mirror/Mirror.cc (image_deleter section removed after luminous)

Merge pull request #32666 from dzafman/wip-41016-luminous

luminous: osd: Diagnostic logging for upmap cleaning

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

Merge pull request #32523 from iliul/luminous

luminous: os/bluestore: fix assertion in StupidAllocator::get_fragmentation

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

osd: Diagnostic logging for upmap cleaning

Fixes: https://tracker.ceph.com/issues/41016
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit b8746e5e851f0f0d6415d0261fa401ffac51a902)

Merge pull request #32599 from trociny/wip-43499-luminous

luminous: rbd-mirror: make logrotate work

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

Merge pull request #32586 from dzafman/wip-bal4-luminous

luminous: Change default upmap_max_deviation to 5

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

logrotate: also sighup rbd-mirror

Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit 86424fc3c895995d1d45f067c7852e6dce993027)

Conflicts:
src/cephadm/cephadm (does not exist)
src/logrotate.conf (no "pkill" fallback)

rbd-mirror: reopen all contexts logs on SIGHUP

Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit 9ddf111506611a596c713ffe861a41aeda05e7a5)

Conflicts:
src/tools/rbd_mirror/Mirror.cc (std::lock_guard vs Mutex::Locker, ceph_abort_msgf does not exist)
src/tools/rbd_mirror/PoolReplayer.cc (std::lock_guard vs Mutex::Locker, PoolReplayer is not a template)

rbd-mirror: delay local/remote rados initialization until context created

We rely on that if a rados ref is initialized it contains the
valid context.

Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit f3b49191771d2a3a20a7f55a14e0a7482ee96172)

Conflicts:
src/tools/rbd_mirror/PoolReplayer.cc (trivial)

mgr: Change default upmap_max_deviation to 5

Fixes: https://tracker.ceph.com/issues/43312
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit b0a1b758d012dfea40db3feca1a841c96f79defe)

Conflicts:
src/pybind/mgr/balancer/module.py (default isn't in COMMANDS section)
        qa/standalone/mgr/balancer.sh (setting upmap_max_deviations to 1 differ)
        src/test/cli/osdmaptool/missing-argument.t (usage included here)

osdmaptool: Add --upmap-active to simulate active upmap balancing

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 621acf8ce7f48253e9d2189a9a2ee432fa1d3ba1)

Conflicts:
src/test/cli/osdmaptool/help.t (some options not present)
src/tools/osdmaptool.cc (ceph_assert is assert here)
        src/test/cli/osdmaptool/missing-argument.t (usage included here)

doc: Add upmap options to osdmaptool man page and give example

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 184e9d1ae3b5bcc332d5fe3330d46a5cb8fcacd6)

tools: osdmaptool document non-upmap options that were missing

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit e42a6ccb1819be4988e3ed7bd78fcf513f8d1589)

Conflicts:
doc/man/8/osdmaptool.rst (missing other options not part of this)

os/bluestore: fix assertion in StupidAllocator::get_fragmentation

One might face an assertion (assert(intervals <= max_intervals))
in StupidAllocator::get_fragmentation method for clusters created
by early Luminous releases and before. The root cause is that block
volume size wasn't aligned with min_alloc_size and hence we missed
that last fraction interval during max_interval calculation.

Fixes: https://tracker.ceph.com/issues/43297
Note: This was a clean cherry-pick from master, but p2roundup was
introduced since mimic release, use P2ROUNDUP instead

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit a60b2316ce0bed28c468043cff4cab5e61b1a694)
Signed-off-by: Lei Liu <liulei3@360.cn>

Merge pull request #32349 from smithfarm/wip-39474-luminous

luminous: common/util: handle long lines in /proc/cpuinfo

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

Merge pull request #31855 from smithfarm/wip-41730-luminous

luminous: osd/ReplicatedBackend.cc: 1349: FAILED ceph_assert(peer_missing.count(fromshard))

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

Merge pull request #32194 from linuxbox2/luminous-lc-early

luminous: rgw: lc: continue past get_obj_state() failure

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

common/util: handle long lines in /proc/cpuinfo

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

Merge pull request #32267 from ideepika/wip-43325-luminous

luminous: doc: wrong datatype describing crush_rule

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

Merge pull request #32227 from alimaredia/wip-s3-tests-branch-name-refactor-luminous

luminous: update s3-test download code for s3-test tasks

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

Merge pull request #31860 from smithfarm/wip-43013-luminous

luminous: rgw: crypt: permit RGW-AUTO/default with SSE-S3 headers

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

Merge pull request #32034 from cbodley/wip-qa-rgw-swift-luminous

luminous: qa/rgw: add missing force-branch: ceph-luminous for swift tasks

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #32215 from smithfarm/wip-43234-luminous

luminous: tests: radosgw-admin: remove dependency on bunch package

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

luminous: update s3-test download code for s3-test tasks

- Ensure the download code for all tasks running
s3-tests is consistent.
- Simplify download code to only use the config
variable 'force-branch' for the branch being
cloned.
- Make ceph-luminous the force-branch for all
suites using s3-tests.
- Add force-branch to suites running s3readwrite
& s3roundtrip tasks

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

osd/MissingLoc.cc: do not rely on missing_loc_sources only

In 624ade487ea4aeaf988cc1767e0b293f76addd5b, we relied on missing_loc_sources
to check for strays and remove an OSD from missing_loc. However, it is
possible that missing_loc_sources is empty while there are still OSDs
present in missing_loc. Since the aim is to just remove a stray OSD from
missing_loc, we do not need to rely on missing_loc_sources. We still
clean missing_loc_sources if any stray is present in it.

Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 5906a57320f04f57a38eef9588bd16ac3fd4e55d)

Conflicts:
src/osd/MissingLoc.cc
- file does not exist in luminous; made changes manually in src/osd/PG.cc
- adjust ldout for luminous