]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 years agocmake: detect and use sigdescr_np() if available 38952/head
David Disseldorp [Tue, 1 Sep 2020 11:49:21 +0000 (13:49 +0200)]
cmake: detect and use sigdescr_np() if available

sys_siglist is deprecated with glibc 2.32. A new thread-safe and
async-signal safe sigdescr_np() function is provided, so use it if
available.

Fixes: https://tracker.ceph.com/issues/47187
Signed-off-by: David Disseldorp <ddiss@suse.de>
(cherry picked from commit b9b6faf66ae67648626470cb4fc3f0850ac4d842)

Conflicts:
        CMakeLists.txt
cmake/modules/CephChecks.cmake
- CephChecks.cmake file does not exist in nautilus; manually cherry-picked the
  change in that file to top-level CMakeLists.txt

4 years agoMerge pull request #38584 from votdev/wip-48593-nautilus
Yuri Weinstein [Thu, 14 Jan 2021 16:21:06 +0000 (08:21 -0800)]
Merge pull request #38584 from votdev/wip-48593-nautilus

nautilus: mgr/dashboard: Drop invalid RGW client instances, improve logging

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
4 years agoMerge pull request #38558 from badone/wip-nautilus-fix-logfile-create-perms
Yuri Weinstein [Thu, 14 Jan 2021 16:15:42 +0000 (08:15 -0800)]
Merge pull request #38558 from badone/wip-nautilus-fix-logfile-create-perms

nautilus: common: fix logfile create perms

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #38475 from ifed01/wip-ifed-fix-avl-nau
Yuri Weinstein [Thu, 14 Jan 2021 16:15:04 +0000 (08:15 -0800)]
Merge pull request #38475 from ifed01/wip-ifed-fix-avl-nau

nautilus: os/bluestore: fix inappropriate ENOSPC from avl/hybrid allocator

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
4 years agoMerge pull request #38834 from smithfarm/wip-48675-nautilus
Yuri Weinstein [Wed, 13 Jan 2021 23:45:31 +0000 (15:45 -0800)]
Merge pull request #38834 from smithfarm/wip-48675-nautilus

nautilus: qa: krbd_stable_pages_required.sh: move to stable_writes attribute

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
4 years agoMerge pull request #38832 from rhcs-dashboard/wip-48655-nautilus
Yuri Weinstein [Wed, 13 Jan 2021 23:44:39 +0000 (15:44 -0800)]
Merge pull request #38832 from rhcs-dashboard/wip-48655-nautilus

nautilus: mgr/dashboard: CLI commands: read passwords from file

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agoMerge pull request #38831 from smithfarm/wip-48224-nautilus
Yuri Weinstein [Wed, 13 Jan 2021 23:43:12 +0000 (15:43 -0800)]
Merge pull request #38831 from smithfarm/wip-48224-nautilus

nautilus: rbd: librbd: update hidden global config when removing pool config override

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge pull request #38771 from votdev/wip-48628-nautilus
Yuri Weinstein [Wed, 13 Jan 2021 23:41:47 +0000 (15:41 -0800)]
Merge pull request #38771 from votdev/wip-48628-nautilus

nautilus: mgr/dashboard: The /rgw/status endpoint does not check for running service

Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
4 years agoMerge pull request #38803 from smithfarm/wip-48768-nautilus
Yuri Weinstein [Mon, 11 Jan 2021 16:44:48 +0000 (08:44 -0800)]
Merge pull request #38803 from smithfarm/wip-48768-nautilus

nautilus: mgr/PyModule: correctly remove config options

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge pull request #38637 from ifed01/wip-ifed-fix-alloc-nau
Yuri Weinstein [Mon, 11 Jan 2021 16:44:13 +0000 (08:44 -0800)]
Merge pull request #38637 from ifed01/wip-ifed-fix-alloc-nau

nautilus: os/bluestore: fix segfault on out-of-bound offset provided to  claim_…

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #38478 from ifed01/wip-ifed-faster-rm1-nau
Yuri Weinstein [Mon, 11 Jan 2021 16:43:38 +0000 (08:43 -0800)]
Merge pull request #38478 from ifed01/wip-ifed-faster-rm1-nau

nautilus: osd: optimize PG removal (part1)

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #37793 from ifed01/wip-ifed-fix-alloc-multi-reg-nau
Yuri Weinstein [Mon, 11 Jan 2021 16:42:51 +0000 (08:42 -0800)]
Merge pull request #37793 from ifed01/wip-ifed-fix-alloc-multi-reg-nau

nautilus: bluestore: provide a different name for fallback allocator

Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agomgr/dashboard: fix issues from cherry-pick conflict resolution 38832/head
Alfonso Martínez [Mon, 11 Jan 2021 14:34:34 +0000 (15:34 +0100)]
mgr/dashboard: fix issues from cherry-pick conflict resolution

src/test/mgr/mgr-dashboard-smoke.sh
src/vstart.sh
- Add 'tell mgr' in ac-user-create command.

src/pybind/mgr/dashboard/tests/test_access_control.py
qa/tasks/mgr/dashboard/test_auth.py
- Remove 'force_password' argument.

qa/tasks/mgr/dashboard/test_rgw.py
- Fix test_status test.

cherry-pick commit: b82478e1061bfc1475693b0910a7f14276b4d6ab

Fixes: https://tracker.ceph.com/issues/48355
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
4 years agoMerge pull request #38799 from votdev/wip-48653-nautilus
Ernesto Puerta [Fri, 8 Jan 2021 21:04:16 +0000 (22:04 +0100)]
Merge pull request #38799 from votdev/wip-48653-nautilus

