]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 years agocrush/CrushWrapper: rebuild reverse maps after rebuilding crush map 39197/head
Jason Dillaman [Tue, 14 Jul 2020 22:49:30 +0000 (18:49 -0400)]
crush/CrushWrapper: rebuild reverse maps after rebuilding crush map

The Objecter will crash when localized reads are enabled and two threads
attempt to rebuild the (invalidated) reverse maps concurrently. This
should address the issue for the Objecter use-case without the need to
add additional locking.

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

4 years agoMerge pull request #39175 from rhcs-dashboard/49062-fix-iscsi-gw-add
Ernesto Puerta [Fri, 29 Jan 2021 18:35:09 +0000 (19:35 +0100)]
Merge pull request #39175 from rhcs-dashboard/49062-fix-iscsi-gw-add

nautilus mgr/dashboard: fix 'ceph dashboard iscsi-gateway-add'

Reviewed-by: Dimitri Savineau <dsavinea@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
4 years agonautilus mgr/dashboard: fix 'ceph dashboard iscsi-gateway-add' 39175/head
Alfonso Martínez [Fri, 29 Jan 2021 16:53:57 +0000 (17:53 +0100)]
nautilus mgr/dashboard: fix 'ceph dashboard iscsi-gateway-add'

Fixes: https://tracker.ceph.com/issues/49062
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
4 years agoMerge pull request #39090 from smithfarm/wip-48284-nautilus
Yuri Weinstein [Wed, 27 Jan 2021 23:52:22 +0000 (15:52 -0800)]
Merge pull request #39090 from smithfarm/wip-48284-nautilus

nautilus: rpm,deb: change sudoers file mode to 440

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #38950 from Vicente-Cheng/wip-48643-nautilus
Yuri Weinstein [Wed, 27 Jan 2021 19:20:23 +0000 (11:20 -0800)]
Merge pull request #38950 from Vicente-Cheng/wip-48643-nautilus

nautilus: cephfs: client: ensure we take Fs caps when fetching directory link count from cached inode

Reviewed-by: Ramana Raja <rraja@redhat.com>
4 years agoMerge pull request #38948 from Vicente-Cheng/wip-48641-nautilus
Yuri Weinstein [Wed, 27 Jan 2021 19:19:11 +0000 (11:19 -0800)]
Merge pull request #38948 from Vicente-Cheng/wip-48641-nautilus

nautilus: cephfs: client: set CEPH_STAT_RSTAT mask for dir in readdir_r_cb

Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
4 years agoMerge pull request #37936 from kotreshhr/wip-47823-nautilus
Yuri Weinstein [Wed, 27 Jan 2021 19:18:00 +0000 (11:18 -0800)]
Merge pull request #37936 from kotreshhr/wip-47823-nautilus

nautilus: mgr/volumes: Make number of cloner threads configurable

Reviewed-by: Ramana Raja <rraja@redhat.com>
4 years agoMerge pull request #38952 from smithfarm/wip-48887-nautilus
Yuri Weinstein [Wed, 27 Jan 2021 15:50:21 +0000 (07:50 -0800)]
Merge pull request #38952 from smithfarm/wip-48887-nautilus

nautilus: cmake: detect and use sigdescr_np() if available

Reviewed-by: David Disseldorp <ddiss@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
4 years agoMerge pull request #38833 from smithfarm/wip-48342-nautilus
Yuri Weinstein [Wed, 27 Jan 2021 15:48:23 +0000 (07:48 -0800)]
Merge pull request #38833 from smithfarm/wip-48342-nautilus

nautilus: pybind/mgr/rbd_support: delay creation of progress module events

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
4 years agoMerge pull request #39072 from smithfarm/wip-49002-nautilus
Nathan Cutler [Tue, 26 Jan 2021 18:22:40 +0000 (19:22 +0100)]
Merge pull request #39072 from smithfarm/wip-49002-nautilus

nautilus: test/run-cli-tests: use cram from github

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agorpm,deb: change sudoers file mode to 440 39090/head
David Turner [Tue, 10 Nov 2020 19:31:35 +0000 (14:31 -0500)]
rpm,deb: change sudoers file mode to 440

