]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
2 years agodoc/glossary: s/an/each/ where it's needed 49596/head
Zac Dover [Thu, 29 Dec 2022 04:42:25 +0000 (14:42 +1000)]
doc/glossary: s/an/each/ where it's needed

s/an/each/ in accordance with the suggestion made by Anthony D'Atri
here: https://github.com/ceph/ceph/pull/49590/files#r1058390357

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

2 years agoMerge pull request #49590 from zdover23/wip-doc-2022-12-28-backport-49584-to-pacific
zdover23 [Thu, 29 Dec 2022 04:15:01 +0000 (14:15 +1000)]
Merge pull request #49590 from zdover23/wip-doc-2022-12-28-backport-49584-to-pacific

pacific: doc/glossary: clean OSD id-related entries

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
2 years agoMerge pull request #49592 from zdover23/wip-doc-2022-12-28-backport-49587-to-pacific
zdover23 [Wed, 28 Dec 2022 13:44:57 +0000 (23:44 +1000)]
Merge pull request #49592 from zdover23/wip-doc-2022-12-28-backport-49587-to-pacific

pacific: doc/rbd: s/wuold/would/ in rados-rbd-cmds.rst

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
2 years agodoc/rbd: s/wuold/would/ in rados-rbd-cmds.rst 49592/head
Zac Dover [Tue, 27 Dec 2022 12:28:49 +0000 (22:28 +1000)]
doc/rbd: s/wuold/would/ in rados-rbd-cmds.rst

s/wuold/would/ in rados-rbd-cmds.rst.

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

2 years agodoc/glossary: clean OSD id-related entries 49590/head
Zac Dover [Tue, 27 Dec 2022 05:28:31 +0000 (15:28 +1000)]
doc/glossary: clean OSD id-related entries

Tidy up the sentences under the headwords "OSD fsid", "OSD id", and "OSD
uuid".

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

2 years agoMerge pull request #49470 from lxbsz/wip-58293
Brad Hubbard [Tue, 27 Dec 2022 21:55:05 +0000 (07:55 +1000)]
Merge pull request #49470 from lxbsz/wip-58293

pacific: qa: switch to https protocol for repos' server

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
2 years agoMerge pull request #49312 from kamoltat/wip-ksirivad-backport-pacific-bz-2121452
Kamoltat Sirivadhna [Tue, 27 Dec 2022 04:19:27 +0000 (23:19 -0500)]
Merge pull request #49312 from kamoltat/wip-ksirivad-backport-pacific-bz-2121452

pacific: mon/Elector: Change how we handle removed_ranks and notify_rank_removed()
Reviewed by: Gregory Farnum <gfarnum@redhat.com>

2 years agoqa: remove unused 'teuthology.orchestra.run' in xfstests_dev.py 49470/head
Xiubo Li [Thu, 1 Dec 2022 09:42:03 +0000 (17:42 +0800)]
qa: remove unused 'teuthology.orchestra.run' in xfstests_dev.py

Fixes: https://tracker.ceph.com/issues/58133
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit 496bf662eff07dc95c8b3ff64c9753519884c1e5)

2 years agoqa: switch to https protocol for ffsb and xfstests-dev repos
Xiubo Li [Tue, 29 Nov 2022 13:24:21 +0000 (21:24 +0800)]
qa: switch to https protocol for ffsb and xfstests-dev repos

Since the git protocol is not reachable any more, just switch it
to https.

Fixes: https://tracker.ceph.com/issues/58133
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit 4c97a9e469cfe060531be12988ff087ad2ff36c5)

Conflicts:
- qa/workunits/suites/ffsb.sh: no need to fix

2 years agoqa: switch to https protocol for repos' server
Xiubo Li [Wed, 23 Nov 2022 05:24:38 +0000 (13:24 +0800)]
qa: switch to https protocol for repos' server

Since the git:// is not reachable any more and have switch to
https://.

The git archive does not support the https protocol, so we couldn't
user the git archive to retrieve the tar ball any more, will split
this into 3 steps:

1, clone the whole ceph repo
2, checkout the commit/tag/branch
3, then change directory to qa/workunits/.

Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit 89177d65988c56324916de8394089b6e4b38aab7)
Conflicts:
- qa/workunits/fs/snaps/snaptest-git-ceph.sh: minor conflicts
- qa/machine_types/schedule_subset.sh: no need to fix this
- qa/tasks/cephfs/xfstests_dev.py: minor confilicts

2 years agoMerge pull request #49575 from zdover23/wip-doc-2022-12-26-backport-49573-to-pacific
zdover23 [Mon, 26 Dec 2022 06:47:14 +0000 (16:47 +1000)]
Merge pull request #49575 from zdover23/wip-doc-2022-12-26-backport-49573-to-pacific

pacific: doc/glossary: disambiguate clauses

Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>
2 years agodoc/glossary: disambiguate clauses 49575/head
Zac Dover [Mon, 26 Dec 2022 06:05:32 +0000 (16:05 +1000)]
doc/glossary: disambiguate clauses

Disambiguate various clauses, most of which contain forms of the verb
"to require".

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

2 years agomon/Monitor.cc: notify_new_monmap() skips removal of non-exist rank 49312/head
Kamoltat [Wed, 14 Dec 2022 19:54:00 +0000 (19:54 +0000)]
mon/Monitor.cc: notify_new_monmap() skips removal of non-exist rank

Problem:
In RHCS the user can choose to manually remove a monitor rank
before shutting the monitor down. Causing inconsistency in monmap.
for example we remove mon.a from the monmap, there is a short period
where mon.a is still operational and will try to remove itself from
monmap but we will run into an assertion in
ConnectionTracker::notify_ranks_removed().

Solution:
In Monitor::notify_new_monmap() we prevent the func
from going into removing our own rank, or
ranks that doesn't exists in monmap.

FYI: this is an RHCS problem only, in ODF,
we never remove a monitor from monmap
before shutting it down.

Fixes: https://tracker.ceph.com/issues/58049
Signed-off-by: Kamoltat <ksirivad@redhat.com>
(cherry picked from commit 924e7ec92bbaa6efd0ef816c1cb101ff7972616c)