nautilus: mgr/dashboard: Display a warning message in Dashboard when debug mode is enabled

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
4 years agoMerge pull request #38509 from rhcs-dashboard/wip-48516-nautilus
Ernesto Puerta [Fri, 8 Jan 2021 20:55:15 +0000 (21:55 +0100)]
Merge pull request #38509 from rhcs-dashboard/wip-48516-nautilus

nautilus: mgr/dashboard: Updating the inbuilt ssl providers error

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
4 years agoqa: krbd_stable_pages_required.sh: move to stable_writes attribute 38834/head
Ilya Dryomov [Thu, 3 Dec 2020 10:24:32 +0000 (11:24 +0100)]
qa: krbd_stable_pages_required.sh: move to stable_writes attribute

bdi/stable_pages_required attribute was deprecated in 5.10 and now
always returns 0.  The replacement is queue/stable_writes.  (It is
also writeable, so we can simplify these test cases somewhat in the
future.)

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

Conflicts:
qa/workunits/rbd/krbd_stable_writes.sh
- this file is much bigger in master than in nautilus

4 years agomgr/BaseMgrModule: add optional inbuf param to ceph_send_command.
Alfonso Martínez [Tue, 15 Dec 2020 08:29:53 +0000 (09:29 +0100)]
mgr/BaseMgrModule: add optional inbuf param to ceph_send_command.

BaseMgrModule.cc: ceph_send_command: add inbuf param for handling input file content.

Fixes: https://tracker.ceph.com/issues/48355
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
(cherry picked from commit dc37e0fdb1ea5187aea42303f0bfe27aadd8d64d)

 Conflicts:
src/pybind/mgr/ceph_module.pyi

 - Remove this file as it does not exist in nautilus.

4 years agomgr/dashboard: CLI commands: read passwords from file
Alfonso Martínez [Tue, 15 Dec 2020 08:28:46 +0000 (09:28 +0100)]
mgr/dashboard: CLI commands: read passwords from file

Fixes: https://tracker.ceph.com/issues/48355
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
Signed-off-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
(cherry picked from commit 5d7ee7c1f0ad971fd0079f917e2b44cdef1d6f9f)

 Conflicts:
doc/mgr/dashboard.rst
qa/tasks/mgr/dashboard/helper.py
qa/tasks/mgr/dashboard/test_auth.py
qa/tasks/mgr/dashboard/test_rgw.py
qa/tasks/mgr/dashboard/test_user.py
qa/workunits/cephadm/test_dashboard_e2e.sh
src/cephadm/cephadm
src/pybind/mgr/cephadm/services/cephadmservice.py
src/pybind/mgr/cephadm/services/iscsi.py
src/pybind/mgr/cephadm/tests/test_cephadm.py
src/pybind/mgr/cephadm/tests/test_services.py
src/pybind/mgr/dashboard/run-frontend-e2e-tests.sh
src/pybind/mgr/dashboard/services/access_control.py
src/pybind/mgr/dashboard/services/iscsi_cli.py
src/pybind/mgr/dashboard/tests/test_access_control.py
src/pybind/mgr/dashboard/tests/test_iscsi.py
src/pybind/mgr/dashboard/tests/test_settings.py
src/pybind/mgr/mgr_module.py
src/pybind/mgr/tests/__init__.py
src/test/mgr/mgr-dashboard-smoke.sh
src/vstart.sh

  - Remove cephadm files and related code (does not apply to nautilus).
  - Remove code related to non-existing functionality in nautilus.
  - Adapt code to be py2 compatible.
  - Resolve conflicts related to code divergence.

4 years agolibrbd: update hidden global config when removing pool config override 38831/head
Jason Dillaman [Sat, 7 Nov 2020 15:09:32 +0000 (10:09 -0500)]
librbd: update hidden global config when removing pool config override

The remove notification was missed and therefore in-use images will not
properly remove pool config overrides.

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

4 years agoMerge pull request #38589 from smithfarm/wip-48128-nautilus
Yuri Weinstein [Fri, 8 Jan 2021 16:33:43 +0000 (08:33 -0800)]
Merge pull request #38589 from smithfarm/wip-48128-nautilus

nautilus: rgw: keep syncstopped flag when copying bucket shard headers

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #38556 from smithfarm/wip-48576-nautilus
Yuri Weinstein [Fri, 8 Jan 2021 16:33:14 +0000 (08:33 -0800)]
Merge pull request #38556 from smithfarm/wip-48576-nautilus

nautilus: rgw: Disable prefetch of entire head object when GET request with range header

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
4 years agoMerge pull request #38527 from s0nea/wip-48537-nautilus
Yuri Weinstein [Fri, 8 Jan 2021 16:32:39 +0000 (08:32 -0800)]
Merge pull request #38527 from s0nea/wip-48537-nautilus

nautilus: mgr/dashboard: test_standby* (tasks.mgr.test_dashboard.TestDashboard) failed locally

Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
4 years agoMerge pull request #38504 from callithea/wip-48512-nautilus
Yuri Weinstein [Fri, 8 Jan 2021 16:31:57 +0000 (08:31 -0800)]
Merge pull request #38504 from callithea/wip-48512-nautilus

nautilus: mgr/dashboard: remove pyOpenSSL version pinning

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
4 years agoMerge pull request #38493 from ivancich/nautilus-better-ordered-listing-skipping
Yuri Weinstein [Fri, 8 Jan 2021 16:29:26 +0000 (08:29 -0800)]
Merge pull request #38493 from ivancich/nautilus-better-ordered-listing-skipping