change sudoers file mode to 440 to match recommended defaults.

From the sudoers man page.

> the default file mode is 0440 (read‐able by owner and group, writable
by none).
> The default mode may be changed via the “sudoers_mode” option to the
sudoers
>  Plugin line in the sudo.conf(5) file.

Fixes: https://tracker.ceph.com/issues/48169
Signed-off-by: David Turner <drakonstein@gmail.com>
(cherry picked from commit 1de14c7f9bcaf94152c62b50c37f4a44b6445f58)

Conflicts:
debian/rules
- ignored extra lines introduced post-nautilus

4 years agotest/downloads: drop cram-0.5 tar ball 39072/head
Kefu Chai [Sat, 23 Jan 2021 18:13:31 +0000 (02:13 +0800)]
test/downloads: drop cram-0.5 tar ball

since we install cram from github, drop the tarball from repo

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

4 years agotest/run-cli-tests: use cram from github
Kefu Chai [Sat, 23 Jan 2021 18:12:31 +0000 (02:12 +0800)]
test/run-cli-tests: use cram from github

to address the failure of

  WARNING: Built wheel for cram is invalid: Metadata 1.2 mandates PEP 440 version, but '0.5.0ceph.2011-01-14' is not
Failed to build cram

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

4 years agoMerge pull request #38972 from rhcs-dashboard/wip-48927-nautilus
Ernesto Puerta [Thu, 21 Jan 2021 17:14:57 +0000 (18:14 +0100)]
Merge pull request #38972 from rhcs-dashboard/wip-48927-nautilus

nautilus: mgr/dashboard: add `--ssl` to `ng serve`

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
4 years agoMerge pull request #38813 from rhcs-dashboard/selection-regression
Ernesto Puerta [Thu, 21 Jan 2021 17:12:50 +0000 (18:12 +0100)]
Merge pull request #38813 from rhcs-dashboard/selection-regression

nautilus: mgr/dashboard: Fix for datatable item not showing details after getting selected

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
4 years agoMerge pull request #38818 from smithfarm/wip-44997-nautilus-fix
Yuri Weinstein [Thu, 21 Jan 2021 16:42:19 +0000 (08:42 -0800)]
Merge pull request #38818 from smithfarm/wip-44997-nautilus-fix

nautilus: rpm: ceph-mgr-dashboard recommends python3-saml on SUSE

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
4 years agoMerge pull request #38816 from smithfarm/wip-44364-nautilus-fixup
Yuri Weinstein [Thu, 21 Jan 2021 16:40:44 +0000 (08:40 -0800)]
Merge pull request #38816 from smithfarm/wip-44364-nautilus-fixup

nautilus: mgr/telemetry: fix proxy usage

Reviewed-by: Lars Marowsky-Bree <lmb@suse.com>
Reviewed-by: Yaarit Hatuka <yaarithatuka@gmail.com>
4 years agoMerge pull request #38760 from tchaikov/nautilus-38263
Yuri Weinstein [Wed, 20 Jan 2021 16:19:32 +0000 (08:19 -0800)]
Merge pull request #38760 from tchaikov/nautilus-38263

nautilus: cmake: define BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT for Boost.Asio users

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #38588 from smithfarm/wip-48100-nautilus
Yuri Weinstein [Wed, 20 Jan 2021 16:18:39 +0000 (08:18 -0800)]
Merge pull request #38588 from smithfarm/wip-48100-nautilus

nautilus: rgw: rgw-admin: fixes BucketInfo for missing buckets

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
4 years agomgr/dashboard: add `--ssl` to `ng serve` 38972/head
Tatjana Dehler [Tue, 12 Jan 2021 09:28:35 +0000 (10:28 +0100)]
mgr/dashboard: add `--ssl` to `ng serve`

