Merge pull request #37308 from rhcs-dashboard/wip-47349-octopus

octopus: mgr/dashboard: REST API returns 500 when no Content-Type is specified

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>

Merge pull request #37493 from votdev/wip-47695-octopus

octopus: mgr/dashboard: Copy to clipboard does not work in Firefox

Merge pull request #36862 from tspmelo/wip-46091-octopus

octopus: mgr/dashboard: Auto close table column dropdown on click outside

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>

Merge pull request #37549 from smithfarm/wip-preextended-release-note-octopus

octopus: doc/PendingReleaseNotes: mention bluefs_preextend_wal_files

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

Merge pull request #37034 from smithfarm/wip-46520-octopus

octopus: mds: do not submit omap_rm_keys if the dir is the basedir of merge

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

Merge pull request #37020 from Vicente-Cheng/wip-46522-octopus

octopus: mds: fix hang issue when accessing a file under a lost parent directory

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

Merge pull request #37017 from Vicente-Cheng/wip-46516-octopus

octopus: cephfs: client: fix directory inode can not call release callback

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

Merge pull request #36813 from smithfarm/wip-47080-octopus

octopus: messages,mds: Fix decoding of enum types on big-endian systems

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

Merge pull request #36713 from kotreshhr/wip-46947-octopus

octopus: qa: Fix traceback during fs cleanup between tests

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

doc/PendingReleaseNotes: mention bluefs_preextend_wal_files

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

Merge pull request #37452 from callithea/wip-47606-octopus

octopus: mgr/dashboard: log in non-admin users successfully if the telemetry notification is shown

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>

Merge pull request #37217 from callithea/wip-47462-octopus

octopus: mgr: PyModuleRegistry::unregister_client() can run endlessly

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>

Merge pull request #37022 from Vicente-Cheng/wip-46524-octopus

octopus: mds: add request to batch_op before taking auth pins and locks

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

Merge pull request #36970 from Vicente-Cheng/wip-46473-octopus

octopus: mds: make threshold for MDS_TRIM configurable

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

Merge pull request #37401 from smithfarm/wip-47644-octopus

octopus: rpm,deb: drop /etc/sudoers.d/cephadm

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #37349 from smithfarm/wip-47346-octopus