nautilus: rgw: in ordered bucket listing skip namespaced entries internally when possible

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #38332 from votdev/wip-48395-nautilus
Yuri Weinstein [Fri, 8 Jan 2021 16:28:24 +0000 (08:28 -0800)]
Merge pull request #38332 from votdev/wip-48395-nautilus

nautilus: mgr/dashboard: Disable TLS 1.0 and 1.1

Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agoMerge pull request #38772 from batrick/pr38188-fix
Yuri Weinstein [Thu, 7 Jan 2021 16:13:42 +0000 (08:13 -0800)]
Merge pull request #38772 from batrick/pr38188-fix

nautilus: qa: restore file name

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
4 years agomgr/PyModule: correctly remove config options 38803/head
Tim Serong [Fri, 22 Nov 2019 09:25:19 +0000 (20:25 +1100)]
mgr/PyModule: correctly remove config options

Previously, incorrect parameters were being passed to "config rm",
causing it to do nothing.  This commit also ensures the correct
error message is shown for both the set and remove failure cases.
I've also moved the update of the in-memory config map to *after*
the value is persisted, to ensure the config map actually reflects
what's stored.

Fixes: https://tracker.ceph.com/issues/42958
Signed-off-by: Tim Serong <tserong@suse.com>
(cherry picked from commit 0520ff571cfb480872c8bd429c94bd4ce15eeb40)

4 years agomgr/dashboard: Display a warning message in Dashboard when debug mode is enabled 38799/head
Volker Theile [Mon, 7 Dec 2020 12:56:56 +0000 (13:56 +0100)]
mgr/dashboard: Display a warning message in Dashboard when debug mode is enabled

Set a health check warning if debug mode is enabled.

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

Conflicts:
- src/pybind/mgr/dashboard/plugins/debug.py
Remove @no_type_check decorator because it is not available in Nautilus.

4 years agomgr/dashboard: Disable TLS 1.0 and 1.1 38332/head
Volker Theile [Wed, 25 Nov 2020 16:57:13 +0000 (17:57 +0100)]
mgr/dashboard: Disable TLS 1.0 and 1.1

Disable these TLS versions because of security issues.

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

Conflicts:
- src/pybind/mgr/dashboard/module.py
Limiting TLS version seems to work only with CherryPy >= 8.9.1 (Ubuntu 18.04 or SUSE Leap 15.1) based on tests in Teuthology. It failed on Ubuntu 16.04 (CherryPy 3.5.0) and RHEL 7.9 (CherryPy 3.2.2).
- qa/tasks/mgr/test_dashboard.py
Tests must be removed because they will not work in Teuthology because of outdated cherrypy versions on most platforms. Only Ubuntu 18.04 (and downstream SUSE Leap 15.1) will work, but it's not possible to limit QA runs to that specific platforms.

4 years agoMerge pull request #38467 from Vicente-Cheng/wip-48457-nautilus
Yuri Weinstein [Wed, 6 Jan 2021 23:20:42 +0000 (15:20 -0800)]
Merge pull request #38467 from Vicente-Cheng/wip-48457-nautilus

nautilus: client: do not use g_conf().get_val<>() in libcephfs

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #37991 from Vicente-Cheng/wip-48110-nautilus
Yuri Weinstein [Wed, 6 Jan 2021 23:20:00 +0000 (15:20 -0800)]
Merge pull request #37991 from Vicente-Cheng/wip-48110-nautilus

nautilus: cephfs: client: increment file position on _read_sync near eof

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #37988 from Vicente-Cheng/wip-48097-nautilus
Yuri Weinstein [Wed, 6 Jan 2021 23:19:27 +0000 (15:19 -0800)]
Merge pull request #37988 from Vicente-Cheng/wip-48097-nautilus

nautilus: cephfs: osdc: restart read on truncate/discard

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #37986 from Vicente-Cheng/wip-48095-nautilus
Yuri Weinstein [Wed, 6 Jan 2021 23:18:55 +0000 (15:18 -0800)]
Merge pull request #37986 from Vicente-Cheng/wip-48095-nautilus

nautilus: mds : move start_files_to_recover() to recovery_done

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoqa: restore file name 38772/head
Patrick Donnelly [Tue, 5 Jan 2021 16:32:20 +0000 (08:32 -0800)]
qa: restore file name

Changing it caused symbolic links to not resolve which broke the kcephfs
suite (and probably others).

Fixes: 0e3d45d3486d47ea50045fb2449199f7158effe3
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agomgr/dashboard: The /rgw/status endpoint does not check for running service 38771/head
Volker Theile [Thu, 10 Dec 2020 14:30:16 +0000 (15:30 +0100)]
mgr/dashboard: The /rgw/status endpoint does not check for running service

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

4 years agomgr/dashboard: Drop invalid RGW client instances, improve logging 38584/head
Volker Theile [Tue, 15 Dec 2020 09:40:48 +0000 (10:40 +0100)]
mgr/dashboard: Drop invalid RGW client instances, improve logging

* Log RGW settings for easier problem tracking.
* Drop RGW client instances that do not exist anymore. This happens when a RGW service is removed via the orchestrator. The Dashboard tries to access the RGW client using the previous settings which leads to an error which might be confusing. Without dropping the error message 'RGW REST API failed request ...' is displayed instead of the correct one 'No RGW found'. Dropping the RGW client instance will produce correct error messages the next time the backend tries to establish a new connection.

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

Conflicts:
  Need to remove type hints.
  src/pybind/mgr/dashboard/services/rgw_client.py