Add the `--ssl` option to the `ng serve` command in order to
reflect the changes to the cookies (https://tracker.ceph.com/issues/44591)
and be able to log into the dashboard by using the development server.

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

 Conflicts:
src/pybind/mgr/dashboard/frontend/package.json
   - Adopted the master branch changes.

4 years agoMerge pull request #38828 from smithfarm/wip-48543-nautilus
Yuri Weinstein [Mon, 18 Jan 2021 16:29:03 +0000 (08:29 -0800)]
Merge pull request #38828 from smithfarm/wip-48543-nautilus

nautilus: rgw_file: return common_prefixes in lexical order

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #38827 from smithfarm/wip-48744-nautilus
Yuri Weinstein [Mon, 18 Jan 2021 16:28:37 +0000 (08:28 -0800)]
Merge pull request #38827 from smithfarm/wip-48744-nautilus

nautilus: rgw: distribute cache for exclusive put

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

nautilus: rgw: fix bucket limit check fill_status warnings

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #38823 from smithfarm/wip-48428-nautilus
Yuri Weinstein [Mon, 18 Jan 2021 16:27:41 +0000 (08:27 -0800)]
Merge pull request #38823 from smithfarm/wip-48428-nautilus

nautilus: rgw: avoid expiration early triggering caused by overflow

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #38822 from smithfarm/wip-48803-nautilus
Yuri Weinstein [Mon, 18 Jan 2021 16:27:05 +0000 (08:27 -0800)]
Merge pull request #38822 from smithfarm/wip-48803-nautilus

nautilus: rgw: cls/user: set from_index for reset stats calls

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #38623 from smithfarm/wip-48426-nautilus
Yuri Weinstein [Mon, 18 Jan 2021 16:26:34 +0000 (08:26 -0800)]
Merge pull request #38623 from smithfarm/wip-48426-nautilus

nautilus: rgw: S3 Put Bucket Policy should return 204 on success

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
4 years agoMerge pull request #38590 from smithfarm/wip-48346-nautilus
Yuri Weinstein [Mon, 18 Jan 2021 16:25:48 +0000 (08:25 -0800)]
Merge pull request #38590 from smithfarm/wip-48346-nautilus

nautilus: rgw: fix invalid payload issue when serving s3website error page

Reviewed-by: Casey Bodley <cbodley@redhat.com>
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 agoclient: when STATX_NLINK is requested request FsLs caps 38950/head
Jeff Layton [Fri, 20 Nov 2020 23:43:31 +0000 (18:43 -0500)]
client: when STATX_NLINK is requested request FsLs caps

We currently determine the getattr request mask prior to doing the
lookup, so we don't necessarily know whether the terminal entry is
a directory or something else.

Directory nlink count is governed by the dirstats, and those are
under Fs caps. Request both Fs and Ls if the request mask includes
STATX_NLINK.

Fixes: https://tracker.ceph.com/issues/48313
Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit e2ea2214cbb1ff4bd7332bb28db4f3477efb37df)

4 years agoclient: ensure we take Fs caps when querying dirstat vxattrs
Jeff Layton [Fri, 20 Nov 2020 15:39:58 +0000 (10:39 -0500)]
client: ensure we take Fs caps when querying dirstat vxattrs

Dirstats values are only updated when Fs caps are held, so ensure that
we request those caps in the _getattr call when querying for them.

Drop the old XATTR_NAME_CEPH helper and rename XATTR_NAME_CEPH2 to
XATTR_NAME_CEPH. Add a new VXATTR_DIRSTAT field and add that to all of
the dirstats vxattrs.

Fixes: https://tracker.ceph.com/issues/48313
Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit 3db582b1416dc170a0e25c957166d7bdc58e4c67)

Conflicts:
src/client/Client.cc
  - keep hidden because we still need it in nautilus
  - drop some code because we did not introduce the
            following features: ceph.mirror.info and rsnaps

4 years agoclient: set CEPH_STAT_RSTAT mask for dir in readdir_r_cb 38948/head
chencan [Sat, 21 Nov 2020 02:41:11 +0000 (10:41 +0800)]
client: set CEPH_STAT_RSTAT mask for dir in readdir_r_cb

Fixes: https://tracker.ceph.com/issues/48318
Signed-off-by: chencan <chen.can2@zte.com.cn>
(cherry picked from commit 8740414908625f58e1a719fa4fdfbe62ed42fada)

4 years agorgw : modify error message to NoSuchBucket when bucket doesn't exist in bucket info API 38588/head
cao.leilc [Tue, 3 Nov 2020 06:41:36 +0000 (14:41 +0800)]
rgw : modify error message to NoSuchBucket when bucket doesn't exist in bucket info API