2 years agoqa/standalone/mon: remove --mon-inital-members setting
Kamoltat [Wed, 30 Nov 2022 22:51:02 +0000 (22:51 +0000)]
qa/standalone/mon: remove --mon-inital-members setting

Problem:

--mon-initial-members does nothing but causes monmap
to populate ``removed_ranks`` because the way we start
monitors in standalone tests uses ``run_mon $dir $id ..``
on each mon. Regardless of --mon-initial-members=a,b,c, if
we set --mon-host=$MONA,$MONB,$MONC (which we do every single tests),
everytime we run a monitor (e.g.,run mon.b) it will pre-build
our monmap with

```
noname-a=mon.noname-a addrs v2:127.0.0.1:7127/0,
b=mon.b addrs v2:127.0.0.1:7128/0,
noname-c=mon.noname-c addrs v2:127.0.0.1:7129/0,
```

Now, with --mon-initial-members=a,b,c we are letting
monmap know that we should have initial members name:
a,b,c, which we only have `b` as a match. So what
``MonMap::set_initial_members`` do is that it will
remove noname-a and noname-c which will
populate `removed_ranks`.

Solution:

remove all instances of --mon-initial-members
in the standalone test as it has no impact on
the nature of the tests themselves.

Fixes: https://tracker.ceph.com/issues/58132
Signed-off-by: Kamoltat <ksirivad@redhat.com>
(cherry picked from commit e1c095dcf0a019bff01d2d8c819e5f95604c8da5)

2 years agomon: clear connection score during update & add sanity check live/dead connection...
Kamoltat [Fri, 11 Nov 2022 22:56:46 +0000 (22:56 +0000)]
mon: clear connection score during update & add sanity check live/dead connection report

When upgrading the monitors (include booting up),
we check if `peer_tracker` is dirty or not. If
so, we clear it. Added some functions in `Elector` and
`ConnectionTracker` class to
check for clean `peer_tracker`.

Moreover, there could be some cases where due
to startup weirdness or abnormal circumstances,
we might get a report from our own rank. Therefore,
it doesn't hurt to add a sanity check in
`ConnectionTracker::report_live_connection` and
`ConnectionTracker::report_dead_connection`.

Fixes: https://tracker.ceph.com/issues/58049
Signed-off-by: Kamoltat <ksirivad@redhat.com>
(cherry picked from commit 25ce77c7984587f457eba9bd06e416ef06f4e1c7)

2 years agomon/Elector & ConnectionTracker: reset peer_tracker.rank
Kamoltat [Fri, 4 Nov 2022 02:02:49 +0000 (02:02 +0000)]
mon/Elector & ConnectionTracker: reset peer_tracker.rank

In `notify_clear_peer_state()` we another
mechanism in reseting our `peer_tracker.rank`
to match our own monitor.rank.

This is added so there is a way for us
to recover from a scenrio where `peer_tracker.rank`
is messed up from adjusting the ranks or removing
ranks.

`notifiy_clear_peer_state()` can be triggered
by using the command:

`ceph connection scores reset`

Also in `clear_peer_reports`, besides
reassigning my_reports to an empty object,
we also have to make `my_reports` = `rank`
from `peer_tracker`, such that we don't get
-1 as a rank in my_reports.

Fixes: https://tracker.ceph.com/issues/58049
Signed-off-by: Kamoltat <ksirivad@redhat.com>
(cherry picked from commit 55cf717a3070d10b6b02af33a66d6ad0acbba0f6)

2 years agomon: change how we handle removed_ranks
Kamoltat [Wed, 2 Nov 2022 01:59:52 +0000 (01:59 +0000)]
mon: change how we handle removed_ranks

when a new monitor joins, there is a chance that
it will recive a monmap that recently removed
a monitor and ``removed_rank`` will have some
content in it. A new monitor that joins
should never remove rank in peer_tracker but
rather call ``notify_clear_peer_state()``
to reset the `peer_report`.

In the case when it is a monitor that
has joined quorum before and is only 1
epoch behind the newest monmap provided
by the probe_replied monitor. We can
actually remove and adjust ranks in `peer_report`
since we are sure that if there is any content in
removed_ranks, then it has to be because in the
next epoch we are removing a rank, since every
update of an epoch we always clear the removed_ranks.

There is no point in keeping the content
of ``removed_ranks`` after monmap gets updated
to the epoch.

Therefore, clear ``removed_ranks`` every update.

When there is discontinuity between
monmaps for more 1 epoch or the new monitor never joined quorum before,
we always reset `peer_tracker`.

Moreover, beneficial for monitor log to also log
which rank has been removed at the current time
of the monmap. So add removed_ranks to `print_summary`
and `dump` in MonMap.cc.

Fixes: https://tracker.ceph.com/issues/58049
Signed-off-by: Kamoltat <ksirivad@redhat.com>
(cherry picked from commit 04402576fecf1cb97f515b5dc42261a77837e400)

Conflicts:
src/mon/Monitor.cc - trivial fix

2 years agomon/ConnectionTracker.cc: Improve notify_rank_removed()
Kamoltat [Wed, 2 Nov 2022 01:46:14 +0000 (01:46 +0000)]
mon/ConnectionTracker.cc: Improve notify_rank_removed()

PROBLEM:

In `ConnectionTracker::receive_peer_report`
we loop through ranks which is bad when
there is `notify_rank_removed` before this and
the ranks are not adjusted yet. When we rely
on the rank in certain scenarios, we end up
with extra peer_report copy which we don't
want.

SOLUTION:

In `ConnectionTracker::receive_peer_report`
instead of passing `report.rank` in the function
`ConnectionTracker::reports`, we pass `i.first`
instead so that trim old ranks properly.

We also added a assert in notify_rank_removed(),
comparing expected rank provided by the monmap
against the rank that we adjust ourself to as
a sanity check.

We edited test/mon/test_election.cc
to reflect the changes made in notify_rank_removed().

Fixes: https://tracker.ceph.com/issues/58049
Signed-off-by: Kamoltat <ksirivad@redhat.com>
(cherry picked from commit 7c52ccec76bc7e7f9678cc9d78d106e17f9ad8f7)