4 years agoMerge pull request #38614 from neha-ojha/wip-48614-nautilus
Neha Ojha [Sat, 19 Dec 2020 02:45:07 +0000 (18:45 -0800)]
Merge pull request #38614 from neha-ojha/wip-48614-nautilus

nautilus: Do not add sensitive information in Ceph log files

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoos/bluestore: fix segfault on out-of-bound offset provided to claim_free_to_right... 38637/head
Igor Fedotov [Mon, 5 Oct 2020 14:49:12 +0000 (17:49 +0300)]
os/bluestore: fix segfault on out-of-bound offset provided to  claim_free_to_right() call

Hybrid allocator might provide such an offset when final extent is marked as free by HybridAllocator::_add_to_tree().
Hence provides start+size point out to the end of the controled space.

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

4 years agoMerge remote-tracking branch 'upstream/heads/nautilus-saved' into HEAD
Patrick Donnelly [Thu, 17 Dec 2020 02:22:25 +0000 (18:22 -0800)]
Merge remote-tracking branch 'upstream/heads/nautilus-saved' into HEAD

4 years ago14.2.16 v14.2.16
Jenkins Build Slave User [Wed, 16 Dec 2020 17:35:00 +0000 (17:35 +0000)]
14.2.16

4 years agoMerge branch 'CVE-2020-27781-nautilus' into nautilus
Patrick Donnelly [Wed, 16 Dec 2020 16:22:51 +0000 (08:22 -0800)]
Merge branch 'CVE-2020-27781-nautilus' into nautilus

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

Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Kotresh Hiremath Ravishankar <khiremat@redhat.com>
4 years agotasks/cephfs/test_volume_client: Add tests for authorize/deauthorize
Kotresh HR [Tue, 1 Dec 2020 10:44:17 +0000 (16:14 +0530)]
tasks/cephfs/test_volume_client: Add tests for authorize/deauthorize

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

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

Conflicts:
qa/tasks/cephfs/test_volume_client.py

4 years agopybind/ceph_volume_client: Optionally authorize existing auth-ids
Kotresh HR [Sun, 6 Dec 2020 07:10:20 +0000 (12:40 +0530)]
pybind/ceph_volume_client: Optionally authorize existing auth-ids

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

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

4 years agopybind/ceph_volume_client: Preserve existing caps while authorize/deauthorize auth-id
Kotresh HR [Thu, 26 Nov 2020 09:18:16 +0000 (14:48 +0530)]
pybind/ceph_volume_client: Preserve existing caps while authorize/deauthorize auth-id

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

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

4 years agopybind/ceph_volume_client: Disallow authorize auth_id
Ramana Raja [Wed, 25 Nov 2020 11:14:35 +0000 (16:44 +0530)]
pybind/ceph_volume_client: Disallow authorize auth_id

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

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

4 years agopybind/ceph_volume_client: Fix PEP-8 SyntaxWarning
Đặng Minh Dũng [Sun, 10 May 2020 04:37:23 +0000 (11:37 +0700)]
pybind/ceph_volume_client: Fix PEP-8 SyntaxWarning

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

4 years agomgr/ActivePyModules.cc: don't log config value in get_typed_config 38614/head
Neha Ojha [Thu, 3 Dec 2020 21:54:23 +0000 (21:54 +0000)]
mgr/ActivePyModules.cc: don't log config value in get_typed_config

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

4 years agomon/ConfigMonitor.cc: don't log config values in refresh_config
Neha Ojha [Thu, 3 Dec 2020 21:00:51 +0000 (21:00 +0000)]
mon/ConfigMonitor.cc: don't log config values in refresh_config

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

 Conflicts:
src/mon/ConfigMonitor.cc - trivial resolution

4 years agomgr: don't add config values to mgr log in config_callback and module_config
Neha Ojha [Thu, 3 Dec 2020 20:34:53 +0000 (20:34 +0000)]
mgr: don't add config values to mgr log in config_callback and module_config

The original code has been commented out and left for future debugging
purposes.

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

 Conflicts:
src/mgr/PyModuleRegistry.cc - maintain dout level

4 years agomon/ConfigMonitor.cc: don't dump all keys and values in config map
Neha Ojha [Thu, 3 Dec 2020 20:33:20 +0000 (20:33 +0000)]
mon/ConfigMonitor.cc: don't dump all keys and values in config map

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

4 years agomon: don't log "config set" and "config-key set" dispatch and finished messages
Neha Ojha [Thu, 3 Dec 2020 19:24:39 +0000 (19:24 +0000)]
mon: don't log "config set" and "config-key set" dispatch and finished messages

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

4 years agomessages/MMonCommand, MMonCommandAck: don't log values for "config set" and "config...
Neha Ojha [Thu, 3 Dec 2020 19:18:04 +0000 (19:18 +0000)]
messages/MMonCommand, MMonCommandAck: don't log values for "config set" and "config-key set"

This acts like a big hammer to avoid adding sensitive information, like passwords
into mon/mgr/cluster logs when using "config set" and "config-key set" to set keys
whose values should be secure.

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

 Conflicts:
src/messages/MMonCommand.h - trivial resolution
src/messages/MMonCommandAck.h - trivial resolution

4 years agorgw: keep syncstopped flag when copying bucket shard headers 38589/head
Ilsoo Byun [Thu, 29 Oct 2020 08:10:45 +0000 (17:10 +0900)]
rgw: keep syncstopped flag when copying bucket shard headers

