Merge pull request #50407 from rzarzynski/wip-57696-quincy

quincy: mon/LogMonitor: Fix log last

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

Merge pull request #50406 from rzarzynski/wip-58169-quincy

quincy: src/crush: extra logging to debug CPU burn in test_with_fork()

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

Merge pull request #50405 from rzarzynski/wip-58334-quincy

quincy: osd: mds: suggest clock skew when failing to obtain rotating service keys

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

Merge pull request #49989 from pdvian/wip-58639-quincy

quincy: mon: Fix condition to check for ceph version mismatch

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

Merge pull request #47927 from rzarzynski/wip-55543-quincy

quincy: cmake: re-enable TCMalloc and allocator related cleanups

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

Merge pull request #50388 from zdover23/wip-doc-2023-03-06-backport-50386-to-quincy

quincy: doc/rgw - fix grammar in table in s3.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>

Merge pull request #50125 from rhcs-dashboard/wip-58729-quincy

quincy: mgr/dashboard: fix rbd mirroring daemon health status

Reviewed-by: Pegonzal <NOT@FOUND>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
Reviewed-by: siddharthchanana9 <NOT@FOUND>

Merge pull request #50450 from rhcs-dashboard/wip-57483-quincy

quincy: mgr/dashboard: cephadm dashboard e2e fixes

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>

Merge pull request #50459 from rhcs-dashboard/custom-image-kcli-bootstrap-quincy

quincy: mgr/dashboard: custom image for kcli bootstrap script

Reviewed-by: Pegonzal <NOT@FOUND>

mgr/dashboard: custom image for kcli bootstrap script

the stable branches like quincy pulls from the quay.io/ceph/ceph:v17 to
bootstrap the ceph cluster in test environments. This will cause issues
because the branches are changing constantly but the image is not. So
using the quay.ceph.io repo to bring the cluster in test environment.

Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit be8f1e7f4a81dbf04692446edcc429d93d59e09d)

 Conflicts:
src/pybind/mgr/dashboard/ci/cephadm/bootstrap-cluster.sh
  - Reject the incoming changes and change the image tag to quincy

mgr/dashboard: ignore the rules 400 error in dashboard kcli e2e

Fixes: https://tracker.ceph.com/issues/58722
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit a9634e902afcd2deda490df08080686d4dc110e0)

mgr/dashboard: cephadm dashboard e2e fixes

Fixes: https://tracker.ceph.com/issues/58406
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit fe8d757e135dc26a22077ab73ba1540ae5eb9ca6)

mgr/dashboard: fix Cannot read properties of undefined (reading 'filter')

Fixes: https://tracker.ceph.com/issues/57434
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit a3f601b5e7a4f90712a5fc3e6807c67f2b3ed061)

Merge pull request #50435 from zdover23/wip-doc-2023-03-08-backport-49823-to-quincy

quincy: doc/install: refine index.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>

Merge pull request #50286 from batrick/i58261

quincy: pybind/mgr: use memory temp_store for sqlite3 db

Reviewed-by: Laura Flores <lflores@redhat.com>

Merge pull request #50124 from rhcs-dashboard/wip-58026-quincy

quincy: mgr/dashboard: upgrade to angular 13, bootstrap 5 and jest 28

Reviewed-by: Pegonzal <NOT@FOUND>

doc/install: refine index.rst

Refine English sentences in doc/install/index.rst. Remove adverbial
phrases of time that refer to Nautilus-era features as "new", since that
was four years ago.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit e7669539aceffc0f6f5d61bd140f1c7936d21cf9)

Merge pull request #50432 from zdover23/wip-doc-2023-03-08-backport-50430-to-quincy

quincy: doc/install: update index.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>

doc/install: update index.rst

Update index.rst by making minor grammar improvements. This file was
long overdue for a backport to Reef, Quincy, and Pacific, so this commit
was a good way to pass a human eyeball over the text before making those
backports.

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 82d748ff590cfd31fefddc094b10622d090b054f)

Merge pull request #50306 from idryomov/wip-58647-quincy

quincy: mon/MgrMap: dump last_failure_osd_epoch and active_clients at top level

