]>
git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/log
Volker Theile [Thu, 25 Jun 2020 15:03:51 +0000 (17:03 +0200)]
mgr/dashboard: Display check icon instead of true|false in various datatables
- Convert the boolean values true|false to a check icon in datatable columns.
- Remove unused code in the user management list.
Fixes: https://tracker.ceph.com/issues/46209
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit
277b3f636e6c65291bed037c1b9c69563e28de35 )
Sebastian Wagner [Thu, 2 Jul 2020 09:26:52 +0000 (11:26 +0200)]
Merge pull request #35568 from sebastian-philipp/octopus-backport-34633-35099-35459-35521-35504-35474-35538
octopus: cephadm batch backport June (3)
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Josh Durgin [Wed, 1 Jul 2020 19:29:27 +0000 (12:29 -0700)]
Merge branch 'wip-46095-octopus' into octopus - from https://github.com/ceph/ceph/pull/35685
octopus: mon: Warn when too many reads are repaired on an OSD
Reviewed-by: Neha Ojha <nojha@redhat.com>
David Zafman [Tue, 16 Jun 2020 23:28:58 +0000 (16:28 -0700)]
test: flush_pg_stats() ignore OSDs that don't respond to getting sequence
This eliminates bogus errors in the logs and returned from flush_pg_stats()
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
41322eaa62be0de20fdedb44d5817a3f1916ab5e )
David Zafman [Wed, 10 Jun 2020 02:24:00 +0000 (19:24 -0700)]
mgr: Warn when too many reads are repaired on an OSD
Include test case
Configurable by setting mon_osd_warn_num_repaired (default 10)
Ignore new health warning with random eio injection test
Fixes: https://tracker.ceph.com/issues/41564
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
661996d4342c427209b1eae4b0247f8210a00fc3 )
Yuri Weinstein [Wed, 1 Jul 2020 19:22:32 +0000 (12:22 -0700)]
Merge pull request #35715 from dzafman/wip-46115
octopus: tools: Add statfs operation to ceph-objecstore-tool
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Yuri Weinstein [Wed, 1 Jul 2020 19:20:35 +0000 (12:20 -0700)]
Merge pull request #35550 from neha-ojha/wip-reduce-noise-octopus
octopus: qa/tasks/ceph_manager.py: dump more useful info before failing
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Yuri Weinstein [Wed, 1 Jul 2020 19:19:39 +0000 (12:19 -0700)]
Merge pull request #35136 from shyukri/wip-45209-octopus
octopus: monitoring: alert for pool fill up broken
Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Jan Fajerski [Wed, 1 Jul 2020 12:30:06 +0000 (14:30 +0200)]
Merge pull request #35830 from guits/wip-46251-octopus
octopus: ceph-volume: add dmcrypt support in raw mode
Nathan Cutler [Wed, 1 Jul 2020 10:42:02 +0000 (12:42 +0200)]
Merge pull request #35753 from smithfarm/wip-wipe-prn-octopus
octopus: doc: PendingReleaseNotes: clean slate for 15.2.5
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Patrick Donnelly [Tue, 30 Jun 2020 21:22:15 +0000 (14:22 -0700)]
Merge PR #35809 into octopus
* refs/pull/35809/head:
qa/tasks/vstart_runner.py: be python3 compatible
doc/dev/developer_guide: use python3 to launch vstart_runner.py
pybind/mgr/dashboard/run-backend-api-tests.sh: use python3 by default
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Jenkins Build Slave User [Tue, 30 Jun 2020 15:40:51 +0000 (15:40 +0000)]
15.2.4
Guillaume Abrioux [Thu, 25 Jun 2020 11:33:09 +0000 (13:33 +0200)]
ceph-volume: remove unused function
This function is never called in raw context, let's remove it.
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit
20e8286f5e1b79678b17659272daa1e28e763618 )
Guillaume Abrioux [Tue, 23 Jun 2020 12:54:50 +0000 (14:54 +0200)]
ceph-volume: add raw testing coverage
This commit adds testing against `ceph-volume raw` subcommand.
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit
7bb811c3b6ec25ca34734131115cee531439f0ff )
Guillaume Abrioux [Fri, 24 Apr 2020 14:45:02 +0000 (16:45 +0200)]
ceph-volume: add dmcrypt support in raw mode
This commit adds the dmcrypt support in `ceph-volume raw` mode.
Note about `ceph-volume raw list` change:
Given `lsblk -J` (json output) option isn't available on all OS, I came up with
adding '--inverse' option to the existing command which allows us to get the
mapper devices list in that command output. Not listing root devices containing
partitions shouldn't have side effect since we are in `ceph-volume raw`
context.
example:
running `lsblk --paths --nodeps --output=NAME --noheadings` doesn't allow to
get the mapper list because the output is like following :
$ lsblk --paths --nodeps --output=NAME --noheadings
/dev/sda
/dev/sdb
/dev/sdc
/dev/sdd
the dmcrypt mappers are hidden because of the `--nodeps` given they are
displayed as a dependency.
$ lsblk --paths --output=NAME --noheadings
/dev/sda
|-/dev/mapper/ceph-
3b52c90d -6548-407d-bde1-
efd31809702f -sda-block-dmcrypt
`-/dev/mapper/ceph-
3b52c90d -6548-407d-bde1-
efd31809702f -sda-db-dmcrypt
/dev/sdb
/dev/sdc
/dev/sdd
adding `--inverse` is a trick to get around this issue, the counterpart is that
we can't list root devices if they contain at least one partition but this
shouldn't be an issue in `ceph-volume raw` context given we only deal with
raw devices.
Fixes: https://tracker.ceph.com/issues/45959
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit
159c30d29f009c07e51a4bd7cd5ecea8cf6c8739 )
Kefu Chai [Mon, 20 Apr 2020 10:27:58 +0000 (18:27 +0800)]
qa/tasks/vstart_runner.py: be python3 compatible
differentiate `str` and `bytes` instances, and drop python2 support from
vstart_runner.py, as we've moved to python3 already
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
bedea85019076999a205c421bbf593ab8ab0641b )
Kefu Chai [Mon, 20 Apr 2020 10:26:27 +0000 (18:26 +0800)]
doc/dev/developer_guide: use python3 to launch vstart_runner.py
as vstart_runner.py is compatible with python3, and so is the tests
under `qa/` directory.
and use `pip` to install teuthology, simpler this way.
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
c6e48ef0f024b4a3f4b457367544d773197933d4 )
Kefu Chai [Mon, 20 Apr 2020 11:13:52 +0000 (19:13 +0800)]
pybind/mgr/dashboard/run-backend-api-tests.sh: use python3 by default
since vstart_runner.py is now py3, let's use python3 by default
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
d54f3ea43e05c2823c813e9687194b0b1fe15ffe )
Yuri Weinstein [Fri, 26 Jun 2020 20:22:29 +0000 (13:22 -0700)]
Merge pull request #35807 from cbodley/wip-qa-rgw-ceph-octopus
octopus: qa/rgw: run external tests against ceph-octopus branch
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Casey Bodley [Fri, 26 Jun 2020 20:03:34 +0000 (16:03 -0400)]
octopus: qa/rgw: run external tests against ceph-octopus branch
Signed-off-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Fri, 26 Jun 2020 15:44:51 +0000 (08:44 -0700)]
Merge pull request #35801 from yuriw/wip-yuriw-rgw-octopus
qa/test: fixed s3tests, changed to `force-branch: ceph-octopus`
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Fri, 26 Jun 2020 13:47:42 +0000 (06:47 -0700)]
qa/test: fixed s3tests, changed to `force-branch: ceph-octopus`
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
Yuri Weinstein [Thu, 25 Jun 2020 18:28:58 +0000 (11:28 -0700)]
Merge pull request #35780 from sebastian-philipp/octopus-qa-cephad-upgrade-no-rgw
octopus: qa/cephadm/upgrade: Exclude RGW for now
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Abhishek L [Thu, 25 Jun 2020 17:42:22 +0000 (19:42 +0200)]
Merge pull request #35774 from theanalyst/octopus-rgw-cors-fixes
octopus: rgw: sanitize newlines in s3 CORSConfiguration's ExposeHeader
Reviewed-By: Josh Durgin <jdurgin@redhat.com>
Reviewed-By: Abhishek Lekshmanan <abhishek@suse.com>
Sebastian Wagner [Thu, 25 Jun 2020 08:54:24 +0000 (10:54 +0200)]
qa/cephadm/upgrade: use quay.ceph.io
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
ab1d42c991037741064f35a9e881c7a45ef8b6c4 )
Sebastian Wagner [Thu, 25 Jun 2020 07:55:51 +0000 (09:55 +0200)]
qa/cephadm/upgrade: Exclude RGW for now
tasks/cephadm.py gained RGW support very recently and
I'm now facing a dilemman:
* Either we set the upgrade start to 15.2.4 and thus
no longer upgrade from an old version, or
* Disable RGW upgrade for now.
I think doing both would be optinal, but for now, let's
disable RGW, in order to keep the coverage for everything
else.
Fixes: https://tracker.ceph.com/issues/46157
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
4c5b20f9168d2d7ea40f48702f1bc9fb999bbce3 )
Casey Bodley [Tue, 26 May 2020 19:03:03 +0000 (15:03 -0400)]
rgw: sanitize newlines in s3 CORSConfiguration's ExposeHeader
the values in the <ExposeHeader> element are sent back to clients in a
Access-Control-Expose-Headers response header. if the values are allowed
to have newlines in them, they can be used to inject arbitrary response
headers
this issue only affects s3, which gets these values from an xml document
in swift, they're given in the request header
X-Container-Meta-Access-Control-Expose-Headers, so the value itself
cannot contain newlines
Signed-off-by: Casey Bodley <cbodley@redhat.com>
Reported-by: Adam Mohammed <amohammed@linode.com>
Nathan Cutler [Wed, 24 Jun 2020 19:08:40 +0000 (21:08 +0200)]
doc: PendingReleaseNotes: clean slate for 15.2.5
All of these Pending Release Notes have been included in the official
15.2.4 Release Notes, so keeping them in this file any longer would be
counterproductive.
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Sebastian Wagner [Tue, 23 Jun 2020 20:38:23 +0000 (22:38 +0200)]
Merge pull request #35625 from kshtsk/wip-46061-octopus
octopus: qa/tasks/cephadm: setup site based container registry
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Yuri Weinstein [Tue, 23 Jun 2020 20:15:47 +0000 (13:15 -0700)]
Merge pull request #35517 from votdev/wip-45952-octopus
octopus: mgr/dashboard: Show labels in hosts page
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Yuri Weinstein [Tue, 23 Jun 2020 20:14:40 +0000 (13:14 -0700)]
Merge pull request #35498 from ifed01/wip-ifed-hybrid-alloc-octopus
octopus: os/bluestore: introduce hybrid allocator
Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
Yuri Weinstein [Tue, 23 Jun 2020 20:13:10 +0000 (13:13 -0700)]
Merge pull request #35463 from bk201/wip-45836-octopus
octopus: monitoring: fixing some issues in RBD detail dashboard
Reviewed-by: Stephan Müller <smueller@suse.com>
Yuri Weinstein [Tue, 23 Jun 2020 20:12:24 +0000 (13:12 -0700)]
Merge pull request #35446 from smithfarm/wip-45682-octopus
octopus: os/bluestore: fix large (>2GB) writes when bluefs_buffered_io = true
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Yuri Weinstein [Tue, 23 Jun 2020 20:11:29 +0000 (13:11 -0700)]
Merge pull request #35236 from smithfarm/wip-45676-octopus
octopus: qa/workunits: Remove redundant Xenial cmake3 requirements
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Yuri Weinstein [Tue, 23 Jun 2020 20:10:18 +0000 (13:10 -0700)]
Merge pull request #34849 from rhcs-dashboard/wip-45346-octopus
octopus: mgr/dashboard: Asynchronous unique username validation for User Component
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Lenz Grimmer [Tue, 23 Jun 2020 10:13:21 +0000 (12:13 +0200)]
Merge pull request #35718 from callithea/wip-46136-octopus
octopus: mgr/dashboard: fix autocomplete input backgrounds in chrome and firefox
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ishan Rai <ishanrai05@gmail.com>
Laura Paduano [Tue, 23 Jun 2020 08:47:41 +0000 (10:47 +0200)]
Merge pull request #35135 from shyukri/wip-45557-octopus
octopus: mgr/dashboard: Prevent dashboard breakdown on bad pool selection
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Laura Paduano [Tue, 23 Jun 2020 08:40:59 +0000 (10:40 +0200)]
Merge pull request #35706 from tspmelo/wip-45541-octopus
octopus: mgr/dashboard: Fix random E2E error in mgr-modules
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Laura Paduano [Tue, 23 Jun 2020 07:27:50 +0000 (09:27 +0200)]
Merge pull request #35693 from rhcs-dashboard/wip-45727-octopus
octopus: mgr/dashboard: grafana panels for rgw multisite sync performance
Reviewed-by: Ernesto Puertat <epuertat@redhat.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Ishan Rai [Fri, 19 Jun 2020 14:56:16 +0000 (14:56 +0000)]
mgr/dashboard: fix autocomplete input backgrounds in chrome and firefox
Fixes: https://tracker.ceph.com/issues/46109
Signed-off-by: Ishan Rai <ishanrai05@gmail.com>
(cherry picked from commit
01df08a49d7d06c7688cc1bcb5eac1fac402c5da )
David Zafman [Thu, 18 Jun 2020 01:08:25 +0000 (18:08 -0700)]
tools: Add statfs operation to ceph-objecstore-tool
Fixes: https://tracker.ceph.com/issues/46064
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
19054ceb43bb2f56dadfe5462d546f2ee1de9263 )
Yuri Weinstein [Mon, 22 Jun 2020 17:45:30 +0000 (10:45 -0700)]
Merge pull request #35670 from kotreshhr/wip-46001-octopus
octopus: mgr/volumes: Add snapshot info command
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>
Yuri Weinstein [Mon, 22 Jun 2020 17:44:54 +0000 (10:44 -0700)]
Merge pull request #35671 from kotreshhr/wip-45849-octopus
octopus: mgr/volumes: Create subvolume with isolated rados namespace
Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Yuri Weinstein [Mon, 22 Jun 2020 17:43:16 +0000 (10:43 -0700)]
Merge pull request #35600 from smithfarm/wip-46013-octopus
octopus: qa/vstart_runner: update vstart_runner.LocalRemote.sh
Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Mon, 22 Jun 2020 17:41:14 +0000 (10:41 -0700)]
Merge pull request #35555 from Vicente-Cheng/wip-45851-octopus
octopus: mds: flag backtrace scrub failures for new files as okay
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Yuri Weinstein [Mon, 22 Jun 2020 17:39:51 +0000 (10:39 -0700)]
Merge pull request #35554 from Vicente-Cheng/wip-45848-octopus
octopus: qa/tasks/vstart_runner.py: add def mountpoint parameter
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Yuri Weinstein [Mon, 22 Jun 2020 17:37:30 +0000 (10:37 -0700)]
Merge pull request #35451 from smithfarm/wip-45846-octopus
octopus: tests: cephfs: run modprobe beforehand so that /sys/fs/fuse/connections is never absen
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>t
Yuri Weinstein [Mon, 22 Jun 2020 17:36:05 +0000 (10:36 -0700)]
Merge pull request #35450 from smithfarm/wip-45845-octopus
octopus: src/client/fuse_ll: compatible with libfuse3.5 or higher
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Yuri Weinstein [Mon, 22 Jun 2020 17:34:36 +0000 (10:34 -0700)]
Merge pull request #35449 from smithfarm/wip-45842-octopus
octopus: cephfs: fuse: add the '-d' option back for libfuse
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Yuri Weinstein [Mon, 22 Jun 2020 17:33:54 +0000 (10:33 -0700)]
Merge pull request #34998 from smithfarm/wip-45476-octopus
octopus: cephfs-shell: Change tox testenv name to py3
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Mon, 22 Jun 2020 17:31:27 +0000 (10:31 -0700)]
Merge pull request #35616 from Vicente-Cheng/wip-45888-octopus
octopus: qa/tasks/cephfs/test_scrub.py: use umount_wait to avoid possible ceph-fuse daemon stuck
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Yuri Weinstein [Mon, 22 Jun 2020 17:28:00 +0000 (10:28 -0700)]
Merge pull request #35448 from smithfarm/wip-45838-octopus
octopus: mds: cleanup uncommitted fragments before mds goes to active
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Tiago Melo [Sat, 9 May 2020 02:28:39 +0000 (02:28 +0000)]
mgr/dashboard: Fix random E2E error in mgr-modules
This test failed at random times when it tried to find the new value of pool_ids
in the balancer module.
This happened because the value of pool_ids is automatically reverted by ceph,
so in some situations when we tried to read the new value,
it was already reverted and failed.
Enhanced the tests to be able to use any text input, not only the ones with
empty default values.
Fixes: https://tracker.ceph.com/issues/45445
Signed-off-by: Tiago Melo <tmelo@suse.com>
(cherry picked from commit
08bb5a851f729b01c7cf69f662588903fd7c14bc )
Nathan Cutler [Mon, 22 Jun 2020 11:35:47 +0000 (13:35 +0200)]
Merge pull request #35268 from callithea/wip-45710-octopus
octopus: mgr/dashboard: redesign the login screen
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Nathan Cutler [Mon, 22 Jun 2020 10:44:56 +0000 (12:44 +0200)]
Merge pull request #35269 from callithea/wip-45368-octopus
octopus: mgr/dashboard: displaying Service detail inside table
Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Sebastian Krah <skrah@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Alfonso Martínez [Fri, 22 May 2020 11:36:10 +0000 (13:36 +0200)]
mgr/dashboard: grafana panels for rgw multisite sync performance
* RGW sync perf. counters are now exposed through grafana panels.
* Sync Performance tab is only shown if rgw realm is detected.
* Prometheus module: added metrics suitable for prometheus consumption (from existing ones, not replacing for backward compatibility).
Fixes: https://tracker.ceph.com/issues/45310
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit
cf4ff7d2f03bc285a3fae3f27577333f11dab58a )
Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.spec.ts
src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.ts
- Backport conflicts resolved in these files.
Kefu Chai [Mon, 22 Jun 2020 06:59:49 +0000 (14:59 +0800)]
Merge pull request #35679 from tspmelo/wip-46111-octopus
octopus: mgr/dashboard: Fix e2e chromium binary validation
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Tiago Melo [Fri, 19 Jun 2020 11:19:16 +0000 (11:19 +0000)]
mgr/dashboard: Fix e2e chrome and chromium binaries verification
Fixes: https://tracker.ceph.com/issues/46110
Signed-off-by: Tiago Melo <tmelo@suse.com>
(cherry picked from commit
e4b8d7eac352eb31fd17e420521aa2c1ce44453f )
Conflicts:
src/pybind/mgr/dashboard/run-frontend-e2e-tests.sh
There was an extra square bracket in octopus that caused the conflict.
This was manually fixed, since the commit that removed it will not be
backported.
Lenz Grimmer [Fri, 19 Jun 2020 14:47:23 +0000 (16:47 +0200)]
Merge pull request #35243 from smithfarm/wip-45707-octopus
octopus: mgr/dashboard: Fix redirect after changing password
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
Kotresh HR [Mon, 27 Apr 2020 18:31:33 +0000 (00:01 +0530)]
mgr/volumes: Create subvolume with isolated rados namespace
1. Add --namespace-isolated option to 'subvolume create' command
to create subvolume in a separate RADOS namespace
2. Add "pool_namespace" field to 'subvolume info' command
which displays the rados namespace if set else empty string
Fixes: https://tracker.ceph.com/issues/45289
Signed-off-by: Kotresh HR <khiremat@redhat.com>
(cherry picked from commit
7396880d4096b3a2a813b8ebcdcdf3082ee98b23 )
Kotresh HR [Wed, 22 Apr 2020 10:40:27 +0000 (16:10 +0530)]
mgr/volumes: Add snapshot info command
The following command is added
"ceph fs subvolume snapshot info <vol_name> <sub_name> <snap_name> [<group_name>]"
The output is in json format with following fields
created_at: time of creation of snapshot in the format "YYYY-MM-DD HH:MM:SS:ffffff"
data_pool: data pool the snapshot belongs to
has_pending_clones: "yes" if snapshot clone is in progress otherwise "no"
protected: "yes" if snapshot is protected otherwise "no"
size: snapshot size in bytes
Fixes: https://tracker.ceph.com/issues/45237
Signed-off-by: Kotresh HR <khiremat@redhat.com>
(cherry picked from commit
171930ef773ee6630c76eb9581c725594fb4e884 )
Lenz Grimmer [Fri, 19 Jun 2020 09:14:26 +0000 (11:14 +0200)]
Merge pull request #35270 from callithea/wip-45232-octopus
octopus: mgr/dashboard: Show table details inside the datatable
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Sebastian Krah <skrah@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Jan Fajerski [Fri, 19 Jun 2020 08:15:37 +0000 (10:15 +0200)]
Merge pull request #35452 from shyukri/wip-45783-octopus
octopus: ceph-volume: add and delete lvm tags in a single lvchange call.
Nizamudeen A [Wed, 22 Apr 2020 11:23:41 +0000 (16:53 +0530)]
mgr/dashboard: Asynchronous unique username validation for User Component
Implements an asynchronous validation for the username field in the Create User form which immediately display an error message if the username already exists.
Fixes: https://tracker.ceph.com/issues/36375
Signed-off-by: Nizamudeen <nia@redhat.com>
(cherry picked from commit
c4dfe20c08ecb9e50b7cb7bef6eb603e04d56387 )
Ishan Rai [Tue, 12 May 2020 09:10:28 +0000 (14:40 +0530)]
mgr/dashboard: update background image in about modal box
Signed-off-by: Ishan Rai <ishanrai05@gmail.com>
(cherry picked from commit
80d5ad81fa740bd3b9f597632f546949700dc0ec )
Ishan Rai [Fri, 20 Mar 2020 11:22:06 +0000 (16:52 +0530)]
mgr/dashboard: redesign the login screen
fixes: https://tracker.ceph.com/issues/35689
Signed-off-by: Ishan Rai <ishanrai05@gmail.com>
(cherry picked from commit
6b35508ef87cf5c94f6290e5752e36af3acab9bf )
Yuri Weinstein [Thu, 18 Jun 2020 22:32:35 +0000 (15:32 -0700)]
Merge pull request #35444 from smithfarm/wip-45882-octopus
octopus: Objecter: don't attempt to read from non-primary on EC pools
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
Yuri Weinstein [Thu, 18 Jun 2020 22:31:21 +0000 (15:31 -0700)]
Merge pull request #35442 from smithfarm/wip-45775-octopus
octopus: osd: make "missing incremental map" a debug log message
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Thu, 18 Jun 2020 22:29:45 +0000 (15:29 -0700)]
Merge pull request #35382 from jschmid1/wip-45880-octopus
octopus: osd: add --osdspec-affinity flag
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Yuri Weinstein [Thu, 18 Jun 2020 22:28:49 +0000 (15:28 -0700)]
Merge pull request #35291 from callithea/wip-45738-octopus
octopus: mgr/dashboard: Proposed About Modal box
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
Yuri Weinstein [Thu, 18 Jun 2020 22:26:04 +0000 (15:26 -0700)]
Merge pull request #35152 from callithea/wip-45370-octopus
octopus: mgr/dashboard: ECP modal enhancement
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Yuri Weinstein [Thu, 18 Jun 2020 22:24:47 +0000 (15:24 -0700)]
Merge pull request #35151 from callithea/wip-45468-octopus
octopus: monitoring: Fix "10% OSDs down" alert description
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
Yuri Weinstein [Thu, 18 Jun 2020 22:23:01 +0000 (15:23 -0700)]
Merge pull request #35447 from smithfarm/wip-45773-octopus
octopus: cephfs: vstart_runner: set mounted to True at the end of mount()
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Yuri Weinstein [Thu, 18 Jun 2020 22:22:36 +0000 (15:22 -0700)]
Merge pull request #35256 from Vicente-Cheng/wip-45680-octopus
octopus: mgr/volumes: Fix subvolume create idempotency
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Jeff Layton [Wed, 3 Jun 2020 15:29:07 +0000 (11:29 -0400)]
fuse: update to newer FUSE_USE_VERSION
The build was failing for me against fuse-devel v3.9.1. The prototype
for fuse_ll_ioctl was wrong, as it was expecting the old-style one with
signed int args.
In newer libfuse versions, the prototype varies based on
FUSE_USE_VERSION. Update to a newer FUSE_USE_VERSION value to ensure
that we use the newer ioctl prototype. This also means that we need to
handle a new prototype for fuse_session_loop_mt as well.
While we're in here, move the definition of FUSE_USE_VERSION to
ceph_fuse.h so we have the definition in one place. This does mean we
need to reorganize the includes in a few places.
Fixes: https://tracker.ceph.com/issues/45866
Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit
cfbc0fb48a9880dabe8f332e9bf67d81867ae198 )
Lenz Grimmer [Thu, 18 Jun 2020 11:32:02 +0000 (13:32 +0200)]
Merge pull request #35531 from bk201/wip-45921-octopus
octopus: mgr/dashboard: remove space after service name in the Hosts List table
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Kyr Shatskyy [Thu, 4 Jun 2020 13:23:54 +0000 (15:23 +0200)]
qa/tasks/cephadm: setup site based container registry
Add containers registry mirror for 'docker.io' to the config
file /etc/containers/registries.conf
Since we need site based config, so each teuthology instance
could have own containers' mirror, store corresponding data
in /etc/teuthology.yaml under 'overrides/cephadm' task specific
section.
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
d8edde0c53b80d01c3797c521c5adfc2ac0a99bb )
Xiubo Li [Thu, 23 Apr 2020 23:14:36 +0000 (19:14 -0400)]
qa/tasks/vstart_runner: make remote.sh return str as default
To address the issue in https://github.com/ceph/teuthology/pull/1459.
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit
624944503e7c6aa246331f4d9f291cf714296380 )
Xiubo Li [Mon, 1 Jun 2020 01:57:24 +0000 (21:57 -0400)]
qa/tasks/cephfs/test_scrub.py: use umount_wait to avoid ceph-fuse stuck
If the ceph-fuse client need to flush the caps and does sync wait,
the umount() will just return successfully, then the netns container
will be destroyed and the network will not be reachable, but the
ceph-fuse daemon is still stucked and waiting for the flush caps ack.
This will cause the ceph-fuse daemon get stuck forever and if the
mds daemons get restarted, it will try to reconnect the clients,
but the stucked ceph-fuse daemnon won't reply to it, because it is
not reachable any more.
Fixes: https://tracker.ceph.com/issues/45665
Signed-off-by: Xiubo Li <xiubli@redhat.com>
(cherry picked from commit
a7423b2286154a4403e586b5148984649f988a03 )
Rishabh Dave [Tue, 28 Apr 2020 10:19:19 +0000 (15:49 +0530)]
qa/cephfs: add FUSE module before running mount -t fusectl
Also, change timeout from 15 minutes to 30 seconds for the command
"mount -t fusectl xxx xxx" since 15 minutes is too much as per Zheng.
Fixes: https://tracker.ceph.com/issues/45304
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit
2d7c32997b9e5db5a13f5ed6e117ac9f71dac370 )
Kefu Chai [Mon, 20 Apr 2020 11:50:02 +0000 (19:50 +0800)]
qa/tasks/cephfs/fuse_mount.py: by python3 compatible
pass `StringIO()` to capture stdout whose value will be interpreted as a
string later on
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
c5bd318de65866b4992314c2fb0e82090b4d2979 )
Rishabh Dave [Fri, 13 Mar 2020 07:03:50 +0000 (07:03 +0000)]
qa/vstart_runner: update vstart_runner.LocalRemote.sh
Commit
9f6c764f10f replaces remote.run calls by remote.sh without
updating the definition of vstart_runner.LocalRemote.sh which breaks the
cephfs tests when executed locally.
Fixes: https://tracker.ceph.com/issues/44579
Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit
2cc0ee709c36eabe03311a00b72295da468bccf4 )
Conflicts:
qa/tasks/vstart_runner.py
- trivial
Kefu Chai [Tue, 16 Jun 2020 01:22:34 +0000 (09:22 +0800)]
Merge pull request #35364 from tchaikov/octopus-py3
octopus: migrate qa/ to Python3
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Kyr Shatskyy [Tue, 2 Jun 2020 17:05:30 +0000 (19:05 +0200)]
qa: add .teuthology_branch with `master` contents
This is follow up change for:
teuthology-suite: automate -t argument default value
https://github.com/ceph/teuthology/pull/1490
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
(cherry picked from commit
07cc36dcd264b66a7f3a19687b336737a772c2f5 )
Kiefer Chang [Thu, 11 Jun 2020 09:53:57 +0000 (17:53 +0800)]
mgr/cephadm: set Ganesha pool/namespace settings in the Dashboard
- Config Ganesha pool and namespace settings in Dashboard.
- New `config_dashboard` option in cephadm. If the flag is Flase,
cephadm won't manage Dashboard settings for daemons. This might be
useful when users want to config API URLs by themselves or for debugging.
Fixes: https://tracker.ceph.com/issues/45155
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit
130cadf6e571e8f3559fefa9b3e25b02e20b3d42 )
Sebastian Wagner [Wed, 10 Jun 2020 13:40:34 +0000 (15:40 +0200)]
mgr/dashboard: pylint: reduce number of branches
fixes: `R0912: Too many branches (14/12) (too-many-branches)`
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
4215ad58275ecaae45bb1b494085e753aa854356 )
Sebastian Wagner [Wed, 10 Jun 2020 12:06:44 +0000 (14:06 +0200)]
mgr/dashboard: fix None value for ints and floats
Fixes: https://tracker.ceph.com/issues/45963
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
f6f9b3fb999ea53afdd286639cc98dc9fe7a8531 )
Sebastian Wagner [Sun, 7 Jun 2020 16:24:30 +0000 (18:24 +0200)]
mgr/orch: apply: Fix proper error when passed unknown type
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
513f32aa5f4f2dbed57ed3e5aec59f7927fa7136 )
Sebastian Wagner [Mon, 18 May 2020 09:24:29 +0000 (11:24 +0200)]
doc/orch: How to update an existing specification
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
3204457917e29f691e972da472d023faf41e49f6 )
Sebastian Wagner [Thu, 11 Jun 2020 12:12:57 +0000 (14:12 +0200)]
mgr/test_orchestrator: Provide proper get_hosts_func
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
44cacc54c1582f83cec4caa6c38d35e8bc1be093 )
Sebastian Wagner [Thu, 4 Jun 2020 12:23:46 +0000 (14:23 +0200)]
python-common: Add Placement.filter_matching_hostspecs()
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
4730710d23d7794ee8e366049f7957909695cc65 )
Sebastian Wagner [Thu, 4 Jun 2020 12:13:14 +0000 (14:13 +0200)]
python-common: move HostSpec to python-common
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
eaa64b9732e393d62fc228d74efb1d7892b5be1d )
Zac Dover [Tue, 9 Jun 2020 14:15:43 +0000 (00:15 +1000)]
doc/cephadm: Import existing ssh key docs.
This commit supersedes the commit below, which was suggested by
mohnewald:
https://github.com/ceph/ceph/pull/34453/commits/
1cd278b08a342df1acf9b43dbc5c27ee686149c0
Co-author: https://github.com/mohnewald
Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit
fe7704fde88684b53265b262f6c2655b4798b455 )
Sebastian Wagner [Tue, 19 May 2020 16:18:55 +0000 (18:18 +0200)]
doc/cephadm: add Cephadm scheduler section
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
b30702136ba90b7da05675099c79139cf2dd2955 )
Sebastian Wagner [Wed, 6 May 2020 21:20:36 +0000 (23:20 +0200)]
mgr/cephadm: test scheduler migration
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
f873d49d3cd702c4856302c842e221d562950f9e )
Sebastian Wagner [Wed, 6 May 2020 10:50:18 +0000 (12:50 +0200)]
mgr/cephadm: Add migration to the new scheduler.
New scheduler that takes PlacementSpec as the bound and not as recommendation.
Which means, we have to make sure, we're not removing any daemons directly after
upgrading to the new scheduler.
There is a potential race here:
1. user updates his spec to remove daemons
2. mgr gets upgrades to new scheduler, before the old scheduler removed the daemon
3. now, we're converting the spec to explicit placement, thus reverting (1.)
I think this is ok.
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
074745217703ab57692fe8234a82130dc49179d6 )
Sebastian Wagner [Mon, 4 May 2020 10:37:37 +0000 (12:37 +0200)]
mgr/cephadm: serve(): refactor _refresh_hosts_and_daemons
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
671f03b58a721af40a9d8d74ff860489981df8bf )
Sebastian Wagner [Thu, 30 Apr 2020 15:19:02 +0000 (17:19 +0200)]
mgr/orch: scheduler: handle co-located daemons
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
beb80c051cf40eecd8b501a9e0e86824d56007be )
Sebastian Wagner [Tue, 21 Apr 2020 13:15:08 +0000 (15:15 +0200)]
mgr/cephadm: add testing with labels and hostpatterns
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
eae4707749a858922d811cc15a1dcaff0900d09f )
Sebastian Wagner [Mon, 20 Apr 2020 21:56:08 +0000 (23:56 +0200)]
mgr/cephadm: add testing with daemons
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
2d3a5a234b693eb233c0f62fa09d6c508628ba6d )