]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 years agokrbd: check device node accessibility only if we actually mapped 39968/head
Ilya Dryomov [Mon, 15 Mar 2021 19:30:07 +0000 (20:30 +0100)]
krbd: check device node accessibility only if we actually mapped

Fix a braino that came with commit f6854ac65d2a ("krbd: make sure the
device node is accessible after the mapping").

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

4 years agokrbd: make sure the device node is accessible after the mapping
Ilya Dryomov [Fri, 19 Feb 2021 15:47:17 +0000 (16:47 +0100)]
krbd: make sure the device node is accessible after the mapping

We have always assumed this to be the case and users' scripts and
orchestration tools have grown to depend on this.  Let's add some
enforcement, prompted by [1]:

  "I am running my Kubernetes worker node inside of an LXC container
   which doesn't benefit from the device node created by the kernel, so
   I'm using udev to create the /dev/rbd* device nodes inside of the LXC
   container."

which, through the unfortunate interaction with ceph-csi rbd plugin,
results in data loss for "volumeMode: Filesystem" PVs because it ends
up recreating the filesystem every time the PV is attached to the pod:

  "When deleting the pod and re-creating it, I can see that the RBD
   image is indeed being reformatted. This seems to be because when
   blkid is being run to check if the image is formatted, the /dev/rbd*
   device has not yet been created by udev. By the time the code gets
   down to running mkfs, the device is there and the damage is done."

[1] https://github.com/ceph/ceph-csi/issues/1820

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

4 years agoMerge pull request #39890 from tchaikov/octopus-github-milestone
Kefu Chai [Tue, 9 Mar 2021 09:20:10 +0000 (17:20 +0800)]
Merge pull request #39890 from tchaikov/octopus-github-milestone

octopus: .github: add workflow for adding label and milestone

Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
4 years ago.github/workflows: use a released sha1 39890/head
Kefu Chai [Tue, 9 Mar 2021 04:16:26 +0000 (12:16 +0800)]
.github/workflows: use a released sha1

otherwise the action cannot be found

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

4 years ago.github/workflows: rename labeler.yml to pr-triage.yml
Kefu Chai [Mon, 8 Mar 2021 18:46:46 +0000 (02:46 +0800)]
.github/workflows: rename labeler.yml to pr-triage.yml

to reflect the change in the actions in it.

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

4 years ago.github/workflows: use @{sha1} for actions
Kefu Chai [Mon, 8 Mar 2021 18:26:34 +0000 (02:26 +0800)]
.github/workflows: use @{sha1} for actions

more secure this way. see also https://julienrenaux.fr/2019/12/20/github-actions-security-risk/

point the sha1 to

* labeler@v3
* milestone@main HEAD

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

4 years ago.github/workflows: move milestone.yml into labeler.yml
Kefu Chai [Sun, 7 Mar 2021 11:21:25 +0000 (19:21 +0800)]
.github/workflows: move milestone.yml into labeler.yml

no need to have two actions triggered by the same event.

we could backport this labeler.yml to LTS branches.

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

4 years ago.github: correct the regex in mileston workflow
Kefu Chai [Sat, 6 Mar 2021 16:32:42 +0000 (00:32 +0800)]
.github: correct the regex in mileston workflow

also use pull_request_target event so the action is run in the
context of the base of the pull request. this helps us to overcome
the "Resource not accessible by integration" issue where the action
is run in the context of the pull request.

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

4 years ago.github: add workflow for adding milestone
Kefu Chai [Sat, 6 Mar 2021 13:18:13 +0000 (21:18 +0800)]
.github: add workflow for adding milestone

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

4 years agogithub/labeler: disable sync-labels
Ernesto Puerta [Wed, 18 Nov 2020 12:00:00 +0000 (13:00 +0100)]
github/labeler: disable sync-labels

Yaml syntax cleaned too.

Fixes: https://github.com/ceph/ceph/pull/38107#issuecomment-729300615
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
(cherry picked from commit 59702b6198c59b84f1695e37256ae351b331b604)

4 years agogithub: autolabel PRs
Ernesto Puerta [Thu, 12 Nov 2020 17:07:44 +0000 (18:07 +0100)]
github: autolabel PRs

... starting with dashboard ones.

Requires https://github.com/marketplace/actions/labeler

Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
(cherry picked from commit 298bc67f7b8d1c64520b543f4749b29f7be67379)

4 years agoMerge PR #39906 into octopus
Patrick Donnelly [Mon, 8 Mar 2021 19:40:04 +0000 (11:40 -0800)]
Merge PR #39906 into octopus

* refs/pull/39906/head:
mgr/volumes: Bump up AuthMetadataManager's version
pybind/ceph_volume_client: Bump up the version and compat_version to 6
pybind/ceph_volume_client: Fix auth-metadata file recovery
pybind/ceph_volume_client: Update the 'volumes' key to 'subvolumes' in auth metadata file

Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #39627 from rhcs-dashboard/wip-49421-octopus
Ernesto Puerta [Mon, 8 Mar 2021 16:19:37 +0000 (17:19 +0100)]
Merge pull request #39627 from rhcs-dashboard/wip-49421-octopus

octopus: mgr/dashboard: set security headers

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agomgr/volumes: Bump up AuthMetadataManager's version 39906/head
Kotresh HR [Fri, 19 Feb 2021 11:27:23 +0000 (16:57 +0530)]
mgr/volumes: Bump up AuthMetadataManager's version

With ceph_volume_client and mgr-volumes co-existing
for sometime, the version of both needs to be same.
The ceph_volume_client version <=5 can't decode
'subvolumes' key in auth-metadata file. Hence to
handle version in-compatibility, the version of
ceph_volume_client is bumped up to 6 and the same
needs to be done in mgr-volume's AuthMetadataManager

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

4 years agopybind/ceph_volume_client: Bump up the version and compat_version to 6
Kotresh HR [Fri, 19 Feb 2021 11:12:33 +0000 (16:42 +0530)]
pybind/ceph_volume_client: Bump up the version and compat_version to 6

With 'volumes' key updated to 'subvolumes', the version of
ceph_volume_client <= 5 can't decode auth-metadata file. Hence
bumping up ceph_volume_client version and compat_version to 6.

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

4 years agopybind/ceph_volume_client: Fix auth-metadata file recovery
Kotresh HR [Fri, 19 Feb 2021 11:08:31 +0000 (16:38 +0530)]
pybind/ceph_volume_client: Fix auth-metadata file recovery

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

4 years agopybind/ceph_volume_client: Update the 'volumes' key to 'subvolumes' in auth metadata...
Kotresh HR [Mon, 15 Feb 2021 16:26:51 +0000 (21:56 +0530)]
pybind/ceph_volume_client: Update the 'volumes' key to 'subvolumes' in auth metadata file

The older auth metadata files before nautilus release stores
the authorized subvolumes using the 'volumes' key. As the
notion of 'subvolumes' brought in by mgr/volumes, it makes
sense to use 'subvolumes' key. This patch would be tranparently
update 'volumes' key to 'subvolumes' and newer auth metadata
files would store them with 'subvolumes' key.

Also fails the deauthorize if the auth-id doesn't exist.

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

4 years agoMerge pull request #39390 from kotreshhr/wip-mgr-backports-octopus
Ramana Raja [Sat, 6 Mar 2021 16:51:31 +0000 (11:51 -0500)]
Merge pull request #39390 from kotreshhr/wip-mgr-backports-octopus

octopus: mgr/volume: subvolume auth_id management and few bug fixes

Reviewed-by: Ramana Raja <rraja@redhat.com>
4 years agoMerge pull request #39836 from rhcs-dashboard/wip-49594-octopus
Ernesto Puerta [Fri, 5 Mar 2021 16:59:05 +0000 (17:59 +0100)]
Merge pull request #39836 from rhcs-dashboard/wip-49594-octopus

octopus: mgr/dashboard: fix issues related with PyJWT versions >=2.0.0

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
4 years agoqa: leave one standby available to avoid warning 39390/head
Patrick Donnelly [Mon, 2 Nov 2020 18:01:59 +0000 (10:01 -0800)]
qa: leave one standby available to avoid warning

Four file systems will use all MDS and generate this warning:

2020-11-02T03:48:33.407 INFO:teuthology.orchestra.run.smithi003.stdout:2020-11-02T03:24:21.817337+0000 mon.a (mon.0) 481 : cluster [WRN] Health check failed: insufficient standby MDS daemons available (MDS_INSUFFICIENT_STANDBY).

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

4 years agoqa: Fix a few mgr/volume test cases
Kotresh HR [Fri, 5 Feb 2021 18:05:22 +0000 (23:35 +0530)]
qa: Fix a few mgr/volume test cases

Recovering dirty auth metadata file might not retain the order,
fixed the comparison in 'test_recover_auth_metadata_during_authorize'
and 'test_recover_auth_metadata_during_deauthorize'.

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

4 years agoqa/cephfs: add methods to read/write on CephFS mounts
Rishabh Dave [Wed, 1 Apr 2020 11:21:06 +0000 (16:51 +0530)]
qa/cephfs: add methods to read/write on CephFS mounts

Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 3f0284f272231c3b62b0f3f201cbaaecfa405bcd)