Conflicts:
src/mon/Elector.cc - trivial fix
src/mon/Elector.h - trivial fix

2 years agomon: Init Loggings for ConnectionTracker.cc & Added more loggings to ElectionLogic...
Kamoltat [Thu, 13 Oct 2022 13:24:14 +0000 (13:24 +0000)]
mon: Init Loggings for ConnectionTracker.cc & Added more loggings to ElectionLogic & Elector

Problem:

Currently there are not ConnectionTracker logs,
therefore it is really hard to debug

Solution:

Enable loggings for most functions in ConnectionTracker.cc
Most of the logs are in debug_mon = 30.

Also Added some logs in Elector and ElectionLogic
so that debugging will be easier in the future.

Fixes: https://tracker.ceph.com/issues/58049
Signed-off-by: Kamoltat <ksirivad@redhat.com>
(cherry picked from commit 58f2bd47623b2ac08ae3bdb9931e68128978a88e)

2 years agoMerge pull request #49444 from kamoltat/wip-ksirivad-pacific-49259
Kamoltat Sirivadhna [Mon, 26 Dec 2022 05:07:25 +0000 (00:07 -0500)]
Merge pull request #49444 from kamoltat/wip-ksirivad-pacific-49259

pacific: mon/Elector.cc: Compress peer >= rank_size sanity check into send_peer_ping
Reviewed by: Gregory Farnum <gfarnum@redhat.com>

2 years agoMerge pull request #49571 from zdover23/wip-doc-2022-12-26-backport-49569-to-pacific
Anthony D'Atri [Sun, 25 Dec 2022 23:07:24 +0000 (18:07 -0500)]
Merge pull request #49571 from zdover23/wip-doc-2022-12-26-backport-49569-to-pacific

pacific: doc/start: update documenting-ceph.rst

2 years agodoc/start: update documenting-ceph.rst 49571/head
Zac Dover [Sun, 25 Dec 2022 21:11:30 +0000 (07:11 +1000)]
doc/start: update documenting-ceph.rst

Add an article to documenting-ceph.rst in order to troubleshoot a
backporting problem.

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

2 years agoMerge pull request #49566 from zdover23/wip-doc-2022-12-25-backport-49564-to-pacific
colemitchell [Sun, 25 Dec 2022 03:03:21 +0000 (22:03 -0500)]
Merge pull request #49566 from zdover23/wip-doc-2022-12-25-backport-49564-to-pacific

pacific: doc/start: improve documenting-ceph.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
2 years agodoc/start: improve documenting-ceph.rst 49566/head
Zac Dover [Sun, 25 Dec 2022 02:08:25 +0000 (12:08 +1000)]
doc/start: improve documenting-ceph.rst

Improve the grammar and the pragmatics of the "TOC and Hyperlinks"
section of start/documenting-ceph.rst.

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

2 years agoMerge pull request #49562 from zdover23/wip-doc-2022-12-24-backport-49558-to-pacific
colemitchell [Sat, 24 Dec 2022 07:07:54 +0000 (02:07 -0500)]
Merge pull request #49562 from zdover23/wip-doc-2022-12-24-backport-49558-to-pacific

pacific: doc/rados: remove prompt from php.ini line

Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>
2 years agodoc/rados: remove prompt from php.ini line 49562/head
Zac Dover [Sat, 24 Dec 2022 06:11:20 +0000 (16:11 +1000)]
doc/rados: remove prompt from php.ini line

Remove an unselectable prompt from the beginning of a line meant to be
included in the "php.ini" file.

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

2 years agoMerge pull request #49560 from zdover23/wip-doc-2022-12-24-backport-49557-to-pacific
zdover23 [Sat, 24 Dec 2022 06:41:33 +0000 (16:41 +1000)]
Merge pull request #49560 from zdover23/wip-doc-2022-12-24-backport-49557-to-pacific

pacific: doc/rados: correct typo in python.rst

Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>
2 years agodoc/rados: correct typo in python.rst 49560/head
Zac Dover [Sat, 24 Dec 2022 05:51:10 +0000 (15:51 +1000)]
doc/rados: correct typo in python.rst

s/you Ceph configuration file/your Ceph configuration file/

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

2 years agoMerge pull request #49543 from idryomov/wip-rbd-qemu-xfstests-patchup-pacific
Ilya Dryomov [Fri, 23 Dec 2022 13:24:54 +0000 (14:24 +0100)]
Merge pull request #49543 from idryomov/wip-rbd-qemu-xfstests-patchup-pacific

pacific: qa: switch back to git protocol for qemu-xfstests

Reviewed-by: Christopher Hoffman <choffman@redhat.com>
2 years agoMerge pull request #49542 from rhcs-dashboard/pacific-tox-fixes
Pere Diaz Bou [Fri, 23 Dec 2022 10:42:26 +0000 (11:42 +0100)]
Merge pull request #49542 from rhcs-dashboard/pacific-tox-fixes

pacific: pybind/mgr: tox and test fixes

Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2 years agoqa: switch to curl for qemu-xfstests 49543/head
Ilya Dryomov [Thu, 22 Dec 2022 15:32:44 +0000 (16:32 +0100)]
qa: switch to curl for qemu-xfstests

This is a follow-up for commit 631899ffeb84 ("qa: switch back to git
protocol for qemu-xfstests"), needed for the same "ancient execution
environment" reason.

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

2 years agoMerge pull request #49552 from zdover23/wip-doc-2022-12-23-backport-49550-to-pacific
colemitchell [Fri, 23 Dec 2022 01:05:27 +0000 (20:05 -0500)]
Merge pull request #49552 from zdover23/wip-doc-2022-12-23-backport-49550-to-pacific

pacific: doc/rados: add prompts to librados-intro.rst

Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>
2 years agodoc/rados: add prompts to librados-intro.rst 49552/head
Zac Dover [Fri, 23 Dec 2022 00:47:27 +0000 (10:47 +1000)]
doc/rados: add prompts to librados-intro.rst

Add unselectable prompts to doc/rados/api/librados-intro.rst.

https://tracker.ceph.com/issues/57108

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

2 years agopybind/mgr/tox.ini: add commas in "modules" variable 49542/head
Kefu Chai [Sun, 18 Dec 2022 12:18:44 +0000 (20:18 +0800)]
pybind/mgr/tox.ini: add commas in "modules" variable

since tox v4.0.13, it parses the variables differently, so the newlines
in a variable are passed right to the command referencing it. so we now
have failure like:
```
flake8: commands[0] /home/jenkins-build/build/workspace/ceph-pull-requests/src/pybind/mgr> flake8 --config=tox.ini alerts
flake8: commands[1] /home/jenkins-build/build/workspace/ceph-pull-requests/src/pybind/mgr> balancer
flake8: exit 2 (0.00 seconds) /home/jenkins-build/build/workspace/ceph-pull-requests/src/pybind/mgr> balancer
flake8: FAIL ✖ in 3.33 seconds
```
so we have to add comma as line continuation separator to address
this problem.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit 0cc649f029d40555e1d059e3de3739be7b9ae197)

 Conflicts:
src/pybind/mgr/tox.ini

pacific has different modules in flake8's tox file which conflicted with the main branch.

2 years agoqa: switch back to git protocol for qemu-xfstests
Ilya Dryomov [Mon, 19 Dec 2022 17:54:08 +0000 (18:54 +0100)]
qa: switch back to git protocol for qemu-xfstests

As noted in commit 89177d65988c ("qa: switch to https protocol for
repos' server"), git.ceph.com mirror doesn't make git:// available
anymore.  However, run_xfstests-obsolete.sh has "obsolete" in its
name for a reason -- due to an ancient execution environment, git://
is the only viable option:

  $ git clone https://git.ceph.com/xfstests-dev.git
  Cloning into 'xfstests-dev'...
  error: gnutls_handshake() failed: A TLS fatal alert has been received. while accessing https://git.ceph.com/xfstests-dev.git/info/refs
  fatal: HTTP request failed

Ditch git.ceph.com mirror for now.

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

Conflicts:
qa/run_xfstests-obsolete.sh [ commit 89177d65988c ("qa: switch
  to https protocol for repos' server") not in pacific ]

2 years agopybind/mgr: s/setup(self)/setup_method(self)/
Kefu Chai [Sun, 18 Dec 2022 12:16:02 +0000 (20:16 +0800)]
pybind/mgr: s/setup(self)/setup_method(self)/

avoid pytest warnings like:

4: pg_autoscaler/tests/test_cal_final_pg_target.py::TestPgAutoscaler::test_even_pools_one_meta_three_bulk
4:   /home/kefu/dev/ceph/src/pybind/mgr/.tox/py3/lib/python3.10/site-packages/_pytest/fixtures.py:900: PytestRemovedIn8Warning: Support for nose tests is deprecated and will be removed in a future release.
4:   pg_autoscaler/tests/test_cal_final_pg_target.py::TestPgAutoscaler::test_even_pools_one_meta_three_bulk is using nose-specific method: `setup(self)`
4:   To remove this warning, rename it to `setup_method(self)`
4:   See docs: https://docs.pytest.org/en/stable/deprecations.html#support-for-tests-written-for-nose
4:     fixture_result = next(generator)

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit 5878b9486acd7831c6c795453c7f2a9a138261c8)

2 years agopybind/mgr/prometheus: avoid using distutils
Kefu Chai [Sun, 18 Dec 2022 12:15:06 +0000 (20:15 +0800)]
pybind/mgr/prometheus: avoid using distutils

to silence warnings like:

4: prometheus/module.py:35
4:   /var/ssd/ceph/src/pybind/mgr/prometheus/module.py:35: DeprecationWarning: distutils Version classes are deprecated. Use packaging.version instead.
4:     v = StrictVersion(cherrypy.__version__)

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit 9f0ee9798563efe4ce9759f5d8c0ca6aa47a6838)

2 years agoMerge pull request #49536 from zdover23/wip-doc-2022-12-22-backport-49529-to-pacific
Anthony D'Atri [Wed, 21 Dec 2022 22:14:19 +0000 (17:14 -0500)]
Merge pull request #49536 from zdover23/wip-doc-2022-12-22-backport-49529-to-pacific

pacific: doc/rados: add prompts to bluestore-config-ref.rst

2 years agodoc/rados: add prompts to bluestore-config-ref.rst 49536/head
Zac Dover [Wed, 21 Dec 2022 07:41:04 +0000 (17:41 +1000)]
doc/rados: add prompts to bluestore-config-ref.rst

Add unselectable prompts to
doc/rados/configuration/bluestore-config-ref.rst.

https://tracker.ceph.com/issues/57108

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

2 years agoMerge pull request #49431 from aclamk/wip-aclamk-harmonize-bluefs-log-pacific
Yuri Weinstein [Wed, 21 Dec 2022 18:26:21 +0000 (10:26 -0800)]
Merge pull request #49431 from aclamk/wip-aclamk-harmonize-bluefs-log-pacific

pacific: os/bluestore: BlueFS: harmonize log read and writes modes

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
2 years agoMerge pull request #49516 from zdover23/wip-doc-2022-12-20-backport-49513-to-pacific
colemitchell [Mon, 19 Dec 2022 18:32:05 +0000 (13:32 -0500)]
Merge pull request #49516 from zdover23/wip-doc-2022-12-20-backport-49513-to-pacific

pacific: doc/rados: add prompts to auth-config-ref.rst

Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>
2 years agodoc/rados: add prompts to auth-config-ref.rst 49516/head
Zac Dover [Mon, 19 Dec 2022 18:00:59 +0000 (04:00 +1000)]
doc/rados: add prompts to auth-config-ref.rst

Add unselectable prompts to doc/rados/configuration/auth-config-ref.rst.

https://tracker.ceph.com/issues/57108

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

2 years agoMerge pull request #49512 from zdover23/wip-doc-2022-12-20-backport-49510-to-pacific
colemitchell [Mon, 19 Dec 2022 17:57:45 +0000 (12:57 -0500)]
Merge pull request #49512 from zdover23/wip-doc-2022-12-20-backport-49510-to-pacific

pacific: doc/rados: add prompts to msgr2.rst

Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>
2 years agodoc/rados: add prompts to msgr2.rst 49512/head
Zac Dover [Mon, 19 Dec 2022 17:41:22 +0000 (03:41 +1000)]
doc/rados: add prompts to msgr2.rst

Add unselectable prompts to doc/rados/configuration/msgr2.rst.

https://tracker.ceph.com/issues/57108

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

2 years agoMerge pull request #49493 from zdover23/wip-doc-2022-12-19-backport-49491-to-pacific
colemitchell [Sun, 18 Dec 2022 18:31:05 +0000 (13:31 -0500)]
Merge pull request #49493 from zdover23/wip-doc-2022-12-19-backport-49491-to-pacific

pacific: doc/rados: add prompts to ceph-conf.rst

Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>
2 years agodoc/rados: add prompts to ceph-conf.rst 49493/head
Zac Dover [Sun, 18 Dec 2022 15:29:33 +0000 (01:29 +1000)]
doc/rados: add prompts to ceph-conf.rst

Add unselectable prompts to doc/rados/ceph-conf.rst.

https://tracker.ceph.com/issues/57108

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

2 years agoMerge pull request #49485 from zdover23/wip-doc-2022-12-17-backport-49394-to-pacific
zdover23 [Fri, 16 Dec 2022 16:24:14 +0000 (02:24 +1000)]
Merge pull request #49485 from zdover23/wip-doc-2022-12-17-backport-49394-to-pacific

pacific: doc/rbd: refine rbd-snapshot.rst

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
2 years agodoc/rbd: refine rbd-snapshot.rst 49485/head
Zac Dover [Fri, 9 Dec 2022 17:42:14 +0000 (03:42 +1000)]
doc/rbd: refine rbd-snapshot.rst

Refine the text in rbd-snapshot.rst

https://tracker.ceph.com/issues/57001

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

2 years agoMerge pull request #49469 from zdover23/wip-doc-2022-12-16-backport-49467-to-pacific
colemitchell [Fri, 16 Dec 2022 01:45:10 +0000 (20:45 -0500)]
Merge pull request #49469 from zdover23/wip-doc-2022-12-16-backport-49467-to-pacific

pacific: doc/rados: clarify default EC pool from simplest

Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>
2 years agodoc/rados: clarify default EC pool from simplest 49469/head
Zac Dover [Fri, 16 Dec 2022 01:07:51 +0000 (11:07 +1000)]
doc/rados: clarify default EC pool from simplest

Distinguish between the default erasure-coded pool (k=2 m=2) and the
simplest erasure-coded pool (k=2 m=1).

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

2 years agoMerge pull request #48663 from ivancich/wip-fix-old-shard-pacific
Yuri Weinstein [Thu, 15 Dec 2022 15:19:00 +0000 (07:19 -0800)]
Merge pull request #48663 from ivancich/wip-fix-old-shard-pacific

pacific: rgw: address bug where object puts could write to decommissioned shard

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2 years agoMerge pull request #49451 from zdover23/wip-doc-2022-12-15-backport-49445-to-pacific
colemitchell [Thu, 15 Dec 2022 05:02:02 +0000 (00:02 -0500)]
Merge pull request #49451 from zdover23/wip-doc-2022-12-15-backport-49445-to-pacific

pacific: doc/cephfs: fix "e.g." in posix.rst

Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>
2 years agodoc/cephfs: fix "e.g." in posix.rst 49451/head
Zac Dover [Thu, 15 Dec 2022 04:08:20 +0000 (14:08 +1000)]
doc/cephfs: fix "e.g." in posix.rst

Remove "e.g." and replace it with "for example".

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

2 years agoMerge pull request #49449 from zdover23/wip-doc-2022-12-15-backport-49441-to-pacific
colemitchell [Thu, 15 Dec 2022 04:52:16 +0000 (23:52 -0500)]
Merge pull request #49449 from zdover23/wip-doc-2022-12-15-backport-49441-to-pacific

pacific: doc/cephfs - s/yet to here/yet to hear/ posix.rst

Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>
2 years agoMerge pull request #49447 from zdover23/wip-doc-2022-12-15-backport-49442-to-pacific
colemitchell [Thu, 15 Dec 2022 04:50:13 +0000 (23:50 -0500)]
Merge pull request #49447 from zdover23/wip-doc-2022-12-15-backport-49442-to-pacific

pacific: doc/cephfs: s/all of there are/all of these are/

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
2 years agodoc/cephfs - s/yet to here/yet to hear/ posix.rst 49449/head
Zac Dover [Wed, 14 Dec 2022 20:51:29 +0000 (06:51 +1000)]
doc/cephfs - s/yet to here/yet to hear/ posix.rst

Correct "yet to here" to "yet to hear" in posix.rst.

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

2 years agodoc/cephfs: s/all of there are/all of these are/ 49447/head
Zac Dover [Wed, 14 Dec 2022 21:07:44 +0000 (07:07 +1000)]
doc/cephfs: s/all of there are/all of these are/

s/all of there are/all of these are/ in posix.rst.

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

2 years agoMerge pull request #49412 from kamoltat/wip-ksirivad-revert-47340
Laura Flores [Wed, 14 Dec 2022 22:30:23 +0000 (16:30 -0600)]
Merge pull request #49412 from kamoltat/wip-ksirivad-revert-47340

2 years agomon/Elector.cc: Compress peer >= rank_size sanity check into send_peer_ping 49444/head
Kamoltat [Mon, 5 Dec 2022 18:46:11 +0000 (18:46 +0000)]
mon/Elector.cc: Compress peer >= rank_size sanity check into send_peer_ping

Problem:

Currently, https://github.com/ceph/ceph/pull/44993
failed to completely fix:

https://tracker.ceph.com/issues/50089

There are certain code paths such as

Elector::handle_ping → Elector::begin_peer_ping →
Elector::send_peer_ping.

that when a monitor is removed before shutdown in
Cephadm it can hit the assert failure.

Solution:

Therefore, we have to enforce sanity checks on
all code paths.

We do this by compressing the `peer >= rank_size`
sanity check into `send_peer_ping`. We also make
`send_peer_ping` return true/false

caller of `send_peer_ping` would drop itself if
recieves a `false`.

Fixes: https://tracker.ceph.com/issues/58155
Signed-off-by: Kamoltat <ksirivad@redhat.com>
(cherry picked from commit 27d499f8854fb5e73b103635ef227bbfdff3afb4)

Conflicts:
src/mon/Elector.cc - change ssize() to size()

2 years agoMerge pull request #49429 from rhcs-dashboard/wip-58268-pacific
Avan [Wed, 14 Dec 2022 18:16:49 +0000 (23:46 +0530)]
Merge pull request #49429 from rhcs-dashboard/wip-58268-pacific

pacific: mgr/dashboard: allow Origin url for CORS if present in config

Reviewed-by: Pegonzal <NOT@FOUND>
2 years agoos/bluestore: BlueFS: harmonize log read and writes modes 49431/head
Adam Kupczyk [Wed, 14 Dec 2022 16:43:47 +0000 (16:43 +0000)]
os/bluestore: BlueFS: harmonize log read and writes modes

BlueFS log has always been written in non-buffered mode.
Reading of it depends on bluefs_buffered_io option.
It is strongly suspected that this causes some wierd problems.

Possibly fixes: https://tracker.ceph.com/issues/54019

It is targetted directly to pacific.
Ultimately same fix will go to all versions.
This problem is severe, but happens very infrequently, mostly on contenerized
environments. We have a lot of problems in tracker that we suspect are caused by this.
To find them, we have "problem-detection" PR #49198 in main.
Then we will apply equivalent solution there too.

Signed-off-by: Adam Kupczyk <akupczyk@redhat.com>
2 years agomgr/dashboard: allow Origin for CORS if present in config `cross_origin_url` 49429/head
Avan Thakkar [Thu, 8 Dec 2022 11:16:21 +0000 (16:46 +0530)]
mgr/dashboard: allow Origin for CORS if present in config `cross_origin_url`

Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit 04cfd23122248a7262a29003b9e5b4c18edbfb5b)