octopus: qa/*/mon/mon-last-epoch-clean.sh: mark osd out instead of down

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

Merge pull request #37348 from smithfarm/wip-47251-octopus

octopus: tools/osdmaptool.cc: add ability to clean_temps

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

Merge pull request #37341 from smithfarm/wip-47466-octopus

octopus: common/admin_socket: always validate the parameters

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>

Merge pull request #37302 from bk201/wip-47192-octopus

octopus: mgr/telemetry: fix device id splitting when anonymizing serial

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Yaarit Hatuka <yaarithatuka@gmail.com>

Merge pull request #37264 from ifed01/wip-ifed-finer-mempool-granularity-octopus

octopus: bluestore: mempool's finer granularity + adding missed structs

Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>

Merge pull request #37257 from smithfarm/wip-47545-octopus

octopus: ceph.spec, debian: add smartmontools, nvme-cli dependencies

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

Merge pull request #37253 from bstillwell/wip-47424-octopus

octopus: compressor: Add a config option to specify Zstd compression level

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

Merge pull request #37412 from jan--f/wip-47649-octopus

octopus: [ceph-volume]: remove unneeded call to get_devices()

Merge pull request #37344 from jan--f/wip-47284-octopus

octopus: ceph-volume: fix journal size argument not work

Merge pull request #36921 from tspmelo/wip-npm-octopus

octopus: mgr/dashboard: Fix npm package's vulnerabilities

Reviewed-by: Stephan Müller <smueller@suse.com>

Merge pull request #37390 from tspmelo/wip-46999-octopus

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>

mgr/dashboard: Copy to clipboard does not work in Firefox

Fixes: https://tracker.ceph.com/issues/47578
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit 8b9d881a63aac8ed3d7d1a7fc80be5e3d3d0b3b1)

Conflicts:
  src/pybind/mgr/dashboard/frontend/src/app/shared/directives/copy2clipboard-button.directive.spec.ts

Merge pull request #37277 from tspmelo/wip-47559-octopus

octopus: mgr/dashboard: Allow editing iSCSI targets with initiators logged-in

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>

mgr/dashboard: check config opt permissions

Getting the user object fails for a non-admin user. Check
the permissions directory if the user is allowed to access the
config options instead.

Fixes: https://tracker.ceph.com/issues/47331
Signed-off-by: Tatjana Dehler <tdehler@suse.com>
(cherry picked from commit 0942b022d0515d53e2e8742851b6aeb60f3379f9)

 Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/shared/components/telemetry-notification/telemetry-notification.component.spec.ts
src/pybind/mgr/dashboard/frontend/src/app/shared/components/telemetry-notification/telemetry-notification.component.ts
- Resolved import conflicts in both files; Resolved TestBed conflict (we have to stick with TestBed.get(); in octopus vs. master
  TestBed.inject(); which is related to Angular 9 being used in master and is not backported to octopus

Merge pull request #37270 from badone/wip-octopus-enable-mgr-client-debug

octopus: qa: Enable debug_client for mgr tests

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

Merge pull request #37422 from tchaikov/octopus-37388

octopus: debian: Add missing Python dependency for ceph-mgr

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>

Merge pull request #37373 from smithfarm/wip-46350-octopus

octopus: bluestore: remove preextended WAL support.

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

Merge pull request #37347 from smithfarm/wip-47091-octopus

octopus: mon: mark pgtemp messages as no_reply more consistenly in preprocess_…

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

Merge pull request #37032 from smithfarm/wip-47351-octopus

octopus: core: include/encoding: Fix encode/decode of float types on big-endian systems

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

Merge pull request #36945 from vumrao/wip-vumrao-47258

octopus: mon/PGMap: add pg count for pools in the ceph df command

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

Merge pull request #36047 from smithfarm/wip-46479-octopus

octopus: mds: send scrub status to ceph-mgr only when scrub is running

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>

Merge pull request #37346 from smithfarm/wip-47460-octopus

octopus: qa/workunits/mon: fixed excessively large pool PG count

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

Merge pull request #37343 from smithfarm/wip-47416-octopus

octopus: rbd: include RADOS namespace in krbd symlinks

Merge pull request #37342 from smithfarm/wip-47082-octopus

octopus: rbd-mirror: peer setup can still race and fail creation of peer

Merge pull request #37340 from smithfarm/wip-47412-octopus

octopus: rgw: urlencode bucket name when forwarding request

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

Merge pull request #37339 from smithfarm/wip-47348-octopus

octopus: rgw: Swift API anonymous access should 401

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

Merge pull request #37338 from smithfarm/wip-47321-octopus

octopus: rgw: replace '+' with "%20" in canonical query string for s3 v4 auth.

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

Merge pull request #37336 from smithfarm/wip-47314-octopus

octopus: rgw: radosgw-admin: period pull command is not always a raw_storage_op

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

Merge pull request #37335 from smithfarm/wip-47245-octopus

octopus: rgw: Add bucket name to bucket stats error logging

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

Merge pull request #37208 from smithfarm/wip-46982-octopus

octopus: test/rbd-mirror: pool watcher registration error might result in race

Merge pull request #37180 from callithea/wip-47410-octopus

octopus: mgr: don't update pending service map epoch on receiving map from mon

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>

Merge pull request #37116 from dillaman/wip-47371-octopus

octopus: librbd: ensure that thread pool lock is held when processing throttled IOs

Merge pull request #36860 from dillaman/wip-46791-octopus

octopus: librbd: handle DNE from immutable-object-cache

Reviewed-by: Mykola Golub <mgolub@mirantis.com>

Merge pull request #36691 from smithfarm/wip-46998-octopus

octopus: rgw: s3: mark bucket encryption as not implemented

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

Merge pull request #37405 from rhcs-dashboard/wip-47619-octopus

octopus: mgr/dashboard: fix perf. issue when listing large amounts of buckets

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>

Merge pull request #37299 from p-se/wip-47547-octopus

octopus: mgr/dashboard: Fix many-to-many issue in host-details Grafana dashboard

Reviewed-by: Ernesto Puertat <epuertat@redhat.com>
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>

os/bluestore: bind attrs to bluestore_cache_meta mempool.

This seems to be a better choice over bluestore_cache_data

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit f4e09fc103454fa8a41b5ffb822639368a89522d)

 Conflicts:
src/os/bluestore/bluestore_types.h
 Caused by the lack of explicit std:: reference in headers - master has
 got this as a part of crimson effort.

os/bluestore: add missing structs to bluestore_cache_other mempool

Fixes: https://tracker.ceph.com/issues/47551
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 4592c5df554190065fa9a994f7b6dc3fed7ea214)

Merge pull request #36991 from s0nea/wip-46407-octopus

octopus: mgr/dashboard: Fix bugs in a unit test and i18n translation

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>

Merge pull request #36875 from tspmelo/wip-46342-octopus

octopus: mgr/dashboard: Remove useless tab in monitoring/alerts datatable details

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>

Merge pull request #36705 from ShyamsundarR/wip-47014-octopus

octopus: mon: store mon updates in ceph context for future MonMap instantiation

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>

Merge pull request #36985 from k0ste/wip-47282-octopus

octopus: prometheus: Properly split the port off IPv6 addresses

Reviewed-by: Jan Fajerski <jfajerski@suse.com>

debian: Add missing Python dependency for ceph-mgr

The file mgr/volumes/fs/operations/pin_util.py imports distutils.util for using
strtobool and thus the python package is required.

Signed-off-by: Johannes M. Scheuermann <joh.scheuer@gmail.com>
(cherry picked from commit 868e708c9e6538684f9b053d44497bba543ea5eb)

Merge pull request #37408 from idryomov/wip-krbd-read-only-override-octopus

octopus: rbd: make common options override krbd-specific options

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

ceph-volume: remove unneeded call to get_devices()

there is no need to probe the device to generate the argparse help
message.

also removing the test on the function as it's not there anymore.

Signed-off-by: Marc Gariepy <gariepy.marc@gmail.com>
Fixes: https://tracker.ceph.com/issues/47502
(cherry picked from commit 5c6f66166a7afad87627032cafdc5c4f11f94eac)

rbd: make common options override krbd-specific options

ceph-csi has added support for passing custom map and unmap options via
mapOptions and unmapOptions storage class parameters.  However, it also
uses --read-only for implementing ROX (ReadOnlyMany) PVs.  If the user
supplies "mapOptions: rw", they will get around the intended read-only
restriction (at least on the block device).

ceph-csi could be patched to use "-o ro", but it actually makes sense
for common options to win over device type-specific equivalents.

Fixes: https://tracker.ceph.com/issues/47625
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit a107c47360ecdb8c09768ca9eab2341100245711)

Conflicts:
src/tools/rbd/action/Kernel.cc [ snapshot quiesce support and
  commit 34f539d8af33 ("rbd: delay parsing of default kernel map
  options") not in octopus ]

mgr/dashboard: fix performance issue when listing large amounts of buckets

Fixes: https://tracker.ceph.com/issues/47543
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit 924368e1d0aebcb0d8f9747589d9048414d33080)

 Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-details/rgw-bucket-details.component.spec.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-details/rgw-bucket-details.component.ts
src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-bucket.service.ts
  - Adapted changes in these files to octopus code.

Merge pull request #36931 from yuriw/wip-yuriw-46529-octopus

octopus: qa/tests: use bionic only for old clients in rados/thrash-old-clients

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>

rpm,deb: drop /etc/sudoers.d/cephadm

Current behavior (without this patch) is:

1. cephadm package installs cephadm at /usr/sbin/cephadm
2. cephadm package installs /etc/sudoers.d/cephadm
3. !!! BUT this file refers to a non-existent executable (/usr/bin/cephadm) !!!
4. the PR that introduced this sudoers file (and this discrepancy) was merged in 2019
5. nobody noticed the discrepancy until now

My conclusion: the file /etc/sudoers.d/cephadm is not needed for cephadm to
work.

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

Conflicts:
debian/rules
- octopus does not mention "rbd-nbd_quiesce"

mgr/dashboard: Landing Page improvements

Fixes: https://tracker.ceph.com/issues/42072
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit d66e684b9ec83cca8a58b0a7b8661c568eb0cf6d)

 Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health-pie/health-pie.component.scss
src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/health/health.component.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/info-card/info-card.component.scss
src/pybind/mgr/dashboard/frontend/src/styles/defaults/_bootstrap-defaults.scss
  this file doesn't exist in octopus, so I moved the code into:
src/pybind/mgr/dashboard/frontend/src/stykes/defaults.scss

mgr/dashboard: Clean custom header styles

Fixes: https://tracker.ceph.com/issues/46417
Signed-off-by: Tiago Melo <tmelo@suse.com>
(cherry picked from commit cf55a768b26e1eded9cd2235c2966b2529a3cafc)

 Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/core/auth/login/login.component.scss
src/pybind/mgr/dashboard/frontend/src/styles/ceph-custom/_basics.scss
src/pybind/mgr/dashboard/frontend/src/styles/ceph-custom/_grid.scss
src/pybind/mgr/dashboard/frontend/src/styles.scss

os/bluestore: remove preextended WAL support.

Fixes: https://tracker.ceph.com/issues/45613
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 7fdbf61860b9d9deaf8734cdd57cf5c8d5f93f81)

Conflicts:
src/common/options.cc
- option "bluefs_preextend_wal_files" has a different default value
  ("false") in octopus (but the whole option is being deleted, so it
  doesn't matter)

mgr/dashboard: Fix npm package's vulnerabilities

Manual update of some npm packages to fix package's vulnerabilities.
This could not have been done by backport since master has a different list
of packages installed.

Fixes: https://tracker.ceph.com/issues/47191
Signed-off-by: Tiago Melo <tmelo@suse.com>

qa/*/mon/mon-last-epoch-clean.sh: mark osd out instead of down