Reviewed-by: Ramana Raja <rraja@redhat.com>

Merge pull request #50153 from rzarzynski/wip-osd-mon-public_bind_in_bindv-quincy

quincy:  mon, osd: rework the public_bind_addr support. Bring it to OSD

Reviewed-by: Ronen Friedman <rfriedma@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>

Merge pull request #50048 from ifed01/wip-ifed-no-statfs-qui

quincy: os/bluesore: cumulative backport for Onode stuff and more

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

Merge pull request #50400 from zdover23/wip-doc-2023-03-07-backport-50398-to-quincy

quincy: doc/dev: add full stop to sentence in basic-wo

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>

mon/LogMonitor: Fix log last

The ceph log last command outputs all the cluster
logs generated from logm entries at DBG level,
irrespective of their log level. We must output
cluster logs generated from logm according
to the log level specified in the log last command.

Fixes: https://tracker.ceph.com/issues/57340
Signed-off-by: Prashant D <pdhange@redhat.com>
(cherry picked from commit 32e40328fbdece9f6c573c11305ee525823e53c6)

src/crush: extra logging to debug CPU burn in test_with_fork()

related: https://tracker.ceph.com/issues/57782

Signed-off-by: Deepika Upadhyay <deepika@koor.tech>
(cherry picked from commit 79e2902acdcf1c529f73e80449ac067e4bba2675)

osd: mds: suggest clock skew when failing to obtain rotating service keys

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

mgr/dashboard: tslint to eslint migration

Fixes: https://tracker.ceph.com/issues/48258
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit 31a0a4f93baa8c2600d892709841c95bad61e5f4)

 Conflicts:
src/pybind/mgr/dashboard/frontend/package-lock.json
 - Generate a new one
src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-config-modal/rgw-config-modal.component.html
 - Accept the current changes

doc/dev: add full stop to sentence in basic-wo

Add a full stop to a sentence in basic-workflow.rst. I looked at this
document and noticed that it wasn't there, and it was just bugging me.

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 262b115b7554b7931cc174500eb12ac7a5d67513)

Merge pull request #50180 from nbalacha/wip-58763-quincy

quincy: rbd-mirror: fix syncing_percent calculation logic in get_replay_status()

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>

Merge pull request #50159 from idryomov/wip-57396-quincy

quincy: librbd: Fix local rbd mirror journals growing forever

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

Merge pull request #50395 from zdover23/wip-doc-2023-03-06-backport-50382-to-quincy

quincy: doc/rgw: fix caption

doc/rgw: fix caption

Rewrite the third paragraph of the caption to the figure depicting how a
zonegroup works.

Follows https://github.com/ceph/ceph/pull/50316.

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 8fa521466023635436305c1af31501bbbe20e857)

doc/rgw - fix grammar in table in s3.rst

Put an "only" in the correct place. Also, this is a very small change
that will allow me to see if Jenkins is working (it probably isn't).

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 1beab1e8abf59088be628cca972c59202526637d)

Merge pull request #49851 from adk3798/wip-58540-quincy

quincy: mgr/cephadm: support for extra entrypoint args

Reviewed-by: Guillaume Abrioux <gabrioux@redhat.com>

Merge pull request #50378 from zdover23/wip-doc-2023-03-04-backport-50375-to-quincy

quincy: doc/rgw: refine keycloak.rst

Merge pull request #49522 from NitzanMordhai/wip-58315-quincy

quincy: src/valgrind.supp: Adding know leaks unrelated to ceph

Reviewed-by: Laura Flores <lflores@redhat.com>

doc/rgw: refine keycloak.rst

Full line-edit of doc/radosgw/keycloak.rst. Corrected syntax, grammar,
RST, and broken links.

Co-authored-by: Cole Mitchell <cole.mitchell.ceph@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 5706ff1e451e6c7b3c3d40d492985377161b0133)

qa/workunits/rbd-nbd: work around "rbd feature disable" hang