Conflicts:
    qa/tasks/cephfs/mount.py: get_file and IP module is not present in
      octopus

4 years agoceph_volume_client: Fix failure of test_idempotency
Kotresh HR [Sat, 23 Jan 2021 17:03:32 +0000 (22:33 +0530)]
ceph_volume_client: Fix failure of test_idempotency

With the test environment, 'args must be encodeable
 as a bytearray' error is seen for 'ceph_mds_command'.
Hence removed tuple and passed the JSON formatted string.

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

4 years agomgr/volumes: Evict clients based on auth-IDs and subvolume mounted
Kotresh HR [Fri, 15 Jan 2021 20:07:14 +0000 (01:37 +0530)]
mgr/volumes: Evict clients based on auth-IDs and subvolume mounted

Add subvolume evict command which evicts the subvolume mounts
which are mounted using particular auth-ID.

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

Conflicts:
    qa/tasks/cephfs/test_volumes.py: Few of the tests are re-organized,
           hence the conflicts. Resolved the same.

4 years agodoc/mgr/volumes: Document 'fs subvolume authorized_list' cli
Kotresh HR [Tue, 5 Jan 2021 13:25:32 +0000 (18:55 +0530)]
doc/mgr/volumes: Document 'fs subvolume authorized_list' cli

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

4 years agoqa: Add tests for list auth-ids of a subvolume
Kotresh HR [Wed, 16 Dec 2020 12:49:42 +0000 (18:19 +0530)]
qa: Add tests for list auth-ids of a subvolume

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