The test should mark the OSD out to check if only "in" OSDs are considered by
the osdmap trimming logic.

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

test/cli/osdmaptool/help.t: add clean-temps

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

doc: add clean-temps to osdmaptool.rst

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

tools/osdmaptool.cc: add ability to clean_temps

This is particularly useful for debugging purposes when clean_temps()
takes abnormally high amount of time due to flaws in crush rules etc.

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

mon: mark pgtemp messages as no_reply more consistently in preprocess_pgtemp

If a message is forwarded, it's conceivable the leader's and peon's evaluation
will disagree about whether the message is useful or not, which could result
in the leader ignoring it and the peon having a dangling forwarded message.
Fix this by marking the op as no_reply whenever ignoring it.

Fixes: https://tracker.ceph.com/issues/46914
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 73a014fc2ca928eb72def31c9e4177063cda421a)

qa/workunits/mon: fixed excessively large pool PG count

Fixes: https://tracker.ceph.com/issues/47405
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 2fa9442dcc7a0448ab7e3588f82f93ca2e55d686)

ceph-volume: fix journal size argument not work

Journal size argument not work in batch prepare
filestore with SSD journal device.

Fixes: https://tracker.ceph.com/issues/41374
Signed-off-by: wanghongxu <wanghongxu@t2cloud.net>
(cherry picked from commit a7077dc661478a762a86b88452c98b30717c0b3c)