"rbd feature disable" appears to reliably hang if the corresponding
remote request is proxied to rbd-nbd (because rbd-nbd happens to own
the exclusive lock after a series of blkdiscard calls) [1].  Work
around it here by enabling journaling before the image is mapped
and disabling it after the image is unmapped.

Also, don't assert on the output of "rbd journal inspect --verbose"
having a certain number of entries.  This is racy: if the script gets
delayed after the last blkdiscard call for some reason, there may be
fewer entries present in the journal or none at all.

[1] https://tracker.ceph.com/issues/58740

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

test/librbd: add LengthModifiedDiscardJournalAppendEnabled test

Currently nothing triggers the length_modified case in
ImageDiscardRequest::prune_object_extents() in isolation. It's only
triggered in DiscardGranularityJournalAppendEnabled test together with
the prune_required case and a bad refactoring could easily break the
length_modified logic again.

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

Conflicts:
src/test/librbd/io/test_mock_ImageRequest.cc [ commit
  b9a2384cdc43 ("librbd: propagate area down to
  file_to_extents()") not in quincy ]

librbd: Fix local rbd mirror journals growing forever

This commit fixes commit 7ca1bab90f3 by pushing properly aligned
discards back to m_image_extents, if corrected.

If discards are misaligned (off 0, len 4608, gran=4096), they are
corrected properly, but only in object_extents and not in
m_image_extents.

When journal_append_event is triggered it will only append from
m_image_extents and does not now about the alignment fixes. In
commit_io_events_extent it will log a message and return without
completing the io since the larger misaligned area was sent to the journal.
This will in turn break rbd journal mirroring since the local client will wait
indefinately on the commit to be completed, which it never does.

This does not effect rbd-mirror in any way, which may be confusing and
dangerous since it's only rbd-mirror that updates ceph health, and not
the local client.

Setting `rbd_skip_partial_discard = false` under client will restore the
pre 7ca1bab behaviour and thus not trigger the bug with journals growing.
This will set `rbd_discard_granularity_bytes = 0` internally. This
setting is only changed during startup of a client.

Fixes: 7ca1bab90f3db3aaaa4cdbfc1f18e9f5cfbf5568
Fixes: https://tracker.ceph.com/issues/57396
Signed-off-by: Josef Johansson <josef@oderland.se>
(cherry picked from commit 21a26a752843295ff946d1543c2f5f9fac764593)

Conflicts:
src/librbd/io/ImageRequest.cc [ commit b2c88820923e ("librbd:
  return area from extents_to_file()") not in quincy ]
src/test/librbd/io/test_mock_ImageRequest.cc [ commit
  b9a2384cdc43 ("librbd: propagate area down to
  file_to_extents()") not in quincy ]

Merge pull request #50292 from idryomov/wip-58833-quincy

quincy: librbd: call apply_changes() after setting librados_thread_count

Reviewed-by: Christopher Hoffman <choffman@redhat.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>

Merge pull request #50266 from idryomov/wip-58755-quincy

quincy: rbd-mirror: add information about the last snapshot sync to image status

Reviewed-by: Christopher Hoffman <choffman@redhat.com>

Merge pull request #50367 from zdover23/wip-doc-2023-03-03-backport-50364-to-quincy

quincy: doc/cephadm: Redd up compatibility.rst

mgr/cephadm: fix extra container/entrypoint args with spaces

Fixes: https://tracker.ceph.com/issues/57338
Prior, doing extra container args like

- "--cpus"
- "2"

would work fine as the two args would be passed separately and
eventually placed in the final podman/docker run command
with a space between them. However, trying to do something like

- "--cpus 2"

instead would fail, as it would be translated to

--extra-container-args=--cpus 2

causing "2" to be considered its own arg, which cephadm
wouldn't know how to handle. Another way this can cause problems
is listed in the linked tracker. Either way, leaving the spaces
in the args was causing problems, and the simplest way to handle
it seems to be to just split on the original arg on the spaces
into multiple args

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit a161381ba816609b5041d2072e7e6cec39eaa753)

doc/cephadm: docs for extra entrypoint args

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 8ee799e9cc0800fbedc8d9343aa3207bc9fd429e)

mgr/cephadm: support for extra entrypoint args

Args specified in the service spec to be added as
args for the entrypoint when we deploy the daemon

Fixes: https://tracker.ceph.com/issues/57944
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit db8e4462c968e1d29b0688efafad3442abb8779c)

Conflicts:
src/pybind/mgr/cephadm/tests/test_services.py

python-common: add extra_entrypoint_args to service specs

To allow users to set extra args to be passed to
the entrypoint in the podman/docker run command
built by cephadm

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 98f6a9379e2dccbaf599923644b7aaa7200ded1f)

Merge pull request #50144 from guits/wip-58735-quincy

quincy: ceph-volume: do not raise RuntimeError in util.lsblk

Merge pull request #50161 from guits/wip-58785-quincy

quincy: ceph-volume: legacy_encrypted() shouldn't call lsblk() when device is 'tmpfs'

Merge pull request #49865 from adk3798/wip-58176-quincy

quincy: mgr/cephadm: add ingress support for ssl rgw service

Reviewed-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
Reviewed-by: Redouane Kachach <rkachach@redhat.com>

doc/cephadm: Redd up compatibility.rst

Signed-off-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>
(cherry picked from commit d608dec43b84c9a06990458219dda769829e05f8)

Merge pull request #50362 from zdover23/wip-doc-2023-03-03-backport-50354-to-quincy

quincy: doc/rgw: clean zone-sync.svg

doc/rgw: clean zone-sync.svg

Refine zone-sync.svg (fix kerning and use fonts that render properly).

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 064fdc9d9b4ad3393bfb5069d2f97dc622aaf12d)

mgr/cephadm: add ingress support for ssl rgw service

This commit adds support for ssl backend rgw. This allows for full
network encryption.

Fixes: https://tracker.ceph.com/issues/51972
Signed-off-by: Frank Ederveen <frank.ederveen@gmail.com>
(cherry picked from commit ab9d6ea42453225189f3ded8863c00bc55b71189)

Merge pull request #49857 from adk3798/wip-58446-quincy

quincy: mgr/cephadm: make logging refresh metadata to debug logs configurable

Reviewed-by: Redouane Kachach <rkachach@redhat.com>

Merge pull request #49853 from adk3798/wip-58538-quincy

quincy: mgr/cephadm: increase ingress timeout values

Reviewed-by: Redouane Kachach <rkachach@redhat.com>

Merge pull request #50356 from zdover23/wip-doc-2023-03-03-backport-50351-to-quincy

quincy: doc/radosgw: format admonitions

Merge pull request #50090 from mchangir/wip-58599-quincy

quincy: mon: disable snap id allocation for fsmap pools

Reviewed-by: Venky Shankar <vshankar@redhat.com>

Merge pull request #49957 from dparmar18/wip-58604-quincy

quincy: qa/fs/mixed-clients: specify distros for tests

Reviewed-by: Venky Shankar <vshankar@redhat.com>

Merge pull request #49942 from lxbsz/wip-58602

quincy: ceph_fuse: retry the test_dentry_handling if fails

Reviewed-by: Venky Shankar <vshankar@redhat.com>

Merge pull request #49939 from lxbsz/wip-58609

quincy: mds: fix and skip submitting invalid osd request

Reviewed-by: Venky Shankar <vshankar@redhat.com>

Merge pull request #49655 from dparmar18/wip-58253-quincy

quincy: mds/PurgeQueue: don't consider filer_max_purge_ops when _calculate_ops

Reviewed-by: Venky Shankar <vshankar@redhat.com>

Merge pull request #49654 from dparmar18/wip-58348-quincy

quincy: mgr/nfs: handle bad cluster name during info command

Reviewed-by: Venky Shankar <vshankar@redhat.com>

Merge pull request #50151 from neesingh-rh/wip-57970-quincy

quincy: cephfs-top: addition of sort feature and limit option

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>

Merge pull request #49863 from adk3798/wip-58197-quincy

quincy: mgr/cephadm: save host cache data after scheduling daemon action

doc/radosgw: format admonitions

Break up the text of two similar admonitions into three paragraphs (in
each of the two instances). This makes the content of the admonition
much easier to read at a glance.

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 4db68f5711f48b190f0135a3a7a6df8dfcf5abfa)