2 years agoMerge pull request #49425 from zdover23/wip-doc-2022-12-14-backport-49421-to-pacific
colemitchell [Wed, 14 Dec 2022 07:13:45 +0000 (02:13 -0500)]
Merge pull request #49425 from zdover23/wip-doc-2022-12-14-backport-49421-to-pacific

pacific: doc/glossary: add "FQDN" entry

Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>
2 years agodoc/glossary: add "FQDN" entry 49425/head
Zac Dover [Wed, 14 Dec 2022 05:59:51 +0000 (15:59 +1000)]
doc/glossary: add "FQDN" entry

Add "FQDN" definition to doc/glossary.rst.

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

2 years agoRevert "qa/standalone/mon: init mon-stretched-cluster.sh" 49412/head
Kamoltat [Tue, 13 Dec 2022 14:31:51 +0000 (14:31 +0000)]
Revert "qa/standalone/mon: init mon-stretched-cluster.sh"

This commit belongs to https://github.com/ceph/ceph/pull/48803 which
introduced https://tracker.ceph.com/issues/58239.
Therefore, we are reverting it.

This reverts commit 025d3fa6b928d6fe2a794011e81db0c52d0c9cc0.

Fixes: https://tracker.ceph.com/issues/58239
Signed-off-by: Kamoltat <ksirivad@redhat.com>
2 years agoRevert "mon/OSDMonitor: Added extra check before mon.go_recovery_stretch_mode()"
Kamoltat [Tue, 13 Dec 2022 14:29:12 +0000 (14:29 +0000)]
Revert "mon/OSDMonitor: Added extra check before mon.go_recovery_stretch_mode()"