Conflicts:
   qa/tasks/cephfs/test_volumes.py: Few of the tests are re-organized,
       hence the conflicts. Resolved the same.

4 years agomgr/volumes: Update the 'volumes' key to 'subvolumes' in auth metadata file
Kotresh HR [Tue, 5 Jan 2021 12:55:54 +0000 (18:25 +0530)]
mgr/volumes: Update the 'volumes' key to 'subvolumes' in auth metadata file

The older auth metadata files created by CephVolumeClient stores the
authorized subvolumes using the 'volumes' key as the notion of
'subvolumes' brought in by mgr/volumes. Hence, this would be tranparently
updated to 'subvolumes' and newer auth metadata files would store them
with 'subvolumes' key.

Also fails the deauthorize if the auth-id doesn't exist.

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

4 years agomgr/volumes: Optionally authorize existing auth-ids
Kotresh HR [Tue, 15 Dec 2020 12:12:25 +0000 (17:42 +0530)]
mgr/volumes: Optionally authorize existing auth-ids

Optionally allow authorizing auth-ids not created by mgr plugin
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/44931
Signed-off-by: Kotresh HR <khiremat@redhat.com>
(cherry picked from commit 713270d1869e2370b674b1a4bc6f6a37023a5917)

4 years agomgr/volumes: Preserve existing caps while authorize/deauthorize auth-id
Kotresh HR [Tue, 15 Dec 2020 12:01:54 +0000 (17:31 +0530)]
mgr/volumes: 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/44931
Signed-off-by: Kotresh HR <khiremat@redhat.com>
(cherry picked from commit 2dece3be081fe572455d6b634e38a663d1643dc8)

4 years agomgr/volumes: Disallow authorize existing auth_id
Kotresh HR [Mon, 4 Jan 2021 13:04:54 +0000 (18:34 +0530)]
mgr/volumes: Disallow authorize existing auth_id

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

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

4 years agomgr/volumes: Add subvolume authorized_list command
Kotresh HR [Mon, 23 Nov 2020 12:19:04 +0000 (17:49 +0530)]
mgr/volumes: Add subvolume authorized_list command

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

4 years agomgr/volumes: Add tenant_id option to subvolume authorize
Kotresh HR [Mon, 23 Nov 2020 06:08:27 +0000 (11:38 +0530)]
mgr/volumes: Add tenant_id option to subvolume authorize

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

4 years agomgr/volumes: Persist auth and subvolume metadata
Kotresh HR [Wed, 18 Nov 2020 10:13:25 +0000 (15:43 +0530)]
mgr/volumes: Persist auth and subvolume metadata

1. Subvolume create and delete operations create and delete subvolume
   metadata file respectively.
2. Subvolume authorize creates the auth meta file and persists the
   required metadata on subvolume metadata file and auth metdata file
   on disk. Subvolume deauthorize clears the required metadata on
   both metadata files.

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

4 years agomgr/volumes: Filter inherited snapshots while listing snapshots
Kotresh HR [Fri, 18 Dec 2020 11:33:14 +0000 (17:03 +0530)]
mgr/volumes: Filter inherited snapshots while listing snapshots

Filter inherited snapshots resulted as part of a snapshot
at ancestor level while listing snapshots of a subvolume
and subvolumegroup

Also, fail the snapshot info on inherited snapshot.

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

Conflicts:
    qa/tasks/cephfs/test_volumes.py: Few of the tests are re-organized,
       hence the conflicts. Resolved the same.

4 years agodoc/mgr/volumes: Document authorize/deauthorize cli commands
Kotresh HR [Fri, 11 Sep 2020 04:26:22 +0000 (09:56 +0530)]
doc/mgr/volumes: Document authorize/deauthorize cli commands

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

4 years agoqa/tasks/cephfs: test `fs subvolume authorize/deauthorize`
Ramana Raja [Thu, 11 Jul 2019 11:14:35 +0000 (16:44 +0530)]
qa/tasks/cephfs: test `fs subvolume authorize/deauthorize`

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

Conflicts:
    qa/tasks/cephfs/test_volumes.py: Few of the test cases are
re-organized, hence the conflicts. Resolved the same.

Signed-off-by: Kotresh HR <khiremat@redhat.com>
4 years agomgr/volumes: Allow/deny auth IDs access to FS subvolumes
Ramana Raja [Fri, 5 Jul 2019 06:41:52 +0000 (12:11 +0530)]
mgr/volumes: Allow/deny auth IDs access to FS subvolumes

... via the `ceph fs subvolume authorize/deauthorize` command.

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

4 years agomon/MonCap: allow 'profile mgr' to create/update/del auth IDs
Ramana Raja [Wed, 10 Jul 2019 19:03:20 +0000 (00:33 +0530)]
mon/MonCap: allow 'profile mgr' to create/update/del auth IDs

Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit d3aea5579778a73dc2418e7b137dc21717944c3e)

4 years agoMerge pull request #39512 from rhcs-dashboard/wip-48862-octopus
Ernesto Puerta [Thu, 4 Mar 2021 19:55:46 +0000 (20:55 +0100)]
Merge pull request #39512 from rhcs-dashboard/wip-48862-octopus

