]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Venky Shankar [Sat, 16 Apr 2022 15:24:44 +0000 (20:54 +0530)]
qa: adjust for old snapshot counts during comparison
This is pacific only commit since in master, the snap-schedule module
uses vfs-ceph backed libcephsqlite which seems to preserve the
snapshots stats (created_count, etc..) on ceph-mgr restarts. Pacific
uses in-memory db (serialized to a RADOS object) which seems to
reset these stats when ceph-mgr is restarted.
Also, remove `db_count' assert check as it doesn't make sense.
Signed-off-by: Venky Shankar <vshankar@redhat.com>
Milind Changire [Thu, 24 Feb 2022 06:20:18 +0000 (11:50 +0530)]
qa: test snap_schedule with mgr restart
Scheduled snaps should follow the created schedule even across mgr
restart.
Signed-off-by: Milind Changire <mchangir@redhat.com>
(cherry picked from commit
ac6c7240d3b69de128ae2c5f4c172f12e313fd27 )
Milind Changire [Mon, 28 Feb 2022 06:26:09 +0000 (11:56 +0530)]
mgr/snap_schedule: restart old schedules
Old schedules were not picked up from database when mgr was restarted.
Restart old schedules on mgr restart.
Fixes: https://tracker.ceph.com/issues/54052
Signed-off-by: Milind Changire <mchangir@redhat.com>
(cherry picked from commit
dca7fdb600932d712280dd91a4eb63a17a8800e3 )
Milind Changire [Mon, 28 Feb 2022 06:22:26 +0000 (11:52 +0530)]
mgr/util: add function to list all fs names
Signed-off-by: Milind Changire <mchangir@redhat.com>
(cherry picked from commit
24915c8ee926c27e335f6e94341770ee8088e721 )
Milind Changire [Wed, 24 Nov 2021 08:06:30 +0000 (13:36 +0530)]
qa: add test for concurrent snap creates
Test if the number of snaps on the file-system and the stats on created
snaps in the DB match.
NOTE:
Since it is difficult to get the snapshot created on the exact second,
the timestamp comparison has been limited up to the last 'minute' as the
comparison granularity.
Signed-off-by: Milind Changire <mchangir@redhat.com>
(cherry picked from commit
e2e4635c188f05e37b710b38d4173dbd4ebf0257 )
Milind Changire [Wed, 24 Nov 2021 05:13:11 +0000 (10:43 +0530)]
mgr/snap_schedule: fix db connection concurrent usage
Serialize access to DB connection to avoid transaction aborts due to
concurrent use.
Some flake8-3.9 and mypy parsing error cleanups to keep 'make check' happy.
Fixes: https://tracker.ceph.com/issues/52642
Signed-off-by: Milind Changire <mchangir@redhat.com>
(cherry picked from commit
707543779e24c6bc1489c07f5fa1a239d110d9fb )
Conflicts:
src/pybind/mgr/snap_schedule/fs/schedule.py
src/pybind/mgr/snap_schedule/fs/schedule_client.py
- changes related to DBConnectionManager to serialize
db interactions
Ernesto Puerta [Wed, 13 Apr 2022 08:34:38 +0000 (10:34 +0200)]
Merge pull request #45849 from rhcs-dashboard/fix-install_deps-pacific
pacific: build: install-deps failing in docker build
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: David Galloway <dgallowa@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
David Galloway [Tue, 12 Apr 2022 20:02:25 +0000 (16:02 -0400)]
Merge pull request #45876 from ceph/pacific-sphinx
pacific: admin/doc-requirements: bump sphinx to 4.4.0
Ernesto Puerta [Tue, 12 Apr 2022 17:50:58 +0000 (19:50 +0200)]
Merge pull request #45880 from rhcs-dashboard/wip-55119-pacific
pacific: mgr/dashboard: fix api test issue with pip
Reviewed-by: David Galloway <dgallowa@redhat.com>
Ernesto Puerta [Fri, 25 Mar 2022 15:26:48 +0000 (16:26 +0100)]
mgr/dashboard: fix api test issue with pip
Fix
```
ERROR: pip's dependency resolver does not currently take into account all the packages that are installed. This behaviour is the source of the following dependency conflicts.
apache-libcloud 3.5.0 requires requests>=2.26.0, but you have requests 2.25.1 which is incompatible.
Successfully installed CherryPy-13.1.0 PyJWT-2.0.1 Routes-2.4.1 bcrypt-3.1.4 ceph-1.0.0 chardet-4.0.0 cheroot-8.6.0 idna-2.10 jaraco.functools-3.5.0 more-itertools-4.1.0 natsort-8.1.0 portend-3.1.0 pyopenssl-22.0.0 pytz-2022.1 repoze.lru-0.7 requests-2.25.1 tempora-5.0.1
```
Fixes: https://tracker.ceph.com/issues/55060
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
(cherry picked from commit
2289ad2bc327b0d86916a1c96f4af2967a80c1b9 )
Conflicts:
src/pybind/mgr/dashboard/constraints.txt
- keep requests 2.26
Kefu Chai [Sat, 5 Mar 2022 17:44:30 +0000 (01:44 +0800)]
admin/doc-requirements: bump sphinx to 4.4.0
bump sphinx to latest stable. to address following build failure
ERROR: sphinx-autodoc-typehints 1.17.0 has requirement Sphinx>=4, but you'll have sphinx 3.5.4 which is incompatible.
ERROR: sphinx-substitution-extensions 2022.2.16 has requirement sphinx>=4.0.0, but you'll have sphinx 3.5.4 which is incompatible.
also bump bump sphinx-rtd-theme, otherwise we'd have following
build failure:
ERROR: sphinx-rtd-theme 0.5.2 has requirement docutils<0.17, but you'll have docutils 0.17.1 which is incompatible.
Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit
0a5fab53b3804be5ef1377a2f35006b8df857d39 )
Kefu Chai [Sun, 6 Mar 2022 06:05:07 +0000 (14:05 +0800)]
mgr/cephadm: set docstring for shim() methods
this allows the "rpc"ized methods of OrchestratorClientMixin to
have the docstring defined by the original methods.
Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit
d0db2ae4f946e1a985402640ef8f1733b40e91ef )
Kefu Chai [Sun, 6 Mar 2022 06:23:42 +0000 (14:23 +0800)]
mgr/cephadm: add empty line after param list in docstring
this helps to silence the warning from sphinx, like
src/pybind/mgr/orchestrator/_interface.py:docstring of orchestrator._interface.Orchestrator.remove_osds:9: WARNING: Field list ends without a blank line; unexpected unindent.
Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit
d9b8e38e3dfe8e6eec6d56ee934c4632de46fc68 )
Kefu Chai [Sun, 6 Mar 2022 06:27:50 +0000 (14:27 +0800)]
doc/conf.py: silence warnings from breathe
breathe calls doxygen for extracting/generating docs from code.
while doxygen complains at seeing undocumented fields/func. these
warnings could fail the sphinx-build command, if it takes warnings
as errors.
in this change, these warnings are silenced.
Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit
8891d653198c30f9578499126e1ee9ee67eca04a )
Kefu Chai [Sun, 6 Mar 2022 07:04:21 +0000 (15:04 +0800)]
mgr/cephadm: document notes using "note::" directive
so it can be rendered by sphinx in a better way.
Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit
ba3ccee01b31ef9e39a5016a0ffda18628ec3bc2 )
Kefu Chai [Sun, 6 Mar 2022 07:20:14 +0000 (15:20 +0800)]
mgr/cephadm: improve the formatting of docstring
add an empty line before a doctest block would help
sphinx to tell where the session starts.
see also https://www.sphinx-doc.org/en/master/usage/restructuredtext/basics.html#doctest-blocks
Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit
8685fffdf20eeb4e2068c421e351aa02c48ff860 )
Kefu Chai [Sun, 6 Mar 2022 07:28:16 +0000 (15:28 +0800)]
mgr/cephadm: use block quote for "typical use"
otherwise sphinx takes "Typical use" and the following line as a
field. see also
https://www.sphinx-doc.org/en/master/usage/restructuredtext/basics.html#field-lists
Signed-off-by: Kefu Chai <tchaikov@gmail.com>
(cherry picked from commit
05798f0cae9afda598f5a154c62fdd24bab9ca30 )
Ernesto Puerta [Mon, 11 Apr 2022 19:20:16 +0000 (21:20 +0200)]
Merge pull request #45678 from rhcs-dashboard/wip-54586-pacific
pacific: mgr/dashboard: highlight the search text in cluster logs
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Nizamudeen A [Wed, 6 Apr 2022 07:39:26 +0000 (13:09 +0530)]
build: install-deps failing in docker build
install-deps.sh was failing in our docker build due to the recent change in
the script. Failure can be seen here: https://github.com/rhcs-dashboard/ceph-dev/runs/
5844502455 ?check_suite_focus=true#step:3:2586
This seems to fix the issue.
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit
72841fdcbe5445b5f5ada5d244d497f0b3f04e4f )
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
Yuri Weinstein [Fri, 8 Apr 2022 14:33:42 +0000 (07:33 -0700)]
Merge pull request #45716 from adk3798/pacific-backport-march
Cephadm Pacific Batch Backport March
Reviewed-by: Michael Fritch <mfritch@suse.com>
Yuri Weinstein [Fri, 8 Apr 2022 14:30:34 +0000 (07:30 -0700)]
Merge pull request #45632 from adk3798/pacific-ssh-offline
pacific: mgr/cephadm: add keep-alive requests to ssh connections
Reviewed-by: Michael Fritch <mfritch@suse.com>
Yuri Weinstein [Thu, 7 Apr 2022 21:26:58 +0000 (14:26 -0700)]
Merge pull request #45785 from ronen-fr/wip-rf-45640-pacific
pacific: osd/scrub: restart snap trimming only after scrubbing is done
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Thu, 7 Apr 2022 20:55:11 +0000 (13:55 -0700)]
Merge pull request #45773 from ljflores/wip-53605-pacific
pacific: mgr/telemetry: fix waiting for mgr to warm up
Reviewed-by: Yaarit Hatuka <yaarithatuka@gmail.com>
Yuri Weinstein [Thu, 7 Apr 2022 20:54:25 +0000 (13:54 -0700)]
Merge pull request #45731 from ronen-fr/wip-rf-42951-pacific
pacific: osd/scrub: destruct the scrubber shortly before the PG is destructed
Reviewed-by: Aishwarya Mathuria <amathuri@redhat.com>
Yuri Weinstein [Thu, 7 Apr 2022 20:50:33 +0000 (13:50 -0700)]
Merge pull request #45729 from ronen-fr/wip-rf-42479-pacific
pacific: osd/scrub: remove reliance of Scrubber objects' logging on the PG
Reviewed-by: Neha Ojha <nojha@redhat.com>
Adam King [Thu, 7 Apr 2022 20:28:52 +0000 (16:28 -0400)]
Merge pull request #45803 from ljflores/wip-telemetry-cephadm-link
pacific: cephadm: fix broken telemetry documentation link
Reviewed-by: Adam King <adking@redhat.com>
Laura Flores [Wed, 6 Apr 2022 18:03:04 +0000 (13:03 -0500)]
cephadm: fix broken telemetry documentation link
Signed-off-by: Laura Flores <lflores@redhat.com>
Josh Durgin [Wed, 6 Apr 2022 04:46:07 +0000 (21:46 -0700)]
Merge pull request #45789 from zdover23/wip-doc-2022-04-06-backport-to-pacific-basic-workflow
doc/dev: s/repostory/repository/ (really)
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
Zac Dover [Tue, 8 Jun 2021 15:57:13 +0000 (01:57 +1000)]
doc/dev: s/reposotory/repository/ (really)
This corrects the heinous misspelling described in the
substitution expression in the title. This misspelling is
all the more egregious because it appears in a title, and
therefore would be used to create links if it had not been
caught.
Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit
298b446c35d19ce43ede513a802d0655bcbdf82f )
Adam King [Fri, 11 Mar 2022 20:25:36 +0000 (15:25 -0500)]
qa/suites/fs: stop looping in mds upgrade test if upgrade failed
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
37019aad80aec15f9a34301c6051f065eb913e29 )
Adam King [Wed, 2 Mar 2022 05:23:52 +0000 (00:23 -0500)]
mgr/cephadm: fixing prometheus port handling
Fixes: https://tracker.ceph.com/issues/51072
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit
8eb1397d77dace25f387e88137a1807993a0796d )
Conflicts:
src/pybind/mgr/prometheus/module.py
Adam King [Tue, 15 Mar 2022 18:33:52 +0000 (14:33 -0400)]
cephadm: respect --skip-firewalld flag
Fixes: https://tracker.ceph.com/issues/54137
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
d97057f8d7263cce8efc0857e3fe4a10faee30c8 )
Matan Breizman [Tue, 15 Feb 2022 08:55:14 +0000 (08:55 +0000)]
qa/tasks/cephfs: increase timeout in test_nfs.py
Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit
44ad552093b4f0dc21563dd9f804974ade239440 )
Adam King [Mon, 21 Mar 2022 01:44:28 +0000 (21:44 -0400)]
python-common/drive_group: add extra_container_args to supported features
Should have been added when extending extra container args
to all the services but was missed
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
f036bdaf5a1e5f6b18a9591949be878fea8bb70d )
Conflicts:
src/python-common/ceph/deployment/drive_group.py
wangyunqing [Wed, 30 Mar 2022 03:53:57 +0000 (11:53 +0800)]
doc/cephadm/operations.rst: fix typos
Signed-off-by: wangyunqing <wangyunqing@inspur.com>
(cherry picked from commit
92eb799a952db4f2fe2290aef56d2f66b8f64802 )
Redouane Kachach [Wed, 2 Mar 2022 11:38:42 +0000 (12:38 +0100)]
mgr/cephadm: check spec host when adding osd
Fixes: https://tracker.ceph.com/issues/47872
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit
b87c966697d36ef51f1e62425d77200667e651ae )
Conflicts:
src/pybind/mgr/orchestrator/module.py
Adam King [Fri, 4 Mar 2022 02:47:47 +0000 (21:47 -0500)]
mgr/cephadm: offline host watcher
To be able to detect if certain offline hosts go
offline quicker. Could be useful for the NFS
HA feature as this requires moving nfs daemons from
offline hosts within 90 seconds.
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
bd9eb596570cfcc7fea793c2b380bc66dd719439 )
Conflicts:
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/cephadm/ssh.py
src/pybind/mgr/cephadm/tests/fixtures.py
src/pybind/mgr/cephadm/utils.py
Adam King [Tue, 22 Mar 2022 22:57:21 +0000 (18:57 -0400)]
mgr/cephadm: Reschedule nfs daemons from offline hosts
In order to improve nfs availability, if there are other
hosts we can place an nfs daemon on or if there is a host
with a lower rank nfs daemon when a higher rank one is on
an offline host, we should reschedule the nfs daemons
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
9febc21c14b7ad26e6d811444e7daf0b0a292afb )
Conflicts:
src/pybind/mgr/cephadm/utils.py
Redouane Kachach [Wed, 9 Mar 2022 13:19:02 +0000 (14:19 +0100)]
mgr/cephadm: checking service name before removal
Fixes: https://tracker.ceph.com/issues/54503
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit
b26c114c8456941d6cccf7d4355445f21cb373a7 )
Adam King [Tue, 15 Mar 2022 20:41:15 +0000 (16:41 -0400)]
cephadm: verify config file exists when inferring it
Fixes: https://tracker.ceph.com/issues/54571
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
1568875a281d56b413e75b244c9c75311cf353a0 )
Redouane Kachach [Mon, 7 Mar 2022 13:03:07 +0000 (14:03 +0100)]
mgr/cephadm: adding HostSpec validation
Fixes: https://tracker.ceph.com/issues/54342
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit
15ba147a2a4cae8ca69437382136d328a1f416f2 )
wangyunqing [Wed, 9 Mar 2022 08:55:13 +0000 (16:55 +0800)]
doc/cephadm/adoption.rst: fix typos
Signed-off-by: wangyunqing <wangyunqing@inspur.com>
(cherry picked from commit
e4db28f6b294909e0f177e82dbda8cfcc8129846 )
Adam King [Mon, 21 Feb 2022 21:34:47 +0000 (16:34 -0500)]
cephadm: still set container_image when --no-assimilate-config is provided
Fixes: https://tracker.ceph.com/issues/54141
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
59d004cb901eb6d84fb6907cb88314fd31b87904 )
Adam King [Thu, 10 Feb 2022 01:42:42 +0000 (20:42 -0500)]
qa/tasks/cephadm_cases: increase timeouts in test_cli.py
These seem to be failing sometimes but in my testing
sometimes these events are happening a few seconds after
we hit the timeout. Trying to see if this makes the tests
more consistent. No need to mark the test as failed
if we report something up in 34 seconds vs 25 especially
when cephadm works on a cyclic daemon refresh.
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit
46f939f057bd05a885eaf750663310375f9dd929 )
Conflicts:
qa/tasks/cephadm_cases/test_cli.py
Ronen Friedman [Fri, 25 Mar 2022 10:45:47 +0000 (10:45 +0000)]
pacific: osd/scrub: restart snap trimming only after scrubbing is done
Snap trimming that was postponed as the target PG was scrubbing
must be restarted at scrub completion.
PR #38111 moved trimming restart to just before the scrub fully
terminated. The current PR fixes that.
Trimming is also restarted in those cases where scrub was
queued but aborted immediately.
Fixes: https://tracker.ceph.com/issues/52026
Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
(cherry picked from commit
948d3266c67bf896d1c20472977b849178d233d3 )
Conflicts:
src/osd/pg_scrubber.cc
Conflict resolved by removing a clear_queued_or_active() call that
was dragged in.
Yaarit Hatuka [Tue, 9 Nov 2021 18:31:11 +0000 (18:31 +0000)]
mgr/telemetry: fix waiting for mgr to warm up
1. The implementation of config_notify() in telemetry module sets the
flag for event, which is supposed to wake up the 'serve' thread whenever
a config option is changed. The problem is that we call config_notify()
at the beginning of serve(), before we enter its 'run' loop. This call
sets the event which cancels the 10 seconds wait for the mgr to warm up.
To fix this, we extract the logic of updating the config options to a
separate function (config_update_module_option()), and call it on
__init__, instead of calling config_notify() in serve().
2. We should always wait for the mgr to warm up here (10 seconds). In
case of a sporadic event (e.g. a config option change via CLI) the event
will be set, and wait will return immediately. We enforce this wait by
using time.sleep(10) instead of event.wait(10).
Fixes: https://tracker.ceph.com/issues/53204
Signed-off-by: Yaarit Hatuka <yaarit@redhat.com>
(cherry picked from commit
fa5cc0ca081ca3cce552e0cb21a1e17273cf3482 )
Conflicts:
src/pybind/mgr/telemetry/module.py
- Several options under __init__ had to be removed that were not present
in Pacific
- No type checking in Pacific
Yuri Weinstein [Mon, 4 Apr 2022 21:50:43 +0000 (14:50 -0700)]
Merge pull request #45654 from ljflores/wip-pacific-fast-shutdown-backports
Pacific fast shutdown backports
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Sridhar Seshasayee <sseshasa@redhat.com>
Reviewed-by: Nitzan Mordechai <nmordech@redhat.com>
Yuri Weinstein [Mon, 4 Apr 2022 21:47:26 +0000 (14:47 -0700)]
Merge pull request #45586 from idryomov/wip-pool-reverse-lookup-osdmap-pacific
pacific: librados: check latest osdmap on ENOENT in pool_reverse_lookup()
Reviewed-by: Neha Ojha <nojha@redhat.com>
David Galloway [Mon, 4 Apr 2022 21:33:06 +0000 (17:33 -0400)]
Merge pull request #45753 from ceph/wip-pacific-debug
build: Add some debugging messages
Yuri Weinstein [Mon, 4 Apr 2022 15:59:41 +0000 (08:59 -0700)]
Merge pull request #45638 from idryomov/wip-diff-iterate-striping-fix-pacific
pacific: librbd: make diff-iterate in fast-diff mode sort and merge reported extents
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
David Galloway [Fri, 25 Mar 2022 21:29:44 +0000 (17:29 -0400)]
build: Add some debugging messages
Having a unique string like "CI_DEBUG" will help me know where we are in the build process in Jenkins logs.
Signed-off-by: David Galloway <dgallowa@redhat.com>
(cherry picked from commit
57edb76ea46893294a70aa080916bc723fb35f9e )
Ronen Friedman [Thu, 26 Aug 2021 12:30:38 +0000 (12:30 +0000)]
osd/scrub: destruct the scrubber shortly before the PG is destructed
By destructing the scrubber when the PG is still intact, we guarantee that
Scrubber's code can refer to the PG object - especially in dout()s.
Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
(cherry picked from commit
bcd13e134c1f335506e425800170d55cd8a2af1b )
Ronen Friedman [Sun, 25 Jul 2021 11:58:51 +0000 (14:58 +0300)]
osd/scrub: remove reliance of Scrubber objects' logging on the PG
Modify the Scrubber's sub-objects to use their own gen_prefix()
functions, instead of using PG::gen_prefix().
Fixes: https://tracker.ceph.com/issues/51843
Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
(cherry picked from commit
2aeb9263d643b19d59219e8e187e1a0fa0292693 )
Conflicts:
src/osd/PG.h
src/osd/PrimaryLogScrub.cc
src/osd/pg_scrubber.cc
src/osd/pg_scrubber.h
Conflict resolution:
- manually removing some scrub scheduling changes from
PR #40984
- pg_scrubber.h: removing some irrelevant lines that were dragged
in.
- PG.h: restoring lines removed by the merge.
Sarthak0702 [Mon, 21 Mar 2022 18:29:08 +0000 (23:59 +0530)]
mgr/dashboard: Remove padding in search highlighted text
Signed-off-by: Sarthak0702 <sarthak.0702@gmail.com>
Yuri Weinstein [Tue, 29 Mar 2022 20:20:56 +0000 (13:20 -0700)]
Merge pull request #45620 from s0nea/wip-55036-pacific
pacific: mgr/cephadm: try to get FQDN for configuration files
Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Adam King adking@redhat.com
Sarthak0702 [Tue, 1 Mar 2022 18:07:38 +0000 (23:37 +0530)]
mgr/dashboard: highlight the search text in cluster logs
Fixes: https://tracker.ceph.com/issues/54445
Signed-off-by: Sarthak0702 <sarthak.0702@gmail.com>
(cherry picked from commit
a878c7442059d11ac14edd226d71abbabda9a3c4 )
Yuri Weinstein [Mon, 28 Mar 2022 21:54:43 +0000 (14:54 -0700)]
Merge pull request #45374 from ronen-fr/wip-rf-42684-pacific
pacific: osd/scrub: tag replica scrub messages to identify stale events
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Mon, 28 Mar 2022 21:53:37 +0000 (14:53 -0700)]
Merge pull request #45355 from mgfritch/backport-45347-pacific
pacific: cephadm: preserve `authorized_keys` file during upgrade
Reviewed-by: Adam King adking@redhat.com
Yuri Weinstein [Mon, 28 Mar 2022 15:51:51 +0000 (08:51 -0700)]
Merge pull request #45591 from vumrao/wip-vumrao-55020
pacific: osd/PrimaryLogPG.cc: CEPH_OSD_OP_OMAPRMKEYRANGE should mark omap dirty
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Ronen Friedman <rfriedma@redhat.com>
Yuri Weinstein [Mon, 28 Mar 2022 15:51:01 +0000 (08:51 -0700)]
Merge pull request #45203 from rhcs-dashboard/wip-54113-pacific
pacific: mgr/dashboard: perform daemon actions
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Yuri Weinstein [Mon, 28 Mar 2022 15:47:56 +0000 (08:47 -0700)]
Merge pull request #45173 from kamoltat/wip-ksirivad-backport-pacific-44054
pacific: osd: add pg_num_max value & pg_num_max reordering
Reviewed-by: Neha Ojha <nojha@redhat.com>
Laura Flores [Mon, 28 Mar 2022 15:39:57 +0000 (10:39 -0500)]
Merge pull request #45588 from ljflores/wip-pacific-perfcounter-fix
pacific: common: fix missing name in PriorityCache perf counters
Yuri Weinstein [Mon, 28 Mar 2022 14:23:30 +0000 (07:23 -0700)]
Merge pull request #45561 from idryomov/wip-readv-writev-overflow-pacific
pacific: librbd: readv/writev fix iovecs length computation overflow
Reviewed-by: Christopher Hoffman <choffman@redhat.com>
Yuri Weinstein [Mon, 28 Mar 2022 14:19:58 +0000 (07:19 -0700)]
Merge pull request #45474 from nmshelke/wip-54573-pacific
pacific: mgr/volumes: the 'mode' should honor idempotent subvolume creation
Reviewed-by: Venky Shankar vshankar@redhat.com
Yuri Weinstein [Mon, 28 Mar 2022 14:19:13 +0000 (07:19 -0700)]
Merge pull request #45464 from cfsnyder/wip-53471-pacific
pacific: common: avoid pthread_mutex_unlock twice
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Mon, 28 Mar 2022 14:17:47 +0000 (07:17 -0700)]
Merge pull request #45436 from cfsnyder/wip-51783-pacific
pacific: qa/rgw: add failing tempest test to blocklist
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Mon, 28 Mar 2022 14:16:18 +0000 (07:16 -0700)]
Merge pull request #45163 from dvanders/wip-52635-pacific
pacific: mds: ensure that we send the btime in cap messages
Reviewed-by: Venky Shankar vshankar@redhat.com
Yuri Weinstein [Mon, 28 Mar 2022 14:15:32 +0000 (07:15 -0700)]
Merge pull request #45565 from ajarr/wip-52875-pacific
pacific: qa: fsync dir for asynchronous creat on stray tests
Reviewed-by: Venky Shankar vshankar@redhat.com
Yuri Weinstein [Mon, 28 Mar 2022 14:13:50 +0000 (07:13 -0700)]
Merge pull request #45564 from ajarr/wip-52427-pacific
pacific: qa: ignore expected metadata cluster log error
Reviewed-by: Venky Shankar vshankar@redhat.com
Yuri Weinstein [Fri, 25 Mar 2022 19:01:00 +0000 (12:01 -0700)]
Merge pull request #44771 from pdvian/wip-53944-pacific
pacific: osd/OSD: Log aggregated slow ops detail to cluster logs
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Fri, 25 Mar 2022 18:59:57 +0000 (11:59 -0700)]
Merge pull request #44664 from gregsfortytwo/wip-53933-pacific
pacific: osd: PeeringState: fix selection order in calc_replicated_acting_stretch
Reviewed-by: Neha Ojha <nojha@redhat.com>
David Galloway [Fri, 25 Mar 2022 18:48:44 +0000 (14:48 -0400)]
Merge pull request #45491 from cfsnyder/wip-54077-pacific
pacific: rgw: bucket chown bad memory usage
David Galloway [Fri, 25 Mar 2022 18:45:54 +0000 (14:45 -0400)]
Merge pull request #45557 from vshankar/wip-53911
pacific: Revert "mds: kill session when mds do ms_handle_remote_reset"
Sridhar Seshasayee [Fri, 25 Mar 2022 16:40:31 +0000 (22:10 +0530)]
qa/standalone: Fix test_activate_osd() test in ceph-helpers.sh
Modify test_activate_osd() to get the type of scheduler in use and then
verify the value of osd_max_backfills. This is because mclock scheduler
overrides this option to 1000 upon OSD initialization.
The test earlier used to pass because the OSD daemon was killed but not
marked down and upon being brought up, the wait for OSD up check was
passing quickly. But the OSD still didn't have the latest config values.
But now upon killing the OSD, the osd_fast_shutdown sequence notifies the
mon (see PR: https://github.com/ceph/ceph/pull/44807) and is marked down
and dead. Upon bringing it up, the wait for OSD up check takes a longer
time and this is sufficient for the config values to be updated. This
results in the correct values being read from the config 'Values' map.
Signed-off-by: Sridhar Seshasayee <sseshasa@redhat.com>
(cherry picked from commit
3aa2df2e0f6f5bafadc96fd72935e5cf8b2fcf17 )
Nitzan Mordechai [Thu, 27 Jan 2022 13:13:28 +0000 (15:13 +0200)]
osd/OSD: osd_fast_shutdown_notify_mon not quite right
When osd_fast_shutdown and osd_fast_shutdown_notify_mon set as true, OSD marked as Down
it should be marked as Dead,
Fixed: https://tracker.ceph.com/issues/53327
Signed-off-by: Nitzan Mordechai <nmordech@redhat.com>
nd
nd
(cherry picked from commit
07302d5e41c49c885c9398c1c478638023e3f264 )
Satoru Takeuchi [Thu, 18 Nov 2021 20:48:18 +0000 (20:48 +0000)]
osd: make osd_fast_shutdown_notify_mon option true by default
osd_fast_shutdown_notify_mon option is false by default. So users suffer
from error log flood, slow ops, and the long I/O timeouts on voluntary OS
shutdown before they are aware of the existence of this option. Let's
make this option true by default.
Fixes: https://tracker.ceph.com/issues/53328
Signed-off-by: Satoru Takeuchi <satoru.takeuchi@gmail.com>
(cherry picked from commit
729a5b85a6586b47d16acbba2cf8e765e498cd65 )
Conflicts:
src/common/options/global.yaml.in
- global.yaml.in does not exist in Pacific; rather,
these configs were handled in options.cc.
David Galloway [Fri, 25 Mar 2022 16:50:15 +0000 (12:50 -0400)]
Merge pull request #45489 from cfsnyder/wip-54041-pacific
pacific: rgw: remove bucket API returns NoSuchKey than NoSuchBucket
David Galloway [Fri, 25 Mar 2022 16:49:33 +0000 (12:49 -0400)]
Merge pull request #45543 from ajarr/rraja-pacific-backport-pr-44795
pacific: mgr/nfs: allow dynamic update of cephfs nfs export
David Galloway [Fri, 25 Mar 2022 16:48:12 +0000 (12:48 -0400)]
Merge pull request #45502 from cfsnyder/wip-54148-pacific
pacific: rgw: RGWPostObj::execute() may lost data.
David Galloway [Fri, 25 Mar 2022 16:47:35 +0000 (12:47 -0400)]
Merge pull request #45500 from cfsnyder/wip-54147-pacific
pacific: rgw/admin: fix radosgw-admin datalog list max-entries issue
David Galloway [Fri, 25 Mar 2022 16:46:16 +0000 (12:46 -0400)]
Merge pull request #45497 from cfsnyder/wip-54092-pacific
pacific: rgwlc: warn on missing RGW_ATTR_LC
David Galloway [Fri, 25 Mar 2022 16:45:58 +0000 (12:45 -0400)]
Merge pull request #45495 from cfsnyder/wip-54083-pacific
pacific: librgw: make rgw file handle versioned
David Galloway [Fri, 25 Mar 2022 16:44:12 +0000 (12:44 -0400)]
Merge pull request #45487 from mchangir/wip-54532-pacific
pacific: mds,client: add new getvxattr op
Yuri Weinstein [Fri, 25 Mar 2022 14:48:41 +0000 (07:48 -0700)]
Merge pull request #45555 from idryomov/wip-rbd-du-validate-pacific
pacific: test/librbd: add test to verify diff_iterate size
Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
Yuri Weinstein [Fri, 25 Mar 2022 14:40:14 +0000 (07:40 -0700)]
Merge pull request #44551 from lxbsz/wip-53759
pacific: mds: reset heartbeat in each MDSContext complete()
Reviewed-by: Venky Shankar vshankar@redhat.com
Ilya Dryomov [Sun, 20 Mar 2022 11:10:52 +0000 (12:10 +0100)]
librbd: make diff-iterate in fast-diff mode sort and merge reported extents
Various users, the most notable example being the QEMU driver, assume
that extents are reported in image offset order.
Fixes: https://tracker.ceph.com/issues/53885
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
85e7075d5f021bd2d11024e6646d74a8a9f96e15 )
Adam King [Fri, 25 Mar 2022 03:21:47 +0000 (23:21 -0400)]
mgr/cephadm: add keep-alive requests to ssh connections
Fixes: https://tracker.ceph.com/issues/51733
Signed-off-by: Adam King <adking@redhat.com>
Yuri Weinstein [Thu, 24 Mar 2022 23:30:07 +0000 (16:30 -0700)]
Merge pull request #45509 from cfsnyder/wip-54152-pacific
pacific: rgw: in bucket reshard list, clarify new num shards is tentative
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Adam King [Thu, 24 Mar 2022 20:51:35 +0000 (16:51 -0400)]
Merge pull request #45508 from phlogistonjohn/jjm-backport-pacific-pr-44845-44870-45211
pacific: mgr/nfs: support managing exports without orchestration enabled
Reviewed-by: Ramana Raja <rraja@redhat.com>
Adam King [Thu, 24 Mar 2022 20:50:09 +0000 (16:50 -0400)]
Merge pull request #45569 from mgfritch/backport-45420-pacific
pacific: cephadm: infer the default container image during pull
Reviewed-by: Adam King <adking@redhat.com>
Yuri Weinstein [Thu, 24 Mar 2022 20:26:08 +0000 (13:26 -0700)]
Merge pull request #45582 from idryomov/wip-rbd-nbd-cookie-pacific
pacific: backport nbd cookie support
Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
Yuri Weinstein [Thu, 24 Mar 2022 20:25:25 +0000 (13:25 -0700)]
Merge pull request #45580 from idryomov/wip-fix-pids-limit-pacific
pacific: cephadm: Remove containers pids-limit
Reviewed-by: Adam King adking@redhat.com
Yuri Weinstein [Thu, 24 Mar 2022 20:21:45 +0000 (13:21 -0700)]
Merge pull request #45477 from cfsnyder/wip-53637-pacific
pacific: test/rgw: disable cls_rgw_gc test cases with defer_gc()
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Thu, 24 Mar 2022 20:21:04 +0000 (13:21 -0700)]
Merge pull request #45476 from cfsnyder/wip-53518-pacific
pacific: rgw: add object null point judging when listing pubsub topics
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Thu, 24 Mar 2022 14:55:41 +0000 (07:55 -0700)]
Merge pull request #45484 from cfsnyder/wip-53835-pacific
pacific: rgw: document S3 bucket replication support
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Thu, 24 Mar 2022 14:55:05 +0000 (07:55 -0700)]
Merge pull request #45483 from cfsnyder/wip-53818-pacific
pacific: rgw: RadosBucket::get_bucket_info() updates RGWBucketEnt
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Thu, 24 Mar 2022 14:54:28 +0000 (07:54 -0700)]
Merge pull request #45480 from cfsnyder/wip-53654-pacific
pacific: rgw: init bucket index only if putting bucket instance info succeeds
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Thu, 24 Mar 2022 14:52:23 +0000 (07:52 -0700)]
Merge pull request #45478 from cfsnyder/wip-53639-pacific
pacific: rgw/amqp: add default case to silence compiler warning
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Thu, 24 Mar 2022 14:38:43 +0000 (07:38 -0700)]
Merge pull request #45463 from cfsnyder/wip-53254-pacific
pacific: rgw: fix rgw.none statistics
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Tatjana Dehler [Wed, 9 Mar 2022 15:23:49 +0000 (16:23 +0100)]
mgr/cephadm: try to get FQDN for inventory address
Fixes: https://tracker.ceph.com/issues/54502
Signed-off-by: Tatjana Dehler <tdehler@suse.com>
(cherry picked from commit
4f14993b1667fff309cd9cd6f9dad638a5a7e502 )
Conflicts:
src/pybind/mgr/cephadm/services/monitoring.py
Fixed conflict because ceph#44751 has not been backported to
pacific (yet).