Fixes: https://tracker.ceph.com/issues/48073
Signed-off-by: caolei <halei15848934852@163.com>
(cherry picked from commit bc5ef5c9cf0ea89fc028332c39766eb8e7e1bd0b)

Conflicts:
src/rgw/rgw_bucket.cc
- bucket.init() call has an additional argument in master

4 years agorgw: fixes BucketInfo for missing buckets
Nick Janus [Thu, 30 Apr 2020 16:22:33 +0000 (12:22 -0400)]
rgw: fixes BucketInfo for missing buckets

The admin api BucketInfo endpoint should now return 404 for buckets that
are not found where only the bucket name is passed as a parameter.

Fixes: https://tracker.ceph.com/issues/45193
Signed-off-by: Nick Janus <njanus@digitalocean.com>
(cherry picked from commit d70ca81502d25bd7a76dd2ed2a538bf5e6584822)

Conflicts:
        src/rgw/rgw_bucket.cc
- omitted null_yield parameter from bucket.init() call for nautilus purposes

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 agomgr/dashboard: Fix for datatable item not showing details after getting selected 38813/head
Nizamudeen A [Fri, 8 Jan 2021 07:37:27 +0000 (13:07 +0530)]
mgr/dashboard: Fix for datatable item not showing details after getting selected

**Regression in nautilus**

Datatable items are not showing the details even if an item in the list is selected. This is happening because of this backport (https://github.com/ceph/ceph/pull/37756/files) which backports the line this.selection.selected = $event['selected']; but this feature was not implemented in the nautilus branch originally.

Fixes: https://tracker.ceph.com/issues/48796
Signed-off-by: Nizamudeen A <nia@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 agopybind/mgr/rbd_support: delay creation of progress event 38833/head
Jason Dillaman [Thu, 19 Nov 2020 20:59:34 +0000 (15:59 -0500)]
pybind/mgr/rbd_support: delay creation of progress event

Create the progress module event upon receipt of the first
progress callback from the librbd API. This will help to ensure
that all prereqs have been validated for retryable errors like
scheduling an image to be removed while it still has attached
cloned children.

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

Conflicts:
        src/pybind/mgr/rbd_support/task.py
- file does not exist in nautilus: applied the changes manually

4 years agopybind/mgr/rbd_support: include retryable error message in task
Jason Dillaman [Thu, 19 Nov 2020 21:08:22 +0000 (16:08 -0500)]
pybind/mgr/rbd_support: include retryable error message in task

If a retryable error occurs, include the reason message in the
task JSON structure that is exposed via the "rbd task list"
MGR command.

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

Conflicts:
        src/pybind/mgr/rbd_support/task.py
- file does not exist in nautilus: applied the changes manually

4 years agopybind/mgr/rbd_support: add linear backoff to retried tasks
Jason Dillaman [Thu, 19 Nov 2020 20:25:52 +0000 (15:25 -0500)]
pybind/mgr/rbd_support: add linear backoff to retried tasks

When a task fails but will be retried, linearly increase the
delay for the next retry up to a maximum of 5 minutes.

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

Conflicts:
        src/pybind/mgr/rbd_support/task.py
- file does not exist in nautilus: applied the changes manually

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 agorgw_file: return common_prefixes in lexical order 38828/head
Matt Benjamin [Fri, 8 Jan 2021 18:23:56 +0000 (13:23 -0500)]
rgw_file: return common_prefixes in lexical order

Since inception RGWReaddirRequest has sent all leaf objects first
(in lexical order), then common_prefixes (in lexical order). In
hindsight, an overall listing could trivially be returned out of
lexical order, which can cause continued listing of large, mixed
directories to fail.

RCA by Dan Gryniewicz.

Fixes: https://tracker.ceph.com/issues/48410
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit e561e98e5cca2678854e01c990f95e474022b7ed)

Conflicts:
        src/rgw/rgw_file.h

4 years agorgw: distribute cache for exclusive put 38827/head
Or Friedmann [Wed, 16 Dec 2020 16:09:24 +0000 (18:09 +0200)]
rgw: distribute cache for exclusive put