qa: add test for krbd symlinks created by udev

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 7ccd2c0dcee175e4c5a03985f43e9259a7e4dbd4)

rbd: include RADOS namespace in krbd symlinks

Fixes: https://tracker.ceph.com/issues/40247
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 0b5c11ff30dbb79690e47d5285f197f677e11bf7)

qa/workunits/rbd: retrieve peer uuid when attempting to delete duplicate

Previously, the peer uuid variable was empty which resulted in the failure
to remove the duplicate peer.

Fixes: https://tracker.ceph.com/issues/47007
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit dec8292a17f4d7543a4e22c293886363c97068b5)

rbd: re-use helper method for adding mirror peer site-name optional

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit af3d4cb3c4bb430e47add07b45e670737e6e77f5)

Merge pull request #37194 from guits/wip-47503-octopus

octopus: ceph-volume: fix simple activate when legacy osd

common/admin_socket: always validate the parameters

this change addresses the regression introduced by
65267d55cd3714c436b188aaa8b2049ad2b21225.

before this change, we reply the client with a failure only if
both the prefix and the arguments do not match.

after this change, both the prefix and argument are checked.

Fixes: https://tracker.ceph.com/issues/47179
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 0039eb2ce612fff21be71254a33883df80a934b7)

ciommon/admin_socket: extract find_matched_hook() out

this function is complicated and isolated enough to be a separated
method.

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

Conflicts:
src/common/admin_socket.cc
- octopus has a "while" block (instead of "if") under the comment
  // make sure one of the registered commands with this prefix validates
  but this is being removed

rgw : add URL encode toward bucket name in forward request

Signed-off-by: caolei <halei15848934852@163.com>
(cherry picked from commit 1e4ec14dd0df4e9053ef630c831c93d392508417)

rgw: Swift API anonymous access should 401