octopus: mgr/dashboard: Monitoring alert badge includes suppressed alerts

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agomgr/dashboard: fix issues related with PyJWT versions >=2.0.0 39836/head
Alfonso Martínez [Wed, 3 Mar 2021 14:36:06 +0000 (15:36 +0100)]
mgr/dashboard: fix issues related with PyJWT versions >=2.0.0

Fixes: https://tracker.ceph.com/issues/49574
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit 4b96bb51e8f133badd7bc651bcb4dcd755b43d75)

 Conflicts:
src/pybind/mgr/dashboard/services/auth.py
        - Addressed conflicts.

4 years agoMerge pull request #39715 from sebastian-philipp/octopus-backport-39069
Yuri Weinstein [Thu, 4 Mar 2021 16:09:15 +0000 (08:09 -0800)]
Merge pull request #39715 from sebastian-philipp/octopus-backport-39069

octopus: cephadm: fix 'inspect' and 'pull'

Reviewed-by: Nathan Cutler <ncutler@suse.com>
4 years agoMerge pull request #39633 from donggyupark/fix-cephadm-openports
Yuri Weinstein [Thu, 4 Mar 2021 16:07:31 +0000 (08:07 -0800)]
Merge pull request #39633 from donggyupark/fix-cephadm-openports

octopus: cephadm: Delete the unnecessary error line in open_ports

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
4 years agoMerge pull request #39507 from k0ste/wip-49316-octopus
Yuri Weinstein [Thu, 4 Mar 2021 16:06:10 +0000 (08:06 -0800)]
Merge pull request #39507 from k0ste/wip-49316-octopus

octopus: mgr/dashboard: prometheus alerting: add some leeway for package drops and errors

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Aashish Sharma <aasharma@redhat.com>
4 years agoMerge pull request #39325 from ifed01/wip-ifed-add-rocksdb-annex
Yuri Weinstein [Thu, 4 Mar 2021 16:04:23 +0000 (08:04 -0800)]
Merge pull request #39325 from ifed01/wip-ifed-add-rocksdb-annex

octopus: os/bluestore: introduce bluestore_rocksdb_options_annex config parame…

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #39645 from rhcs-dashboard/wip-49388-octopus
Ernesto Puerta [Thu, 4 Mar 2021 12:59:01 +0000 (13:59 +0100)]
Merge pull request #39645 from rhcs-dashboard/wip-49388-octopus

octopus: mgr/dashboard: fix tooltip for Provisioned/Total Provisioned fields

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agoMerge pull request #39527 from rhcs-dashboard/wip-49328-octopus
Ernesto Puerta [Thu, 4 Mar 2021 12:55:53 +0000 (13:55 +0100)]
Merge pull request #39527 from rhcs-dashboard/wip-49328-octopus

octopus: mgr/dashboard: avoid using document.write()

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agoMerge pull request #39545 from aaSharma14/wip-48734-octopus
Ernesto Puerta [Thu, 4 Mar 2021 12:55:13 +0000 (13:55 +0100)]
Merge pull request #39545 from aaSharma14/wip-48734-octopus

octopus: mgr/dashboard:minimize console log traces of Ceph backend API tests

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agoMerge pull request #39819 from yuriw/wip-yuriw-client-upgrade-octopus-pacific-octopus
Yuri Weinstein [Wed, 3 Mar 2021 22:13:28 +0000 (14:13 -0800)]
Merge pull request #39819 from yuriw/wip-yuriw-client-upgrade-octopus-pacific-octopus

qa/tests: fixed branch entry

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoqa/tests: fixed branch entry 39819/head
Yuri Weinstein [Wed, 3 Mar 2021 17:51:01 +0000 (09:51 -0800)]
qa/tests: fixed branch entry

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
4 years agoMerge pull request #39220 from jan--f/wip-49093-octopus
Jan Fajerski [Wed, 3 Mar 2021 09:19:33 +0000 (10:19 +0100)]
Merge pull request #39220 from jan--f/wip-49093-octopus

Merge PR #39220 into octopus

* refs/pull/39220/head:
        ceph-volume: Fix usage of is_lv

Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Guillaume Abrioux <gabrioux@redhat.com>
Reviewed-by: Dimitri Savineau <savineau.dimitri@gmail.com>
4 years agoMerge pull request #39523 from jan--f/wip-49332-octopus
Jan Fajerski [Wed, 3 Mar 2021 09:11:06 +0000 (10:11 +0100)]
Merge pull request #39523 from jan--f/wip-49332-octopus

Merge PR #39523 into octopus

* refs/pull/39523/head:
        ceph-volume: pass --filter-for-batch from drive-group subcommand

Reviewed-by: Rishabh Dave <ridave@redhat.com>
4 years agoMerge pull request #39469 from jan--f/wip-49289-octopus
Jan Fajerski [Wed, 3 Mar 2021 09:10:31 +0000 (10:10 +0100)]
Merge pull request #39469 from jan--f/wip-49289-octopus

Merge PR #39469 into octopus

* refs/pull/39469/head:
        Update batch.py

Reviewed-by: Rishabh Dave <ridave@redhat.com>
4 years agoMerge pull request #39662 from pponnuvel/wip-49441-octopus
Yuri Weinstein [Tue, 2 Mar 2021 20:11:34 +0000 (12:11 -0800)]
Merge pull request #39662 from pponnuvel/wip-49441-octopus