Merge pull request #49284 from adk3798/wip-58147-quincy

quincy: mgr/cephadm: some master -> main cleanup

Reviewed-by: Redouane Kachach <rkachach@redhat.com>

Merge pull request #50336 from zdover23/wip-doc-2023-03-02-backport-50335-to-quincy

quincy: doc/cephadm: update cephadm compatability and stability page

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>

doc/cephadm: update cephadm compatability and stability page

This page is very out of date. This commit probably doesn't
cover everything there is to say about stability and compatability
in cephadm, but it at least gets it noticeably closer to reality

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 383f46aa79e7a6f5571405a352ad023983560625)

Merge pull request #50331 from zdover23/wip-doc-2023-03-02-backport-50316-to-quincy

quincy: doc/rgw: improve diagram caption

doc/rgw: improve diagram caption

Improve the syntax and semantics of the caption of the diagram
"Replication of Object Data Between Zones" in doc/radosgw/multisite.rst.

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit e8aa50e240141949e2cf91c3b216808f4e055887)

Merge pull request #50241 from cbodley/wip-58768

quincy: cls/rgw: remove index entry after cancelling last racing delete op

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>

Merge pull request #50240 from cbodley/wip-58772

quincy: rgw: Fix segfault due to concurrent socket use at timeout

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>