This commit belongs to https://github.com/ceph/ceph/pull/48803 which
introduced https://tracker.ceph.com/issues/58239.
Therefore, we are reverting it.

This reverts commit 94dc97005bf6406d13c3fd5a3664a1fe2f7efec9.

Fixes: https://tracker.ceph.com/issues/58239
Signed-off-by: Kamoltat <ksirivad@redhat.com>
2 years agoMerge pull request #49398 from zdover23/wip-doc-2022-12-13-backport-49396-to-pacific
colemitchell [Tue, 13 Dec 2022 04:56:33 +0000 (23:56 -0500)]
Merge pull request #49398 from zdover23/wip-doc-2022-12-13-backport-49396-to-pacific

pacific: doc/glossary - add "secrets"

Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>
2 years agodoc/glossary - add "secrets" 49398/head
Zac Dover [Tue, 13 Dec 2022 04:39:35 +0000 (14:39 +1000)]
doc/glossary - add "secrets"

Add "secrets" to doc/glossary.rst.

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

2 years agoMerge PR #47891 into pacific
Patrick Donnelly [Mon, 12 Dec 2022 20:52:00 +0000 (15:52 -0500)]
Merge PR #47891 into pacific

* refs/pull/47891/head:
qa: add a upgrade test suite from nautilus and test the new getvxattr op
qa: make filesystem to be compatible with nautilus for blocklist
qa: make filesystem to be compatible with nautilus when creating pools
test/libcephfs: add newops test case
client: fail the request if the peer MDS doesn't support getvxattr op
mds: add CEPHFS_FEATURE_OP_GETVXATTR feature bit support
mds: notify clients if the session has already opened
Rename/re-symlink whitelist_*.yaml

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2 years agoMerge pull request #49363 from adk3798/tox-upgrade-fixes-pacific
Adam King [Mon, 12 Dec 2022 17:35:37 +0000 (12:35 -0500)]
Merge pull request #49363 from adk3798/tox-upgrade-fixes-pacific

pacific: pybind/mgr: fixup after upgrading tox versions

Reviewed-by: Laura Flores <lflores@redhat.com>
2 years agoMerge pull request #49385 from zdover23/wip-doc-2022-12-12-backport-49383-to-pacific
colemitchell [Mon, 12 Dec 2022 04:37:25 +0000 (23:37 -0500)]
Merge pull request #49385 from zdover23/wip-doc-2022-12-12-backport-49383-to-pacific

pacific: doc/rados: add prompts to user-management.rst

Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>
2 years agodoc/rados: add prompts to user-management.rst 49385/head
Zac Dover [Mon, 12 Dec 2022 04:22:40 +0000 (14:22 +1000)]
doc/rados: add prompts to user-management.rst