Fixes: https://tracker.ceph.com/issues/48037
Signed-off-by: Ilsoo Byun <ilsoobyun@linecorp.com>
(cherry picked from commit 5a94be030b67085ef08c7b3a4450d3d19420a9c4)

4 years agoMerge pull request #38310 from ifed01/wip-ifed-finer-mempool-granularity-nau
Yuri Weinstein [Mon, 14 Dec 2020 18:55:25 +0000 (10:55 -0800)]
Merge pull request #38310 from ifed01/wip-ifed-finer-mempool-granularity-nau

nautilus: os/bluestore: mempool's finer granularity + adding missed structs

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
4 years agoMerge pull request #37589 from kamoltat/wip-ksirivad-nautilus-backports
Yuri Weinstein [Mon, 14 Dec 2020 18:54:30 +0000 (10:54 -0800)]
Merge pull request #37589 from kamoltat/wip-ksirivad-nautilus-backports

nautilus: mgr/progress: make it so progress bar does not get stuck forever

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #38404 from callithea/wip-48344-nautilus
Ernesto Puerta [Mon, 14 Dec 2020 10:49:41 +0000 (11:49 +0100)]
Merge pull request #38404 from callithea/wip-48344-nautilus

nautilus: mgr/dashboard: Disable sso without python3-saml

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
4 years agoglobal/global_init: do first transport connection after setuid() 38558/head
Roman Penyaev [Tue, 30 Apr 2019 15:43:01 +0000 (17:43 +0200)]
global/global_init: do first transport connection after setuid()

uverbs kernel module forbids access to a file descriptor after credentials
change, that leads to -EACCESS on each following ibv_*() call.

Why it matters?  Infiniband transport stops working after the following
syscalls:

  o setuid()
  o fork()

Originally the problem was described here [1] and here [2].

This patch targets only setuid() syscall and moves the first transport
initialization after setuid() has been done.

fork() is used to daemonize ceph services (when systemd is not used
for any reason) and probably the easiest way is to rip the whole lagacy
daemonization code out, so this patch does not target this problem.

[1] https://tracker.ceph.com/issues/39238
[2] https://www.spinics.net/lists/ceph-devel/msg45083.html

Signed-off-by: Roman Penyaev <rpenyaev@suse.de>
(cherry picked from commit 02c0a20a09fc8f678d0f9caf7f580b3dbc1f0f91)

4 years agotools/ceph_conf: send help to cout in case of '--help'
Kefu Chai [Tue, 16 Jul 2019 06:53:57 +0000 (14:53 +0800)]
tools/ceph_conf: send help to cout in case of '--help'

we should not write to cerr if use asks for help message explicitly

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

4 years agotools/ceph_conf: use std::quoted()
Kefu Chai [Tue, 16 Jul 2019 06:52:12 +0000 (14:52 +0800)]
tools/ceph_conf: use std::quoted()

* use std::quoted() for better readability
* use string literals to avoid escapings which are distrating.

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

4 years agotools/ceph_conf: do not "exit(1)" in usage()
Kefu Chai [Tue, 16 Jul 2019 03:52:47 +0000 (11:52 +0800)]
tools/ceph_conf: do not "exit(1)" in usage()

we always return right after calling `usage()`, there is no need to
`exit(1)` in usage. and more importantly, we should not `exit(1)` if use
asks for `help` by using `ceph-conf <path> help`.

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

4 years agotools/ceph_conf: replace exit(n) with "return n"
Kefu Chai [Tue, 16 Jul 2019 03:49:32 +0000 (11:49 +0800)]
tools/ceph_conf: replace exit(n) with "return n"

a step to the leak-free `main()`, as we use a smart pointer to manage
the lifecycle of `cct`, it'd be better to let the RAII to do its job.

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

4 years agotools/ceph_conf: s/global_pre_init/global_init/
Kefu Chai [Tue, 16 Jul 2019 03:34:23 +0000 (11:34 +0800)]
tools/ceph_conf: s/global_pre_init/global_init/

we switched over from `global_init()` to `global_pre_init()` in
fc1a424e837bee139726eec333c9efd65e2abb6a to address
http://tracker.ceph.com/issues/7849 .

but this change prevents us from moving the
`mc_bootstrap.get_monmap_and_config()` call from `global_pre_init()` to
`global_init()`, as the call utilizes the transport layer. see
https://tracker.ceph.com/issues/39238.

so it'd better to avoid accessing a previously opened fd after
credentials change.

in this change,

* a default "log_to_file"="false" setting is passed to
  `global_init()` to disable the logging subsystem from creating a log
  file.
* use a lambda for initializing `cct`, so no need to have a copy of the
  original args
* remove `apply_changes()` and `complain_about_parse_error()` calls,
  as they are already taken care of by `global_init()`.

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

 Conflicts:
src/tools/ceph_conf.cc: Trivial function name change

4 years agorgw: Disable prefetch of entire head object when GET request with range header 38556/head
Or Friedmann [Sun, 8 Mar 2020 13:34:48 +0000 (15:34 +0200)]
rgw: Disable prefetch of entire head object when GET request with range header

Disable prefetch of entire head object when GET request with range header.
The current behavior for the RGW is getting the whole object although the client asked only for a small bytes offset.
For example: If the client asked for bytes=0-1, The RGW will anyway fetch 0-4194304

Fixes: https://tracker.ceph.com/issues/44508
Signed-off-by: Or Friedmann <ofriedma@redhat.com>
(cherry picked from commit 2be5af0006169cb54547034aa98b7eacb8751d59)