Distribute cache for exclusive put

Fixes: https://tracker.ceph.com/issues/48632
Thanks to Casey Bodley for finding the solution

Signed-off-by: Or Friedmann <ofriedma@redhat.com>
(cherry picked from commit 4fb51bc125b4ec23c2f47e7326d67f885f7d268c)

Conflicts:
src/rgw/services/svc_notify.cc
- robust_notify() call has different argument list in nautilus
src/rgw/services/svc_sys_obj_cache.cc
- distribute_cache() call has different argument list in nautilus

4 years agorgw: fix bucket limit check fill_status warnings 38825/head
Paul Emmerich [Tue, 11 Jun 2019 12:10:55 +0000 (14:10 +0200)]
rgw: fix bucket limit check fill_status warnings

all variables in the calculation where ints, so the warning would
only ever trigger if objects_per_shard == limit_objects and the
percentage for > 100% used a granularity of 100%

Fixes: http://tracker.ceph.com/issues/40255
Signed-off-by: Paul Emmerich <paul.emmerich@croit.io>
(cherry picked from commit 694076419e6f20d1ed6c95b4b1ff94f134a10d4d)

4 years agorgw: change the format of the cast 38823/head
jiahuizeng [Mon, 30 Dec 2019 11:25:36 +0000 (11:25 +0000)]
rgw: change the format of the cast

Signed-off-by: jiahuizeng <jhzeng93@foxmail.com>
(cherry picked from commit c44a335aeae3f830ff70fe9b4ed04b53f32c07d6)

Conflicts:
src/rgw/rgw_lc.cc
- make_timespan() call in s3_expiration_header is different in nautilus

4 years agorgw: avoid expiration early triggering caused by overflow
jiahuizeng [Tue, 5 Nov 2019 02:48:51 +0000 (10:48 +0800)]
rgw: avoid expiration early triggering caused by overflow

Fixes: https://tracker.ceph.com/issues/42634
Signed-off-by: jiahuizeng <jhzeng93@foxmail.com>
(cherry picked from commit 260df7dfd819a4117ae76aaf699370afda653baf)

Conflicts:
src/rgw/rgw_lc.cc
- make_timespan() call in s3_expiration_header is different in nautilus

4 years agorgw: cls/user: set from_index for reset stats calls 38822/head
Abhishek Lekshmanan [Mon, 23 Nov 2020 15:23:37 +0000 (16:23 +0100)]
rgw: cls/user: set from_index for reset stats calls

Fixes: https://tracker.ceph.com/issues/48327
Signed-off-by: Mykola Golub <mgolub@suse.com>
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 8dd07c8d185d18c34525c9ed8aca4d62e976a675)

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 agorpm: ceph-mgr-dashboard recommends python3-saml on SUSE 38818/head
Nathan Cutler [Fri, 8 Jan 2021 15:16:17 +0000 (16:16 +0100)]
rpm: ceph-mgr-dashboard recommends python3-saml on SUSE

This commit is not cherry-picked from master because it is fixing an incomplete
backport.

The master commit

    d8d3b33633c0a995aef034fdabc55d47c3872566
    rpm: add python3-saml as install dependency

added a line

    Recommends:     python%{python3_pkgversion}-python3-saml

which was intentionally omitted from the nautilus cherry-pick because this
package (python3-python3-saml) was not available in SLE-15-SP1/SES6. In
the meantime, the package has been made available there, so the line can
now be backported to nautilus.

Fixes: 59f704bfd94728f350e5a6fc6f54416fb5534eeb
Signed-off-by: Nathan Cutler <ncutler@suse.com>
4 years agomgr/telemetry: fix proxy usage 38816/head
Nathan Cutler [Fri, 8 Jan 2021 13:25:33 +0000 (14:25 +0100)]
mgr/telemetry: fix proxy usage

This nautilus-only commit is not cherry-picked from master because it fixes an
incomplete nautilus backport.

Commit

    5d7c79b079827dffdabf78bd18c2930cfed92286
    mgr/telemetry: fix and document proxy usage