There was a previous patch to fix this but turns out that only fixed it
for the Swift V1 auth. And it actaully broke keystone because it didn't
take into account the idiosyncrasies of multi tenancy. Which resulted in
the incorect behaviour for keystone. Worse, because it didn't take
tenants properly into account keystone ACLs where broken.

This patch reworks, and simplifies the original patch to work for both
auths. It even extends the ThirdPartyAccountApplier to check for an ANON
user and properly scope it to a tenant.

Fixes: https://tracker.ceph.com/issues/46295
Signed-off-by: Matthew Oliver <moliver@suse.com>
(cherry picked from commit 67081098dc2dddd80d52d5acd166e68954cae618)

rgw: replace '+' with "%20" in canonical query string for s3
 v4 auth.

fix https://tracker.ceph.com/issues/45983

Signed-off-by: yuliyang_yewu <yuliyang_yewu@cmss.chinamobile.com>
(cherry picked from commit 9002be34aa8524816708db4f3429bfe8634b776a)

radosgw-admin: period pull command is not always a raw_storage_op

if a --url is given, 'period pull' does not depend on any zone/period
configuration and can be a raw_storage_op. if we get a --remote instead,
we do need to initialize the zone/period configuration to find the
correct endpoint/access keys

Fixes: https://tracker.ceph.com/issues/47217
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 2b44a9d060d33dca9768c758e1908365488aac2a)

rgw: Add bucket name to bucket stats error logging

Signed-off-by: Seena Fallah <seeenafallah@gmail.com>
(cherry picked from commit 1d58bc52774de80689b1f04d46f8f587a09df206)

Merge pull request #37182 from callithea/wip-47414-octopus

octopus: mgr/dashboard: increase Grafana iframe height to avoid scroll bar

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Stephan Müller <smueller@suse.com>

Merge pull request #36899 from callithea/wip-47199-octopus

Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>

Merge pull request #37092 from neha-ojha/wip-47195-octopus

octopus: os/bluestore: enable more flexible bluefs space management by default.

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

Merge pull request #36901 from callithea/wip-47197-octopus

octopus: mgr/dashboard: Disable autocomplete on user form

Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>

Merge pull request #36874 from callithea/wip-46345-octopus

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>

Merge pull request #36872 from callithea/wip-46972-octopus

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>

mgr/dashboard: REST API returns 500 when no Content-Type is specified

Fixes: https://tracker.ceph.com/issues/41060
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit ea031de0908a249b416617a1d9cc806c356520e4)
(cherry picked from commit a5bf74e6a6c7678bbb3689a4b52fe817418da58b)
(cherry picked from commit 9dd629ca7ea5bafe883f48d257386a8c5d32c1c7)

Merge pull request #36870 from callithea/wip-46970-octopus

octopus: mgr/dashboard: Proper format iSCSI target portals

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>

mgr/dashboard: Fix many-to-many issue in host-details dashboard

The labels on one side do not match the labels of the other side, where
a label_replace is used. The fix uses the same label_replace on the
missing side.

Fixes: https://tracker.ceph.com/issues/47334
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit fe64b9d1763ec9dbe78fe73c403929524ab4e253)

Merge pull request #37285 from idryomov/wip-krbd-noudev-octopus

octopus: krbd: optionally skip waiting for udev events

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

mgr/telemetry: fix device id splitting when anonymizing serial

Anonymizing the serial number in the device id string fails in rare
cases where 'vendor' and 'model' are missing from the device id
string. Ideally, device id is generated (in blkdev.cc) as
'vendor_model_serial', in case all fields were successfully retrieved
from the device. In cases where they were not, device id can also be
generated as 'model_serial' or 'serial'. Splitting by '_' fails in the
latter case (since 'serial' is the only element in the string).

In order to anonymize serial numbers in smartctl reports we now rely
on the serial number value as retrieved from the raw smartctl report
itself (as opposed to the one in device id). That's in order to avoid
possible inconsistencies between the serial retrieved from device id and
the one in the report.

Fixes: https://tracker.ceph.com/issues/46977
Signed-off-by: Yaarit Hatuka <yaarit@redhat.com>
(cherry picked from commit e5099a7b58bcf39d80beb908c192c3bf639db1a4)

Merge pull request #37164 from dillaman/wip-47099-octopus

octopus: librbd: using migration abort can result in the loss of data

Reviewed-by: Mykola Golub <mgolub@mirantis.com>

qa: add test for mapping and unmapping from a network namespace

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit d2884adb1542de7a43f82eb899056aa74de95052)