4 years agoMerge pull request #38354 from ifed01/wip-ifed-fix-statfs-out-nau
Yuri Weinstein [Fri, 11 Dec 2020 20:00:50 +0000 (12:00 -0800)]
Merge pull request #38354 from ifed01/wip-ifed-fix-statfs-out-nau

nautilus: mgr: don't update osd stat which is already out

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #38334 from b-ranto/wip-prom-fixes-nautilus
Yuri Weinstein [Fri, 11 Dec 2020 20:00:29 +0000 (12:00 -0800)]
Merge pull request #38334 from b-ranto/wip-prom-fixes-nautilus

nautilus: mgr/prometheus: Make module more stable

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #38085 from orztt/wip-rgw-versioning-nautilus
Yuri Weinstein [Fri, 11 Dec 2020 19:59:16 +0000 (11:59 -0800)]
Merge pull request #38085 from orztt/wip-rgw-versioning-nautilus

nautilus: rgw: cls/rgw/cls_rgw.cc: fix multiple lastest version problem

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #37895 from smithfarm/wip-48040-nautilus
Yuri Weinstein [Fri, 11 Dec 2020 19:58:31 +0000 (11:58 -0800)]
Merge pull request #37895 from smithfarm/wip-48040-nautilus

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

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agoqa/mgr/test_progress: fix bug 48217 37589/head
Kamoltat [Mon, 16 Nov 2020 08:52:12 +0000 (08:52 +0000)]
qa/mgr/test_progress: fix bug 48217

Fixes a failing test case regarding osd coming back
after being marked out. The old test case wasn't accounting
for a specific event, therefore this resulted in the failure.
The fix basically accounts for a specific event of osd being
marked in/out.

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

Conflicts:
qa/tasks/mgr/test_progress.py - trivial fix

4 years agomgr/dashboard: test_standby* (tasks.mgr.test_dashboard.TestDashboard) failed locally 38527/head
Volker Theile [Thu, 3 Dec 2020 13:58:10 +0000 (14:58 +0100)]
mgr/dashboard: test_standby* (tasks.mgr.test_dashboard.TestDashboard) failed locally

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

4 years agomgr/dashboard: Adding the alert bad certificate error to the ssl providers error 38509/head
Nizamudeen A [Tue, 8 Dec 2020 14:35:28 +0000 (20:05 +0530)]
mgr/dashboard: Adding the alert bad certificate error to the ssl providers error

upstream tracked in https://github.com/cherrypy/cheroot/pull/348
Fixes: https://tracker.ceph.com/issues/48490
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit 4cbe89f4db8ed13b2be46f2563c9d9618b0cf52b)

4 years agomgr/dashboard: Updating the inbuilt ssl providers error
Nizamudeen A [Tue, 8 Dec 2020 10:22:46 +0000 (15:52 +0530)]
mgr/dashboard: Updating the inbuilt ssl providers error

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

4 years agomgr/dashboard: remove pyOpenSSL version pinning 38504/head
Kiefer Chang [Wed, 9 Dec 2020 07:55:24 +0000 (15:55 +0800)]
mgr/dashboard: remove pyOpenSSL version pinning

Tests require a newer version of pyOpenSSL.

Fixes: https://tracker.ceph.com/issues/48506
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit 2695075c4b2fc69735a834c49f6f8e768de4f85c)

Conflicts:
src/pybind/mgr/dashboard/requirements.txt
 - This manual change was required in order to get the
   backport working in nautilus

4 years agorgw: in ordered bucket listing skip namespaced entries when possible 38493/head
J. Eric Ivancich [Fri, 4 Dec 2020 23:16:08 +0000 (18:16 -0500)]
rgw: in ordered bucket listing skip namespaced entries when possible

When listing non-namespaced entries in the bucket index, the code
would march through the namespaced entries in blocks, requesting all
of them from the CLS layer. When there were many namespaced entries,
it would significantly affect the performance of ordered listing.

This commit adds code to advance the marker passed to lower layers to
skip past namespaced entries. This is challenging in that
non-namespaced entries can appear in the middle of the namespaced
entries. We'll ignore the issue instance tags in names to simplify the
following discussion. Non-namespaced entries are indexed by
"name". Namespaced entries are indexed by _namespace_name, using
underscores to surround the namespace. The challenge comes with
entries such as "_name", where the name begins with an underscore. In
that case we index them by "__name", quoting the underscore with
another.

Now the extra challenge comes due to the lexic ordering of the
following:

    ASP
    _BAT_cat
    __DOG
    _eel_FOX
    goat

Note that the namespaced entries are in positions 2 and 4, and the
non-namespaced entries are in positions 1, 3, and 5. So when skipping
past the namespaced entries, we have to be careful not to skip past
the non-namespaced entries that begin with underscore.

Additional code clean-ups done as well.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
Resolves: rhbz#1883283
(cherry picked from commit acfa6409597768b3c1dc8dcab3668d23761a4cbc)

4 years agodoc/osd-config-ref: adjust default value for osd_delete_sleep_hybrid 38478/head
Igor Fedotov [Mon, 16 Nov 2020 18:55:07 +0000 (21:55 +0300)]
doc/osd-config-ref: adjust default value for osd_delete_sleep_hybrid

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

4 years agodoc/rados/configuration/osd-config-ref.rst: document osd_delete_sleep
Neha Ojha [Fri, 28 Jun 2019 00:21:58 +0000 (17:21 -0700)]
doc/rados/configuration/osd-config-ref.rst: document osd_delete_sleep

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