targeting master was initially backported to nautilus by

    21b00799948f0863e169d45415fcc5dfb0fac02d

However, this initial backport omitted the "fix" part.

Fixes: 21b00799948f0863e169d45415fcc5dfb0fac02d
Signed-off-by: Nathan Cutler <ncutler@suse.com>
4 years agocmake: define BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT for Boost.Asio users 38760/head
Kefu Chai [Tue, 24 Nov 2020 06:12:54 +0000 (14:12 +0800)]
cmake: define BOOST_ASIO_USE_TS_EXECUTOR_AS_DEFAULT for Boost.Asio users

see also
https://www.boost.org/doc/libs/1_74_0/doc/html/boost_asio/std_executors.html#boost_asio.std_executors.polymorphic_i_o_executor

we could use `asio::any_io_executor` later on though for better
performance.

also, define CMP0093, so FindBoost reports Boost_VERSION in x.y.z
format. it is simpler to use `VERSION_GREATER_EQUAL` to compare its
version with 1.74 instead of its C macro version ("107000").

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

Conflicts:
CMakeLists.txt
src/librbd/CMakeLists.txt: change ""Boost_VERSION
VERSION_GREATER_EQUAL "1.74" to "Boost_VERSION VERSION_GREATER
1.73" as "VERSION_GREATER_EQUAL" was introduced in a newer version of
CMake, which is not available in ubuntu/xenial.
src/rgw/CMakeLists.txt: add the same macro definition applied to
          librbd. without which, src/rgw/rgw_sync_module_aws.cc
          still fails to compile with boost 1.74

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/volumes: Make number of cloner threads configurable 37936/head
Kotresh HR [Tue, 4 Aug 2020 07:57:53 +0000 (13:27 +0530)]
mgr/volumes: Make number of cloner threads configurable

The number of cloner threads is set to 4 and it can't be
configured. This patch makes the number of cloner threads
configurable via the mgr config option "max_concurrent_clones".

On an increase in number of cloner threads, it will just
spawn the difference of threads between existing number of
cloner threads and the new configuration. It will not cancel
the running cloner threads.

On decrease in number of cloner threads, the cases are as follows.

1. If all cloner threads are waiting for the job:
      In this case, all threads are notified and required number
   threads are terminated.

2. If all the cloner threads are processing a job:
      In this case, the condition is validated for each thread after
   the current job is finished and the thread is termianted if the
   condition for required number of cloner threads is not satisified.

3. If few cloner threads are processing and others are waiting:
      The threads which are waiting are notified to validate the
   number of threads required. If terminating those doesn't satisfy the
   required number of threads, the remaining threads are terminated
   upon completion of existing job.

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

Conflicts:
    src/pybind/mgr/volumes/fs/volume.py
     - keep connection_pool because nautilus does not introduce
       the CephfsClient
    src/pybind/mgr/volumes/module.py
     - Remove nfs export related things as nautilus doesn't contains NFSExport, FSExport class
    qa/tasks/cephfs/test_volumes.py
     - nautilus expects particular 'mgr.id', hence used 'mgr.x' instead of 'mgr'

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 agorgw: S3 Put Bucket Policy should return 204 on success 38623/head
Matthew Oliver [Thu, 14 May 2020 01:31:56 +0000 (11:31 +1000)]
rgw: S3 Put Bucket Policy should return 204 on success

Currently RGW returns a 200 on a successful PUT on a bucket policy but
the S3 api extects a 204, which makes sense as it's a success without
any contect returned:

   https://docs.aws.amazon.com/AmazonS3/latest/API/RESTBucketPUTpolicy.html

The sample response in the example above is a 204.

This patch checks the op_ret in `RGWPutBucketPolicy::send_response()`
and on a success we turn it to a 204 (or STATUS_NO_CONTENT).

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

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: fix invalid payload issue when serving s3website error page 38590/head
Ilsoo Byun [Mon, 2 Nov 2020 07:10:44 +0000 (16:10 +0900)]
rgw: fix invalid payload issue when serving s3website error page

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

Conflicts:
src/rgw/rgw_rest_s3.cc
- RGWHandler_REST_S3Website::serve_errordoc() takes different arguments in
  nautilus