octopus: rgw: radosgw-admin: clarify error when email address already in use

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #39577 from dillaman/wip-49252-octopus
Yuri Weinstein [Tue, 2 Mar 2021 20:10:47 +0000 (12:10 -0800)]
Merge pull request #39577 from dillaman/wip-49252-octopus

octopus: librbd: correct incremental deep-copy object-map inconsistencies

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
4 years agoMerge pull request #39376 from dillaman/wip-48091-octopus
Yuri Weinstein [Tue, 2 Mar 2021 20:10:26 +0000 (12:10 -0800)]
Merge pull request #39376 from dillaman/wip-48091-octopus

octopus: mgr/rbd_support: create mirror snapshots asynchronously

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
4 years agoMerge pull request #39103 from k0ste/wip-49022-octopus
Ernesto Puerta [Tue, 2 Mar 2021 09:51:35 +0000 (10:51 +0100)]
Merge pull request #39103 from k0ste/wip-49022-octopus

octopus: mgr/dashboard: trigger alert if some nodes have a MTU different than the median value

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agoMerge pull request #39027 from rhcs-dashboard/wip-48960-octopus
Ernesto Puerta [Tue, 2 Mar 2021 09:49:48 +0000 (10:49 +0100)]
Merge pull request #39027 from rhcs-dashboard/wip-48960-octopus

octopus: mgr/dashboard: Fix for incorrect validation in rgw user form

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
4 years agoMerge pull request #39306 from rhcs-dashboard/wip-48829-octopus
Ernesto Puerta [Tue, 2 Mar 2021 09:48:59 +0000 (10:48 +0100)]
Merge pull request #39306 from rhcs-dashboard/wip-48829-octopus

octopus: mgr/dashboard/monitoring: upgrade Grafana version due to CVE-2020-13379

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: p-se <NOT@FOUND>
4 years agoMerge pull request #39271 from jan--f/wip-49141-octopus
Guillaume Abrioux [Tue, 2 Mar 2021 07:35:31 +0000 (08:35 +0100)]
Merge pull request #39271 from jan--f/wip-49141-octopus

octopus: ceph-volume: add some flexibility to bytes_to_extents

4 years agoMerge pull request #39534 from ideepika/wip-backport-blocklist-ignorelist-qa
Yuri Weinstein [Mon, 1 Mar 2021 18:26:16 +0000 (10:26 -0800)]
Merge pull request #39534 from ideepika/wip-backport-blocklist-ignorelist-qa