4 years agoosd: adjust osd_delete_sleep_ssd[_hybrid]
Igor Fedotov [Tue, 29 Sep 2020 17:37:33 +0000 (20:37 +0300)]
osd: adjust osd_delete_sleep_ssd[_hybrid]

1) Do not differentiate all-flash and hybrid(ssd+hdd) deployments since
they both bound to SSD drive backing DB volume.
2) Drop osd_delete_sleep_hybrid from 2s to 1s
3) Raise osd_delete_sleep_ssd to 1s since 0 is a way too low - having
it that low tend to cause a significant negative imact on OSD's regular
operation.

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

4 years agoos/bluestore: introduce removal perf counter
Igor Fedotov [Fri, 4 Sep 2020 10:17:54 +0000 (13:17 +0300)]
os/bluestore: introduce removal perf counter

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

4 years agoos/bluestore: track kv utilization in kv_sync_thread
Igor Fedotov [Fri, 14 Jun 2019 11:04:33 +0000 (14:04 +0300)]
os/bluestore: track kv utilization in kv_sync_thread

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

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

4 years agoos/bluestore: perf counters for omap_get_keys[_get_values]
Igor Fedotov [Wed, 2 Sep 2020 11:44:07 +0000 (14:44 +0300)]
os/bluestore: perf counters for omap_get_keys[_get_values]

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

 Conflicts:
src/os/bluestore/BlueStore.cc
 Legacy locking in use.

4 years agoosd/pg: use next when calling collection_list for pg removal
Igor Fedotov [Fri, 28 Aug 2020 19:10:56 +0000 (22:10 +0300)]
osd/pg: use next when calling collection_list for pg removal

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

 Conflicts:
src/crimson/osd/pg.cc
src/crimson/osd/pg.h
src/osd/PG.cc
src/osd/PG.h
src/osd/PeeringState.cc
src/osd/PeeringState.h
 Legacy design for Deleting peering stat.

4 years agoos/bluestore: fix inappropriate ENOSPC from avl/hybrid allocator 38475/head
Igor Fedotov [Thu, 3 Dec 2020 19:08:43 +0000 (22:08 +0300)]
os/bluestore: fix inappropriate ENOSPC from avl/hybrid allocator

Under high fragmentation circumstances (in best-fit mode) these allocators might fail to
return continuous(longer than a single alloc unit) extents. Occurs when
requested size is longer than the maximum available extents and these
extents are unaligned with alloc unit. The latter results in the actual lengths of these extens are shorter
than the requested length and they do not match to the lookup. Which
finally causes no allocation at all.

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

 Conflicts:
src/test/objectstore/Allocator_test.cc
 Legacy gtest macros name

4 years agoclient: do not use g_conf().get_val<>() in libcephfs 38467/head
Xiubo Li [Thu, 12 Nov 2020 01:13:45 +0000 (09:13 +0800)]
client: do not use g_conf().get_val<>() in libcephfs

The g_conf() will try to dereference the "g_ceph_context" to get
the "_conf", but the "g_ceph_context" won't be set in none fuse
use case in libcephfs, so it will crash in when doing
g_conf().get_val<>.

Switch to use cct->_conf.get_val<> instead.

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

4 years agomgr/prometheus: don't store exception as e 38334/head
Ken Dreyer [Thu, 3 Dec 2020 17:48:06 +0000 (10:48 -0700)]
mgr/prometheus: don't store exception as e

Python's logging module's exception() method will log the full exception
and stack trace for us, so we do not need to store the exception in the
"e" variable here.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit a17c603effd3367dc64c87a1d6c53d6d3d794fc7)

4 years agoMerge pull request #38416 from kamoltat/wip-fix-bug-48434
Yuri Weinstein [Fri, 4 Dec 2020 15:34:17 +0000 (07:34 -0800)]
Merge pull request #38416 from kamoltat/wip-fix-bug-48434

nautilus: mgr/progress: delete all events over the wire

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
4 years agoMerge pull request #38411 from dzafman/wip-48444
David Zafman [Fri, 4 Dec 2020 00:14:10 +0000 (16:14 -0800)]
Merge pull request #38411 from dzafman/wip-48444

nautilus: osd: Check for nosrub/nodeep-scrub in between chunks, to avoid races

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agolibrbd: ensure that thread pool lock is held when processing throttled IOs 37895/head
Jason Dillaman [Fri, 11 Sep 2020 19:20:45 +0000 (15:20 -0400)]
librbd: ensure that thread pool lock is held when processing throttled IOs

There previously was a potential race for throttled IOs to complete prior
to the main worker thread finishing the processing of the blocked IO.

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

Conflicts:
    src/test/librbd/io/test_mock_ImageRequestWQ.cc
- in Octopus, commit 792d6c53fedc695199cc18916347c1b545fe42c2 did a global
  replace of Mutex to ceph::mutex, so to fix this for Nautilus, we just need to
  do that in test_mock_ImageRequestWQ.cc since the get_pool_lock() method is
  returning a Mutex instead of a ceph::mutex

4 years agoMerge pull request #37959 from callithea/wip-47995-nautilus
Ernesto Puerta [Thu, 3 Dec 2020 15:28:34 +0000 (16:28 +0100)]
Merge pull request #37959 from callithea/wip-47995-nautilus

nautilus: monitoring: Use null yaxes min for OSD read latency

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Patrick Seidensal <pseidensal@suse.com>
4 years agomgr/progress: 'progress clear' command should clear events in 'ceph -s' 38416/head
Sage Weil [Tue, 18 Feb 2020 22:09:42 +0000 (16:09 -0600)]
mgr/progress: 'progress clear' command should clear events in 'ceph -s'

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