Merge pull request #50239 from cbodley/wip-58770

quincy: rgw/beast: StreamIO remembers connection errors for graceful shutdown

Reviewed-by: Shilpa Jagannath <smanjara@redhat.com>

Merge pull request #49689 from joscollin/wip-58409-quincy

quincy: doc: document the relevance of mds_namespace mount option

Merge pull request #50304 from idryomov/wip-qa-workunits-windows-ownership-quincy

quincy: CODEOWNERS: assign qa/workunits/windows to RBD

Reviewed-by: Lucian Petrut <lpetrut@cloudbasesolutions.com>

mon/MgrMap: dump last_failure_osd_epoch and active_clients at top level

Currently last_failure_osd_epoch and active_clients are dumped in the
always_on_modules dictionary in "ceph mgr dump" output.  This goes back
to when these fields were added in commits f2986a4400bb ("mon/MgrMonitor:
blacklist previous instance") and df507cde8d71 ("mgr: forward RADOS
client instances for potential blacklist") but is wrong as these fields
have nothing to do with always-on modules.

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

Conflicts:
PendingReleaseNotes [ moved to >=17.2.6 section ]

CODEOWNERS: assign qa/workunits/windows to RBD

Assume ownership of qa/workunits/windows.  Despite the generic name,
currently it has just rbd-wnbd tests.

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

Merge pull request #50297 from zdover23/wip-doc-2023-02-28-backport-50295-to-quincy

quincy: doc/radosgw: s/zone group/zonegroup/g et alia

mgr/dashboard: rgw encryption modal and host component cleanup

along with some additional cleanups

Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit c31f699bd78d54b8cdab52e78bec3044c99ce4d7)

mgr/dashboard: update jest to 28

Fixes: https://tracker.ceph.com/issues/57972
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit 2fc1390ab87c9a4b37a2e5e99b56dd6e14c37446)

Conflicts:
     src/pybind/mgr/dashboard/frontend/package.json
 - Accept the incoming changes
     src/pybind/mgr/dashboard/frontend/package-lock.json
 - Regenerate a new lock file

mgr/dashboard: migrate to bootstrap 5

Fixes: https://tracker.ceph.com/issues/57867
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit 8ffb74f7f1d59260901e751f6556996d5f8d60f3)

Conflicts:
   - src/pybind/mgr/dashboard/frontend/cypress/integration/block/mirroring.e2e-spec.ts
  Accept the current change (because the PR that introduced the change
is not in quincy)
   - package-lock.json
  Generate a new package-lock.json

mgr/dashboard: Simplified silence-form matchers list