Add unselectable prompts to doc/rados/operations/user-management.rst.

https://tracker.ceph.com/issues/57108

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

2 years agoMerge pull request #49378 from zdover23/wip-doc-2022-12-11-backport-49376-to-pacific
colemitchell [Sat, 10 Dec 2022 21:36:18 +0000 (16:36 -0500)]
Merge pull request #49378 from zdover23/wip-doc-2022-12-11-backport-49376-to-pacific

pacific: doc/install: update clone-source.rst

Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>
2 years agodoc/install: update clone-source.rst 49378/head
Zac Dover [Sat, 10 Dec 2022 20:25:13 +0000 (06:25 +1000)]
doc/install: update clone-source.rst

Beef up clone-source.rst. Repair semantics. Add internal references. Fix
a broken "git submodule foreach git clean -fdx" command.

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

2 years agoqa: teuthology branch reference "master" -> "main" 49363/head
Adam King [Sat, 10 Dec 2022 16:35:27 +0000 (11:35 -0500)]
qa: teuthology branch reference "master" -> "main"

We dropped "master" branch for "main" a while back.
No reason I can see not to reflect that here.

Signed-off-by: Adam King <adking@redhat.com>
2 years agoqa: drop import-tasks test
Adam King [Sat, 10 Dec 2022 16:33:58 +0000 (11:33 -0500)]
qa: drop import-tasks test

We had already dropped this in main and quincy
and it's causing failures in pacific now.

Signed-off-by: Adam King <adking@redhat.com>
2 years agomgr/pybind: fix mypy arg parsing
Adam King [Fri, 9 Dec 2022 16:10:36 +0000 (11:10 -0500)]
mgr/pybind: fix mypy arg parsing

On the new tox version it is treating each line as a new command
so it will do something like "mypy --config-file=../../mypy.ini"
as one command and then "-m balancer" as a totally separate command.
The first one immediately fails as it doesn't include any modules
to test. Adding backslashes to the ends of the lines gets it to
handle the lines as one long command

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

Conflicts:
src/pybind/mgr/requirements-required.txt

2 years agopybind/mgr: fix tox autopep8 args
Adam King [Fri, 9 Dec 2022 16:25:01 +0000 (11:25 -0500)]
pybind/mgr: fix tox autopep8 args

Similar to mypy, we now need a backslash to signal
a newline doesn't mean to start a new command

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

Conflicts:
src/pybind/mgr/tox.ini

2 years agoMerge pull request #49372 from zdover23/wip-doc-2022-12-10-backport-49368-to-pacific
colemitchell [Sat, 10 Dec 2022 04:56:20 +0000 (23:56 -0500)]
Merge pull request #49372 from zdover23/wip-doc-2022-12-10-backport-49368-to-pacific

pacific: doc/rados: add prompts to upmap.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
2 years agoMerge pull request #49370 from zdover23/wip-doc-2022-12-10-backport-49367-to-pacific
colemitchell [Sat, 10 Dec 2022 04:54:06 +0000 (23:54 -0500)]
Merge pull request #49370 from zdover23/wip-doc-2022-12-10-backport-49367-to-pacific

pacific: doc/rados: add prompts to stretch-mode.rst

Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
2 years agodoc/rados: add prompts to upmap.rst 49372/head
Zac Dover [Sat, 10 Dec 2022 04:34:46 +0000 (14:34 +1000)]
doc/rados: add prompts to upmap.rst

Add unselectable prompts to doc/rados/operations/upmap.rst.

https://tracker.ceph.com/issues/57108

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

2 years agodoc/rados: add prompts to stretch-mode.rst 49370/head
Zac Dover [Sat, 10 Dec 2022 04:15:45 +0000 (14:15 +1000)]
doc/rados: add prompts to stretch-mode.rst

Add unselectable prompts to doc/rados/operations/stretch-mode.rst.

https://tracker.ceph.com/issues/57108

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

2 years agoMerge pull request #49366 from zdover23/wip-doc-2022-12-10-backport-49364-to-pacific
colemitchell [Sat, 10 Dec 2022 03:57:19 +0000 (22:57 -0500)]
Merge pull request #49366 from zdover23/wip-doc-2022-12-10-backport-49364-to-pacific

pacific: doc/rbd: remove typo and ill-formed command

Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>
2 years agodoc/rbd: remove typo and ill-formed command 49366/head
Zac Dover [Sat, 10 Dec 2022 03:20:17 +0000 (13:20 +1000)]
doc/rbd: remove typo and ill-formed command

Ingest Ilya Dryomov's comments here https://github.com/ceph/ceph/pull/49340/files#r1044365857

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

2 years agoMerge pull request #48070 from pdvian/wip-scrub-msg
Yuri Weinstein [Fri, 9 Dec 2022 18:54:24 +0000 (10:54 -0800)]
Merge pull request #48070 from pdvian/wip-scrub-msg

pacific: osd/scrub: Reintroduce scrub starts message

Reviewed-by: Laura Flores <lflores@redhat.com>
2 years agoqa: add pytest to deps of py3 env
Kefu Chai [Thu, 8 Dec 2022 14:34:38 +0000 (22:34 +0800)]
qa: add pytest to deps of py3 env

otherwise it is mising when running test, and we'd have following
failure:

py3: exit 2 (0.00 seconds) /home/jenkins-build/build/workspace/ceph-pull-requests/qa> pytest --assert=plain test_import.py

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit 127dd54db84afb90ae20fdc7c4ecdcbf789aec25)

Conflicts:
qa/tox.ini

2 years agoMerge pull request #49170 from aclamk/wip-58102-pacific
Yuri Weinstein [Fri, 9 Dec 2022 18:52:25 +0000 (10:52 -0800)]
Merge pull request #49170 from aclamk/wip-58102-pacific

pacific: [bluestore] Improve deferred write decision

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
2 years agoMerge pull request #48915 from ifed01/wip-ifed-bluefs-op-inc-pac
Yuri Weinstein [Fri, 9 Dec 2022 18:51:35 +0000 (10:51 -0800)]
Merge pull request #48915 from ifed01/wip-ifed-bluefs-op-inc-pac