4 years agoosd: Check for nosrub/nodeep-scrub in between chunks, to avoid races 38411/head
David Zafman [Tue, 24 Nov 2020 23:23:20 +0000 (15:23 -0800)]
osd: Check for nosrub/nodeep-scrub in between chunks, to avoid races

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

Conflicts:
src/osd/PG.cc (manual merge due to code rearrangement)

4 years agomgr/dashboard: Disable sso without python3-saml 38404/head
Kevin Meijer [Sat, 14 Nov 2020 18:44:07 +0000 (19:44 +0100)]
mgr/dashboard: Disable sso without python3-saml

Removed the requirement for the python3-saml package when wanting to disable SSO for the dashboard, this is currently relevant since the official container that runs Ceph mgr does not have this package installed.
So when upgrading from an older, non-containerized version, you would be stuck using a non-functional dashboard.

This pull requests changes that and allows the ceph dashboard sso disable command without the requirement of the library so that we SSO can always be disabled again.

Fixes: https://tracker.ceph.com/issues/48237 Signed-off-by: Kevin Meijer <admin@kevinmeijer.nl>
(cherry picked from commit 0c18437d2c786ef1ade8b89e42dbf4b0e163aafe)

4 years agoMerge pull request #38362 from badone/wip-nautilus-mon-scrub-testing
Brad Hubbard [Wed, 2 Dec 2020 09:42:23 +0000 (19:42 +1000)]
Merge pull request #38362 from badone/wip-nautilus-mon-scrub-testing

nautilus: mon scrub testing

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge PR #38372 into nautilus
Jan Fajerski [Wed, 2 Dec 2020 09:33:52 +0000 (10:33 +0100)]
Merge PR #38372 into nautilus

* refs/pull/38372/head:
ceph-volume: implement the --log-level flag

Reviewed-by: Rishabh Dave <ridave@redhat.com>
4 years agoMerge PR #38371 into nautilus
Jan Fajerski [Wed, 2 Dec 2020 09:33:16 +0000 (10:33 +0100)]
Merge PR #38371 into nautilus

* refs/pull/38371/head:
lvm/create.py: fix a typo in the help message

Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Yuri Weinstein <yweins@redhat.com>
4 years agoMerge pull request #38382 from badone/wip-nautilus-run-tox-mgr-insights-six-missing
Kefu Chai [Wed, 2 Dec 2020 09:29:09 +0000 (17:29 +0800)]
Merge pull request #38382 from badone/wip-nautilus-run-tox-mgr-insights-six-missing

nautilus: mgr/insights: Test environment requires 'six'

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agomgr/insights: Test environment requires 'six' 38382/head
Brad Hubbard [Wed, 2 Dec 2020 05:24:16 +0000 (15:24 +1000)]
mgr/insights: Test environment requires 'six'

Not a backport because python2 support was dropped in master and only
nautilus seems to be affected at this time.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
4 years agocls/rgw/cls_rgw.cc: fix multiple lastest version problem 38085/head
Ruan Zitao [Wed, 21 Oct 2020 03:06:40 +0000 (11:06 +0800)]
cls/rgw/cls_rgw.cc: fix multiple lastest version problem

Fixes: https://tracker.ceph.com/issues/47919
Signed-off-by: Ruan Zitao <ruanzitao@kuaishou.com>
Signed-off-by: Yang Honggang <yanghonggang@kuaishou.com>
(cherry picked from commit f60f9ace1a4bceeda256373cf4603058e1947fa8)

Conflicts:
      src/cls/rgw/cls_rgw.cc
- nautilus does not have "rgw_bucket_dir_entry::FLAG_VER"; use "RGW_BUCKET_DIRENT_FLAG_VER" instead

4 years agoqa/suites/rados/monthrash: Exercise mon scrub error injectors 38362/head
Brad Hubbard [Wed, 11 Nov 2020 01:58:01 +0000 (11:58 +1000)]
qa/suites/rados/monthrash: Exercise mon scrub error injectors

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit a5bcca7f415790521a76213620ae079318e7bee1)

 Conflicts:
qa/suites/rados/monthrash/ceph.yaml - whitelist vs. ignorelist

4 years agoceph-volume: implement the --log-level flag 38372/head
Andrew Schoen [Thu, 29 Oct 2020 19:11:14 +0000 (14:11 -0500)]
ceph-volume: implement the --log-level flag

The --log-level flag was being ignored and
the file log level was always set to DEBUG.

Fixes: https://tracker.ceph.com/issues/48045
Resolves: rhbz#1867717

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit ecbd6c13f116b390c782c9ae14b5becd0bdecc8e)

4 years agolvm/create.py: fix a typo in the help message 38371/head
ZhenLiu94 [Thu, 12 Nov 2020 02:11:06 +0000 (10:11 +0800)]
lvm/create.py: fix a typo in the help message
ceph_volume/devices/lvm/create.py:corrected typo of the word when using ceph-volume lvm create -h

Fixes: https://tracker.ceph.com/issues/48273
Signed-off-by: ZhenLiu94 <zhenliu94@163.com>
(cherry picked from commit e3c7d6ff4cec80ee0135abb50d795411c5dc2283)

4 years agoMerge PR #38279 into nautilus
Jan Fajerski [Tue, 1 Dec 2020 16:30:20 +0000 (17:30 +0100)]
Merge PR #38279 into nautilus

* refs/pull/38279/head:
ceph-volume batch: reject partitions in argparser

Reviewed-by: Rishabh Dave <ridave@redhat.com>