This commit removes unmeaning icons on the matchers-list component, and
now only displays the information/content needed when viewing and editing
matchers.

Fixes: https://tracker.ceph.com/issues/42306
Signed-off-by: Bryan Montalvan <bmontalv@redhat.com>
(cherry picked from commit fcb47be5eedb5d7d1dd8504a76124093dbd5b702)

mgr/dashboard: update angular 13

https://blog.angular.io/angular-v13-is-now-available-cce66f7bc296

Fixes: https://tracker.ceph.com/issues/57866
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit bee2825edf4151127b454df69e8310806380ad76)

Conflicts:
  - src/pybind/mgr/dashboard/frontend/package.json
Accept the incoming changes
  - src/pybind/mgr/dashboard/frontend/package-lock.json
Generate a new lock file

Merge pull request #50231 from rhcs-dashboard/node-14-quincy

quincy: cmake: bump node version to 14

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>

doc/radosgw: s/zone group/zonegroup/g et alia

s/zone group/zonegroup/ where simple greps failed to find instances of
"zone group" that were spread across two lines; break a paragraph into
two paragraphs so that each paragraph has a thematic idea of its own.

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit d1f2e9f3a6837f2b19acaabfb3261849d547d5f8)

Merge pull request #50293 from zdover23/wip-doc-2023-02-28-backport-50276-to-quincy

quincy: doc/rgw: caption a diagram

doc/rgw: caption a diagram

Add an explanation of a diagram that shows how object data is replicated
between zones within a zonegroup.

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit ce2bd7cb2603c479c17ac18b9277b903a02bb06a)

Merge pull request #49883 from petrutlucian94/quincy_rbd_wnbd_test

quincy: qa/workunits/windows: backport rbd-wnbd tests

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>

Merge pull request #50287 from zdover23/wip-doc-2023-02-28-backport-50274-to-quincy

quincy: doc/rgw: remove "tertiary", link to procedure

Merge pull request #49856 from adk3798/wip-58447-quincy

quincy: mgr/cephadm: improve offline host handling, mostly around upgrade

Reviewed-by: Redouane Kachach <rkachach@redhat.com>

Merge pull request #49862 from adk3798/wip-58201-quincy

quincy: mgr/cephadm: specify ports for iscsi

Reviewed-by: Teoman ONAY <tonay@ibm.com>

librbd: call apply_changes() after setting librados_thread_count

Otherwise the setting doesn't take effect.  While at it, replace
home-grown stringify() with standard to_string().

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

Merge pull request #50277 from zdover23/wip-doc-2023-02-27-backport-50264-to-quincy

quincy: doc/radosgw: multisite - edit "functional changes"

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>

doc/rgw: remove "tertiary", link to procedure

Remove the term "tertiary zone" and replace it with "second secondary
zone" (because there is no such thing as a tertiary zone). Link to the
procedure for creating a secondary zone in a place where such a link is
helpful to the reader.

Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 8e273199d09a670578b0c1076bc18dbd113d42dd)

pybind/mgr: use memory temp_store for sqlite3 db

It appears some situations require sqlite3 to open a temporary database
to execute the old database dump.

Fixes: https://tracker.ceph.com/issues/57851
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 8d853cc4990dc4dbccdc916115b0b30e0ac9dc19)

Merge pull request #50271 from zdover23/wip-doc-2023-02-27-backport-50267-to-quincy

quincy: doc/glossary: Add "zone" to glossary.rst

Merge pull request #50234 from rhcs-dashboard/wip-58830-quincy

quincy: mgr/dashboard: fix constraints.txt

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>

doc/radosgw: multisite - edit "functional changes"

Improve the wording of the section "Functional Changes from Infernalis"
in doc/radosgw/multisite.rst.

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 35edcc17c96010328e8ee85648a3b74887aef7b9)

doc/glossary: Add "zone" to glossary.rst

Add "Zone" to the glossary.

Co-authored-by: Anthony D'Atri <anthony.datri@gmail.com>
Signed-off-by: Zac Dover <zac.dover@proton.me>
(cherry picked from commit 495eb97fd7fa3d53d27ad8d7df993df80b708ca1)