pacific: os/bluestore: incremental update mode for bluefs log

Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
2 years agoMerge pull request #48803 from kamoltat/wip-ksirivad-backport-pacific-47340
Yuri Weinstein [Fri, 9 Dec 2022 18:50:24 +0000 (10:50 -0800)]
Merge pull request #48803 from kamoltat/wip-ksirivad-backport-pacific-47340

pacific:mon/OSDMonitor: Added extra check before mon.go_recovery_stretch_mode()

Reviewed-by: Neha Ojha <nojha@redhat.com>
2 years agoMerge pull request #48255 from k0ste/wip-57258-pacific
Yuri Weinstein [Fri, 9 Dec 2022 18:49:47 +0000 (10:49 -0800)]
Merge pull request #48255 from k0ste/wip-57258-pacific

pacific:  msg: reset ProtocolV2's frame assembler in appropriate thread

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2 years agoMerge pull request #48254 from k0ste/wip-56722-pacific
Yuri Weinstein [Fri, 9 Dec 2022 18:49:15 +0000 (10:49 -0800)]
Merge pull request #48254 from k0ste/wip-56722-pacific

pacific: msg: fix deadlock when handling existing but closed v2 connection

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2 years agoqa: set locale to C.UTF-8 in tox.ini
Kefu Chai [Thu, 8 Dec 2022 06:42:42 +0000 (14:42 +0800)]
qa: set locale to C.UTF-8 in tox.ini

as ansible is using UTF-8 encoded characters in the file names, so,
to avoid failures like:

  File "/home/jenkins-build/build/workspace/ceph-pull-requests/qa/.tox/py3/lib/python3.10/site-packages/pip/_internal/utils/unpacking.py", line 217, in untar_file
    with open(path, "wb") as destfp:
UnicodeEncodeError: 'latin-1' codec can't encode characters in position 137-140: ordinal not in range(256)

we have to set a locale which is able to handle UTF-8.

see also https://github.com/ceph/teuthology/pull/1671

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit bc2b551e9fc94697aee42de34de03d0a2a819850)

2 years agopybind/mgr: drop cython from requires
Kefu Chai [Thu, 8 Dec 2022 10:25:20 +0000 (18:25 +0800)]
pybind/mgr: drop cython from requires

cython is not required for running tox commands.

this should address the test failure like:

ROOT: will run in automatically provisioned tox, host /home/jenkins-build/build/workspace/ceph-pull-requests/build/mgr-virtualenv/bin/python3.10 is missing [requires (has)]: cython

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit c9cc795d02682f550098e517a01cf2adc7502906)

Conflicts:
src/pybind/mgr/tox.ini

2 years agocephadm: drop cython from requires
Kefu Chai [Thu, 8 Dec 2022 10:23:32 +0000 (18:23 +0800)]
cephadm: drop cython from requires

cython is not required for launching the tox environment.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit 8b20bb8ca2b8f110a030a2f3fffd849faa125948)

2 years ago*: s/whitelist_externals/allowlist_externals/
Kefu Chai [Thu, 8 Dec 2022 06:53:33 +0000 (14:53 +0800)]
*: s/whitelist_externals/allowlist_externals/

as allowlist_externals was introduced in
tox v4.0. see
https://github.com/tox-dev/tox/commit/5e33fda1a40ffb4973de3d607a572891eb3cb2d2 , but
this option was backported to 3.18 as an alias of whitelist_externals, so we don't need
to specify the minversion to 4.0 in this change.

as we started using tox 4.0 and up (v4.0.2 in specific). tox complains
and fails like:

alerts-lint: failed with promtool is not allowed, use allowlist_externals to allow it
  alerts-lint: FAIL code 1 (9.25 seconds)

see https://tox.wiki/en/latest/faq.html#tox-4-removed-tox-ini-keys
and https://tox.wiki/en/latest/config.html#allowlist_externals

it'd be nice to use a more inclusive language also. so, in this change,
s/whitelist_externals/allowlist_externals/ in all tox.ini in this
project.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit 34e2e33870b1ce381f9cd3eead882daa7b640b81)

2 years agoMerge pull request #49195 from idryomov/wip-57066-pacific
Yuri Weinstein [Fri, 9 Dec 2022 15:41:30 +0000 (07:41 -0800)]
Merge pull request #49195 from idryomov/wip-57066-pacific

pacific: cls/rbd: update last_read in group::snap_list

Reviewed-by: Mykola Golub <mgolub@suse.com>
2 years agoMerge pull request #49357 from zdover23/wip-doc-2022-12-09-backport-49342-to-pacific
colemitchell [Fri, 9 Dec 2022 07:11:02 +0000 (02:11 -0500)]
Merge pull request #49357 from zdover23/wip-doc-2022-12-09-backport-49342-to-pacific

pacific: doc/rbd: refine "Removing a Block Device Image"

Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>
2 years agodoc/rbd: refine "Removing a Block Device Image" 49357/head
Zac Dover [Fri, 9 Dec 2022 01:16:27 +0000 (11:16 +1000)]
doc/rbd: refine "Removing a Block Device Image"

Refine and add unselectable prompts to "Removing a Block Device Image"
in doc/rbd/rados-rbd-cmds.

https://tracker.ceph.com/issues/57001

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

2 years agoMerge pull request #49355 from zdover23/wip-doc-2022-12-09-backport-49343-to-pacific
colemitchell [Fri, 9 Dec 2022 07:04:42 +0000 (02:04 -0500)]
Merge pull request #49355 from zdover23/wip-doc-2022-12-09-backport-49343-to-pacific

pacific: doc/rbd: refine "Restoring a Block Device Image"

Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>
2 years agoMerge pull request #49353 from zdover23/wip-doc-2022-12-09-backport-49341-to-pacific
colemitchell [Fri, 9 Dec 2022 07:02:26 +0000 (02:02 -0500)]
Merge pull request #49353 from zdover23/wip-doc-2022-12-09-backport-49341-to-pacific

pacific: doc/rbd: refine "Resizing a Block Device Image"

Reviewed-by: Cole Mitchell <cole.mitchell@gmail.com>