octopus: whitelist -> ignorelist for qa/* only

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #39235 from k0ste/wip-49107-octopus
Yuri Weinstein [Mon, 1 Mar 2021 18:25:14 +0000 (10:25 -0800)]
Merge pull request #39235 from k0ste/wip-49107-octopus

octopus: mgr/zabbix: format ceph.[{#POOL},percent_used as float

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agocephadm: fix 'inspect' and 'pull' 39715/head
Sage Weil [Mon, 25 Jan 2021 22:32:45 +0000 (16:32 -0600)]
cephadm: fix 'inspect' and 'pull'

With podman 2.2.1 I would get

ERRO[0000] Error printing inspect output: template: all inspect:1: function "json" not defined

Removing the 'json' portion of the query resolves it.

Fixes: https://tracker.ceph.com/issues/49522
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit d31bed79411ca493ec48eeed4e9cbb7ad92295c3)

Conflicts:
src/cephadm/cephadm

4 years agocephadm: Delete the unnecessary error line in open_ports 39633/head
donggyu_park [Mon, 22 Feb 2021 07:52:50 +0000 (16:52 +0900)]
cephadm: Delete the unnecessary error line in open_ports

In #39020, d9fbd7e is cherry picked from 70722a2. there is no bug in 70722a2,
but there is a bug in d9fbd7e. It seems that the unnecessary error line was added during cherry picking.
So error only occurs in octopus branch.
This commit directly fixes issue in octopus branch instead of cherry picking
since cherry picking from 70722a2 has already been applied to octopus branch.

This commit deletes the unnecessary error line added in d9fbd7e.
In d9fbd7e, the parameter verbose_on_failure was removed in call.
However, the unnecessary line that uses verbose_on_failure was
added in open_ports and so error occurs.

Fixes: https://tracker.ceph.com/issues/49467
Signed-off-by: Donggyu Park <donggyu_park@tmax.co.kr>
4 years agoMerge pull request #39277 from smithfarm/wip-49131-octopus
Yuri Weinstein [Wed, 24 Feb 2021 22:23:06 +0000 (14:23 -0800)]
Merge pull request #39277 from smithfarm/wip-49131-octopus

octopus: rgw: fix trailing null in object names of multipart reuploads

Reviewed-by: Casey Bodley <cbodley@redhat.com>
4 years agoMerge pull request #39583 from liewegas/pr-39561-octopus
Josh Durgin [Wed, 24 Feb 2021 20:17:49 +0000 (12:17 -0800)]
Merge pull request #39583 from liewegas/pr-39561-octopus

octopus: qa: use normal build for valgrind

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agorgw/radosgw-admin clarify error when email address already in use 39662/head
Matthew Vernon [Thu, 4 Feb 2021 11:41:14 +0000 (11:41 +0000)]
rgw/radosgw-admin clarify error when email address already in use

The error message if you try and create an S3 user with an email
address that is already associated with another S3 account is very
confusing; this patch makes it much clearer

To reproduce:

radosgw-admin user create --uid=foo --display-name="Foo test" --email=bar@domain.invalid
radosgw-admin user create --uid=test --display-name="AN test" --email=bar@domain.invalid
could not create user: unable to parse parameters, user id mismatch, operation id: foo does not match: test

With this patch:

radosgw-admin user create --uid=test --display-name="AN test" --email=bar@domain.invalid
could not create user: unable to create user test because user id foo already exists with email bar@domain.invalid

Fixes: https://tracker.ceph.com/issues/49137
Fixes: https://tracker.ceph.com/issues/19411
Signed-off-by: Matthew Vernon <mv3@sanger.ac.uk>
(cherry picked from commit 05318d6f71e45a42a46518a0ef17047dfab83990)

4 years agomgr/dashboard: fix tooltip for Provisioned/Total Provisioned fields 39645/head
Avan Thakkar [Tue, 16 Feb 2021 18:24:25 +0000 (23:54 +0530)]
mgr/dashboard: fix tooltip for Provisioned/Total Provisioned fields

Fixes: https://tracker.ceph.com/issues/46619
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit 2dd341d63b7dd7d6b8767b93151c0c1f243be6b6)

 Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-details/rbd-details.component.html
      - Adopting the master branch changes.

4 years ago15.2.9 v15.2.9
Jenkins Build Slave User [Tue, 23 Feb 2021 14:10:15 +0000 (14:10 +0000)]
15.2.9

4 years agomgr/dashboard: set security headers 39627/head
Avan Thakkar [Wed, 10 Feb 2021 22:12:49 +0000 (03:42 +0530)]
mgr/dashboard: set security headers

Fixes: https://tracker.ceph.com/issues/49243
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit 87bb3777877580f70018f4880488e264decc16e4)

 Conflicts:
qa/tasks/mgr/dashboard/test_requests.py
src/pybind/mgr/dashboard/services/auth.py
      - Adopted the necessary changes from the master branch.

4 years agoqa/valgrind.supp: suppress free[] warnings 39583/head
Sage Weil [Thu, 18 Feb 2021 18:04:16 +0000 (12:04 -0600)]
qa/valgrind.supp: suppress free[] warnings

This is apparently not going to get fixed any time soon.

https://github.com/gperftools/gperftools/issues/792

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 28fe149ea276693b47cc4d600780971f723672e4)

4 years agoqa/suites: do not use notcmalloc flavor
Sage Weil [Fri, 19 Feb 2021 19:20:08 +0000 (13:20 -0600)]
qa/suites: do not use notcmalloc flavor

teuthology now knows how to run valgrind against a tcmalloc binary

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit dc64ccf063f1ddf843fae4d2621ec25187f56135)

# Conflicts:
# qa/suites/rgw/sts/tasks/0-install.yaml
  - test not present in octopus
# qa/suites/rgw/verify/validater/valgrind.yaml

4 years agoMerge pull request #39289 from kamoltat/wip-ksirivad-octopus-turn-off-backports
Yuri Weinstein [Fri, 19 Feb 2021 17:32:51 +0000 (09:32 -0800)]
Merge pull request #39289 from kamoltat/wip-ksirivad-octopus-turn-off-backports

octopus: mgr/progress: introduce turn off/on feature

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #39256 from ifed01/wip-ifed-fsck-spanning-blobs-octopus
Yuri Weinstein [Fri, 19 Feb 2021 17:32:28 +0000 (09:32 -0800)]
Merge pull request #39256 from ifed01/wip-ifed-fsck-spanning-blobs-octopus

octopus: os/bluestore: detect and fix "zombie" spanning blobs using fsck.

Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #39253 from ifed01/wip-ifed-fix-huge-bluefs-reads-oct
Yuri Weinstein [Fri, 19 Feb 2021 17:31:59 +0000 (09:31 -0800)]
Merge pull request #39253 from ifed01/wip-ifed-fix-huge-bluefs-reads-oct

octopus: os/bluestore: fix huge (>4GB) bluefs reads

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
4 years agoMerge pull request #39560 from neha-ojha/wip-revert-39248-octopus
Yuri Weinstein [Fri, 19 Feb 2021 16:41:55 +0000 (08:41 -0800)]
Merge pull request #39560 from neha-ojha/wip-revert-39248-octopus

octopus: Revert "mgr/pg_autoscaler: avoid scale-down until there is pressure"

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kamoltat (Junior) Sirivadhna <ksirivad@redhat.com>
4 years agorbd-mirror: don't prune older mirror snapshots when pruning incomplete snapshot 39577/head
Jason Dillaman [Mon, 8 Feb 2021 16:53:28 +0000 (11:53 -0500)]
rbd-mirror: don't prune older mirror snapshots when pruning incomplete snapshot

Since we normally prune in order, we need to ensure that we don't prune older
snapshots when we need to delete an incomplete mirror snapshot since the
older snapshot might be the only remaining mirror snapshot.

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

4 years agoqa/workunits/rbd: show snapshot deltas during stress test failure
Jason Dillaman [Mon, 8 Feb 2021 15:13:35 +0000 (10:13 -0500)]
qa/workunits/rbd: show snapshot deltas during stress test failure

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

4 years agoqa/suites/rbd: add snapshot-based mirroring stress test
Jason Dillaman [Tue, 2 Feb 2021 20:28:48 +0000 (15:28 -0500)]
qa/suites/rbd: add snapshot-based mirroring stress test

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

4 years agolibrbd/deep_copy: added new migrating flag to object copy
Jason Dillaman [Tue, 8 Dec 2020 19:16:49 +0000 (14:16 -0500)]
librbd/deep_copy: added new migrating flag to object copy

The migration operation and the copyup state machine will set
this flag when attempting to perform a deep-copy due to a
live-migration.

This flag will prevent a possible race condition between the
start of the object deep-copy when migration was enabled and
the writing portion of the deep-copy when migration might
have completed via external means.

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

Conflicts:
src/librbd/deep_copy/ObjectCopyRequest.cc: trivial resolution

4 years agolibrbd/deep_copy: added bitwise flag parameter to object copy
Jason Dillaman [Tue, 8 Dec 2020 18:11:20 +0000 (13:11 -0500)]
librbd/deep_copy: added bitwise flag parameter to object copy

This initial version subsumes the original "flatten" boolean flag.

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

Conflicts:
src/librbd/deep_copy/ObjectCopyRequest.cc: trivial resolution
src/librbd/io/CopyupRequest.cc: trivial resolution
src/test/librbd/deep_copy/test_mock_ObjectCopyRequest.cc: trivial resolution

4 years agolibrbd/deep-copy: object-copy state machine must update object map
Jason Dillaman [Fri, 5 Feb 2021 15:41:30 +0000 (10:41 -0500)]
librbd/deep-copy: object-copy state machine must update object map

If there was no data to copy, the object-copy state machine was bypassing
the object-map update states and prematurely completing. Since the
object-map is default-initialized to all non-existent objects, this results
in incorrect state for OBJECT_EXISTS_CLEAN objects.

This commit was derived from ca0b9bfc28ef7287ca139ca9640c876223eda87b

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
4 years agolibrbd: deep-copy should update object-map before writing to object
Jason Dillaman [Fri, 25 Sep 2020 14:40:32 +0000 (10:40 -0400)]
librbd: deep-copy should update object-map before writing to object

For the original use-case of RBD mirroring it was (maybe) more
acceptable to write to the object before updating the object map
because an interrupted sync will be retried. However, when using
the deep-copy object copy state machine as part of copyup, it's
more likely that the object-map has the potential to become
out-of-sync with reality if it's updated after the object is
written.

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

Conflicts:
src/librbd/deep_copy/ObjectCopyRequest.cc: trivial resolution
src/test/librbd/deep_copy/test_mock_ObjectCopyRequest.cc: trivial resolution

4 years agolibrbd/object_map: diff state machine should track object existence
Jason Dillaman [Thu, 28 Jan 2021 23:30:16 +0000 (18:30 -0500)]
librbd/object_map: diff state machine should track object existence

The deep-copy snapshot-create state machine initializes the object-map
state to non-existent for all objects. There was an assumption that the
deep-copy object-copy state machine would always update the object map
but that was being skipped for clean objects as an optimization. This
change will support a future commit to run the object-copy state machine
for existing objects.

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

Conflicts:
src/librbd/api/DiffIterate.cc: trivial resolution due to renames

4 years agotest/librbd: print difference if deep-copy or migration test fails
Mykola Golub [Wed, 2 Dec 2020 09:41:13 +0000 (09:41 +0000)]
test/librbd: print difference if deep-copy or migration test fails

It may appear to be useful to track the sporadic test failures
observed on jenkins, not reproducible locally.

Previously it was disabled because the output could be too
large. But after the hexdump was improved to skip repeating bytes
the output will hopefully be much smaller.

Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit bb77f740df749de1bba0e91b03c4eb23d5586e43)

4 years agoRevert "PendingReleaseNotes: mgr/pg_autoscaler" 39560/head
Neha Ojha [Thu, 18 Feb 2021 19:51:32 +0000 (19:51 +0000)]
Revert "PendingReleaseNotes: mgr/pg_autoscaler"

This reverts commit 1177acb6de32331c67d707032a2ecaeff6bf8365.

Signed-off-by: Neha Ojha <nojha@redhat.com>
4 years agoRevert "mgr/pg_autoscaler: avoid scale-down until there is pressure"
Neha Ojha [Thu, 18 Feb 2021 19:46:00 +0000 (19:46 +0000)]
Revert "mgr/pg_autoscaler: avoid scale-down until there is pressure"

This reverts commit 49dba6edaa807f2c1047c40ce96a76fc5f409b82.

Reason: Needs to bake more given that it may cause pg budget issues
when multiple pools are created at the same time.

More details in https://tracker.ceph.com/issues/49364.

Signed-off-by: Neha Ojha <nojha@redhat.com>
4 years agoqa/suites/rados/thrash: log-whitelist -> log-ignorelist 39534/head
Neha Ojha [Fri, 7 Aug 2020 17:12:28 +0000 (17:12 +0000)]
qa/suites/rados/thrash: log-whitelist -> log-ignorelist

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

4 years agoqa/suites/krbd/thrash: log-whitelist -> log-ignorelist
Neha Ojha [Fri, 7 Aug 2020 16:37:57 +0000 (16:37 +0000)]
qa/suites/krbd/thrash: log-whitelist -> log-ignorelist

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

4 years agoqa/suites/multimds: log-whitelist -> log-ignorelist
Neha Ojha [Fri, 7 Aug 2020 16:35:30 +0000 (16:35 +0000)]
qa/suites/multimds: log-whitelist -> log-ignorelist

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

4 years agoqa: log-whitelist -> log-ignorelist
Sage Weil [Wed, 17 Jun 2020 19:33:57 +0000 (14:33 -0500)]
qa: log-whitelist -> log-ignorelist

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 2ee9365d0bc220523632753f02c61eb5c2f4fbdd)

4 years agoMerge pull request #39540 from tchaikov/octopus-pr-35352
Kefu Chai [Thu, 18 Feb 2021 15:26:36 +0000 (23:26 +0800)]
Merge pull request #39540 from tchaikov/octopus-pr-35352

octopus: qa/tasks/vstart_runner: do not teardown test_path if "create-cluster-only"

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
4 years agomgr/dashboard:minimize console log traces of Dashboard backend API tests 39545/head
Aashish Sharma [Tue, 14 Jul 2020 04:58:57 +0000 (10:28 +0530)]
mgr/dashboard:minimize console log traces of Dashboard backend API tests

Changed log levels in some files to reduce console log traces

Fixes: https://tracker.ceph.com/issues/45822
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit f5dd0195cd45b6e00e43ef97e209e565e6452777)

4 years agoqa/tasks/vstart_runner: do not teardown test_path if "create-cluster-only" 39540/head
Kefu Chai [Wed, 3 Jun 2020 01:39:26 +0000 (09:39 +0800)]
qa/tasks/vstart_runner: do not teardown test_path if "create-cluster-only"

otherwise we could be removing a "None" directory when tearing down the cluster,
and have following failure:

Exception ignored in: <bound method LocalContext.__del__ of <__main__.LocalContext object at 0x7f99fd4a6cc0>>
Traceback (most recent call last):
  File "../qa/tasks/vstart_runner.py", line 1189, in __del__
    shutil.rmtree(self.teuthology_config['test_path'])
  File "/tmp/tmp.mmM2ugspuR/venv/lib/python3.6/shutil.py", line 477, in rmtree
    onerror(os.lstat, path, sys.exc_info())
  File "/tmp/tmp.mmM2ugspuR/venv/lib/python3.6/shutil.py", line 475, in rmtree
    orig_st = os.lstat(path)
TypeError: lstat: path should be string, bytes or os.PathLike, not NoneType

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

4 years agoMerge pull request #39532 from liewegas/pr-39496-octopus
Yuri Weinstein [Wed, 17 Feb 2021 19:49:41 +0000 (11:49 -0800)]
Merge pull request #39532 from liewegas/pr-39496-octopus

octopus: mgr/cephadm: fix host refresh

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
4 years agomgr/cephadm: fix host refresh 39532/head
Sage Weil [Tue, 16 Feb 2021 17:07:08 +0000 (11:07 -0600)]
mgr/cephadm: fix host refresh

Fixes: 01f60cf4e0a751c314120c02956d4ff941eb71b4
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 9df5a6d73ed21b394c01afe6c9800b6e50737c90)

4 years agomgr/dashboard: avoid using document.write() 39527/head
Avan Thakkar [Tue, 9 Feb 2021 08:01:59 +0000 (13:31 +0530)]
mgr/dashboard: avoid using document.write()

Fixes: https://tracker.ceph.com/issues/49220
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit 36efe519b90b7508fb830f2c250e8b6956eaaf05)

 Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/app.module.ts
     - Adopting the master branch changes.

4 years agoceph-volume: pass --filter-for-batch from drive-group subcommand 39523/head
Jan Fajerski [Wed, 16 Dec 2020 13:13:25 +0000 (14:13 +0100)]
ceph-volume: pass --filter-for-batch from drive-group subcommand

Otherwise the drive-group spec potentially tries to pull in the root
device (if it fits).

Fixes: https://tracker.ceph.com/issues/48631
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit a6a03d0f5535a053239ae9e49c53ac9208bb0738)

4 years agoos/bluestore: introduce bluestore_rocksdb_options_annex config parameter. 39325/head
Igor Fedotov [Mon, 21 Dec 2020 21:01:52 +0000 (00:01 +0300)]
os/bluestore: introduce bluestore_rocksdb_options_annex config parameter.

This simplifies modifying a subset of rocksdb settings since it
eliminates the need to re-provide bluestore's rocksdb settings.

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

 Conflicts:
  (trivial) PendingReleaseNotes
  (trivial) src/common/options.cc
  (trivial) src/os/bluestore/BlueStore.cc

4 years agomgr/dashboard: alert badge includes suppressed alerts 39512/head
Aashish Sharma [Mon, 4 Jan 2021 05:09:16 +0000 (10:39 +0530)]
mgr/dashboard: alert badge includes suppressed alerts

On a cluster with alerting enabled, when alerts are triggered, even if they are silenced, the vertical navigation item (Cluster > Monitoring) displays the total number of alerts, including the ones suppressed.This PR intends to fix this issue.

Fixes: https://tracker.ceph.com/issues/48591
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit b4e32461f1f8430f223965c245974b2a2dbab3aa)

4 years agomgr/dashboard: prometheus alerting: add some leeway for package drops and errors... 39507/head
Patrick Seidensal [Wed, 11 Nov 2020 17:55:30 +0000 (18:55 +0100)]
mgr/dashboard: prometheus alerting: add some leeway for package drops and errors (1%)

Fixes: https://tracker.ceph.com/issues/48201
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit 9ac248b0c309b95d33bb0b1b64dc2e397bf8508e)