]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Pritha Srivastava [Thu, 28 May 2020 12:24:01 +0000 (17:54 +0530)]
cls/rgw_gc: Fixing carriage returns in log statement.
Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
(cherry picked from commit
9a68cddda3f1aa94a7adb415ff186a615fb79fba )
Pritha Srivastava [Wed, 27 May 2020 08:40:20 +0000 (14:10 +0530)]
cls/rgw_gc: Clearing off urgent data in bufferlist, before
encoding the updated one.
If this is not done, urgent data keeps getting appended
to the head, finally overwriting queue data that results
in invalid entries.
Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
(cherry picked from commit
182382cf6368eaa6f9d1efbb883ae7813a9bf6d0 )
Yuri Weinstein [Fri, 5 Jun 2020 16:03:47 +0000 (09:03 -0700)]
Merge pull request #34995 from smithfarm/wip-44986-octopus
octopus: mgr: synchronize ClusterState's health and mon_status.
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Lenz Grimmer [Fri, 5 Jun 2020 14:05:26 +0000 (16:05 +0200)]
Merge pull request #34822 from votdev/wip-45324-octopus
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
Yuri Weinstein [Fri, 5 Jun 2020 00:35:42 +0000 (17:35 -0700)]
Merge pull request #35247 from rhcs-dashboard/wip-45369-octopus
octopus: mgr/dashboard/grafana: Add rbd-image details dashboard
Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Yuri Weinstein [Fri, 5 Jun 2020 00:33:14 +0000 (17:33 -0700)]
Merge pull request #35231 from s0nea/wip-45697-octopus
octopus: mgr/dashboard: replace hard coded telemetry URLs
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Yuri Weinstein [Thu, 4 Jun 2020 15:27:49 +0000 (08:27 -0700)]
Merge pull request #34910 from tspmelo/wip-45315-octopus
octopus: mgr/dashboard: Replace Protractor with Cypress
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Sebastian Wagner [Thu, 4 Jun 2020 14:55:56 +0000 (16:55 +0200)]
Merge pull request #35347 from sebastian-philipp/octopus-backport-35104-35142-34902-35198-35097-35195-35266-35159-35106-35229-35194-3500
octopus: cephadm batch backport June (1)
Reviewed-by: Michael Fritch <mfritch@suse.com>
Yuri Weinstein [Wed, 3 Jun 2020 20:50:39 +0000 (13:50 -0700)]
Merge pull request #34881 from hillpd/wip-45357-octopus
octopus: rados: prevent ShardedOpWQ suicide_grace drop when waiting for work.
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Jan Fajerski [Wed, 3 Jun 2020 14:50:20 +0000 (16:50 +0200)]
Merge pull request #35134 from shyukri/wip-45481-octopus
octopus: ceph-volume: add ceph.osdspec_affinity tag
Sebastian Wagner [Fri, 24 Apr 2020 09:22:28 +0000 (11:22 +0200)]
mgr/dashboard: Add dashboard to mon_command reference docs
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
6b029c09951d002fa6bf04390920f1232390fb2f )
Zac Dover [Mon, 11 May 2020 17:04:17 +0000 (03:04 +1000)]
Add note warning against the :latest tag.
Signed-off-by: Zac Dover <zac.dover@gmail.com>
Incorporating mgfritch's improvements.
Signed-off-by: Zac Dover <zac.dover@gmail.com>
s/docker/podman/ -- as per mgfritch's suggestion
Signed-off-by: Zac Dover <zac.dover@gmail.com>
s/: latest/:latest/
Signed-off-by: Zac Dover <zac.dover@gmail.com>
s/image ids/image IDs/ -- as per Alex Settle's suggestion.
Signed-off-by: Zac Dover <zac.dover@gmail.com>
Add note warning against the :latest tag.
Signed-off-by: Zac Dover <zac.dover@gmail.com>
s/image ids/image IDs/ -- as per Alex Settle's suggestion.
Signed-off-by: Zac Dover <zac.dover@gmail.com>
Linked to container page from cephadm install page.
Signed-off-by: Zac Dover <zac.dover@gmail.com>
Clarified the note directing readers to the container documentation.
Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit
f0fe08707768d0ee7dbbed2233d0ab32a9a1a744 )
Georgios Kyratsas [Thu, 28 May 2020 10:42:37 +0000 (12:42 +0200)]
qa/tasks/cephadm: Add check fox already set image
Adding a check for already bootstrapped clusters where the image is
already set to avoid overriding it.
Signed-off-by: Georgios Kyratsas <gkyratsas@suse.com>
(cherry picked from commit
fabcbeab2c5c8819ce20134fe316e102090dc00f )
Kiefer Chang [Wed, 27 May 2020 06:43:37 +0000 (14:43 +0800)]
mgr: include retval in MonCommandFailed exception
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit
c336d603932a808cc8f82dcf5867a1ddb4cf696b )
Kiefer Chang [Fri, 22 May 2020 06:27:56 +0000 (14:27 +0800)]
mgr/cephadm: config service_url in Dashboard for Prometheus and AlertManager
Calling Dashboard's CLI to set service URLs after deploying Prometheus
and AlertManager Daemons.
Fixes: https://tracker.ceph.com/issues/45625
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit
a6135429b95a86aaae0626ddb9f53f0a6118aad7 )
Ricardo Marques [Mon, 25 May 2020 10:53:59 +0000 (11:53 +0100)]
cephadm: Validate bootstrap "--dashboard-{key|crt}" path
Fixes: https://tracker.ceph.com/issues/45696
Signed-off-by: Ricardo Marques <rimarques@suse.com>
(cherry picked from commit
1ceca64d6b285eadb20a6807891aee0c92d04c09 )
Patrick Seidensal [Mon, 18 May 2020 13:31:29 +0000 (15:31 +0200)]
mgr/cephadm: remove unused imports
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit
7ca3b474eb2850dae26533ba82111951bffeacc2 )
Patrick Seidensal [Mon, 18 May 2020 11:35:09 +0000 (13:35 +0200)]
mgr/cephadm: reformat according to pep8
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit
07583d261d95868cdecd131d3a588f8d3142acc3 )
Patrick Seidensal [Mon, 18 May 2020 11:34:24 +0000 (13:34 +0200)]
mgr/cephadm: log all args not only in root mode
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit
41cbca7a3caa720913f878b3424f259b7aa7141f )
Patrick Seidensal [Mon, 18 May 2020 11:34:05 +0000 (13:34 +0200)]
mgr/cephadm: remove unused variable
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit
bf2060883e3aa83c2731920c88076f50aadeae7f )
Patrick Seidensal [Fri, 15 May 2020 14:37:00 +0000 (16:37 +0200)]
mgr/cephadm: add types to function parameters
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit
d76bf4cfae410a56c4c722cffedbfc0e55a4bdfa )
Patrick Seidensal [Mon, 25 May 2020 13:43:38 +0000 (15:43 +0200)]
mgr/cephadm: custom images for monitoring components
Namely,
- Grafana
- Prometheus
- Alertmanager and
- Node exporter.
Fixes: https://tracker.ceph.com/issues/45463
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit
5d601bc781ab163599f3f17d788a36a1207d7624 )
Patrick Donnelly [Wed, 20 May 2020 23:15:29 +0000 (16:15 -0700)]
pybind/mgr/cephadm: remove mds auth cap for nfs recovery db cred
There's no reason for this cap to be used for talking to the MDS. The
individual exports have their own caps for talking to the file system.
Fixes: https://tracker.ceph.com/issues/45632
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
dac13abf320810bf4fd6bca653af353df78af48f )
Joshua Schmid [Wed, 27 May 2020 09:10:30 +0000 (11:10 +0200)]
mgr/cephadm: fix host matching when multiple hosts match for in osd
previews
Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit
fc3b4d13ea73c6f89409c24e165397f23f84cbad )
Ricardo Marques [Wed, 27 May 2020 08:20:47 +0000 (09:20 +0100)]
cephadm: Alow users to provide ssh config during bootstrap
Custom ssh config can be provided by using the '--ssh-config' option
Signed-off-by: Ricardo Marques <rimarques@suse.com>
(cherry picked from commit
84c390f07f04396c31471d7871402d3ec6631860 )
Ricardo Marques [Fri, 22 May 2020 09:06:31 +0000 (10:06 +0100)]
cephadm: Allow users to provide ssh keys during bootstrap
Fixes: https://tracker.ceph.com/issues/45629
Signed-off-by: Ricardo Marques <rimarques@suse.com>
(cherry picked from commit
ad75937489794fb24dc6da4b975d191eed23db4e )
Matthew Oliver [Fri, 15 May 2020 00:56:14 +0000 (10:56 +1000)]
cephadm: Make ceph-iscsi api user and password mandatory
The api user and password is required in order to use the API so let's
make these mandatory. The `ceph orch daemon add iscsi` now has them
mandatory:
ceph orch daemon add iscsi <pool> <api_user> <api_password>
If your using apply with a yaml file, the validate_add in the spec now
checks for these too.
Signed-off-by: Matthew Oliver <moliver@suse.com>
(cherry picked from commit
a36165b8dacaae3ab673a3e79f831a0de659341b )
Varsha Rao [Fri, 22 May 2020 11:50:50 +0000 (11:50 +0000)]
qa/tasks/mgr: Don't disable cephadm module
Fixes: https://tracker.ceph.com/issues/45596
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
261c769333582247a149ade406ccffe2dce3be23 )
Matthew Oliver [Thu, 28 May 2020 01:59:19 +0000 (11:59 +1000)]
cephadm: Detect stale and then recreate connections
Currently we make and cache connections to nodes during a check_host.
If a cached connection is disconnect from the other end the remoto
connection object doesn't track this, so further checks to the host
fail.
I have pushed up a PR[0] to remoto to add a `has_connection` method to
their `BaseConnection` class, which we now use in this patch to check to
see if the connection is stale. If it is it is then recreated.
There is some monkey patching happening so we can add the required
`has_connection` to remoto in this patch which we can remove as soon as
the other PR have landed and a new version of remoto is released.
[0] https://github.com/alfredodeza/remoto/pull/56
Fixes: https://tracker.ceph.com/issues/45627
Fixes: https://tracker.ceph.com/issues/45032
Signed-off-by: Matthew Oliver <moliver@suse.com>
(cherry picked from commit
afabf82395361f5d2209a980578b4b6715d80f3d )
Juan Miguel Olmo Martínez [Tue, 19 May 2020 10:07:10 +0000 (12:07 +0200)]
doc: New section in device management
A new section to describe the command used to blink lights in physical devices
Signed-off-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
(cherry picked from commit
e0257273dd4c83049ab9cedf703f165b63b52d01 )
Patrick Seidensal [Tue, 5 May 2020 12:16:36 +0000 (14:16 +0200)]
mgr/dashboard: document Prometheus' security model
Fixes: https://tracker.ceph.com/issues/45377
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit
34765e9215f8a0f1476b09993a0703c38a691e4b )
Michael Fritch [Wed, 20 May 2020 14:27:17 +0000 (08:27 -0600)]
mgr/orch: add explicit naming tests (MDS / RGW)
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
959ee9bb68eb35daa60c8d065f1951abf0cf658d )
Michael Fritch [Wed, 20 May 2020 01:21:39 +0000 (19:21 -0600)]
mgr/orch: fixup chars before hostname without '.' test
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
41c0ccd638dff4f46a5b315a299b4725dbea9c5d )
Michael Fritch [Wed, 20 May 2020 01:20:35 +0000 (19:20 -0600)]
mgr/orch: allow MDS with explicit naming
Fixes: https://tracker.ceph.com/issues/45617
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
ac61f51f6a80f1abdde3bb3b548724e43e809039 )
Sebastian Wagner [Tue, 19 May 2020 13:28:03 +0000 (15:28 +0200)]
mgr/orch: allow RGWs with explicit naming
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
3c3a97eaaa9d3939209abe492d1bc7c5ff0f26a8 )
Varsha Rao [Wed, 13 May 2020 07:31:34 +0000 (07:31 +0000)]
qa/cephadm: Add roleless mon names to ctx.cluster.remotes role dict
Fixes: https://tracker.ceph.com/issues/45584
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
58eaeb53e4c7f0b5ed1131778304f72264f20e46 )
Sebastian Wagner [Tue, 2 Jun 2020 11:54:17 +0000 (13:54 +0200)]
Merge pull request #35343 from sebastian-philipp/octopus-qa-py2-filenotfound
octopus: qa/cephadm: FileNotFoundError doesn't exist in py2
Reviewed-by: Georgios Kyratsas <gkyratsas@suse.com>
Sebastian Wagner [Tue, 2 Jun 2020 11:39:45 +0000 (13:39 +0200)]
Merge pull request #35188 from sebastian-philipp/octopus-backport-34745-34658-34814-34778-34703-34773-34856-34898-34887-34820-34891-3490
octopus: Batch backport May (2)
Reviewed-by: Tim Serong <tserong@suse.com>
Sebastian Wagner [Fri, 29 May 2020 14:04:20 +0000 (16:04 +0200)]
qa/cephadm: FileNotFoundError doesn't exist in py2
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
eddb6354e157a653962e68d100c6881b5a0fdc24 )
Josh Durgin [Mon, 1 Jun 2020 22:13:35 +0000 (15:13 -0700)]
Merge pull request #35246 from yuriw/wip-yuriw-octopus-p2p-octopus
qa/tests: added v15.2.3 to parallel tests
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Yuri Weinstein [Mon, 1 Jun 2020 19:20:04 +0000 (12:20 -0700)]
Merge pull request #35255 from smithfarm/wip-45578-octopus
octopus: librbd: copy API should not inherit v1 image format by default
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Mon, 1 Jun 2020 19:19:14 +0000 (12:19 -0700)]
Merge pull request #35254 from smithfarm/wip-45643-octopus
octopus: rgw/notifications: version id was not sent in versioned buckets
Reviewed-by: Yuval Lifshitz <yuvalif@yahoo.com>
Yuri Weinstein [Mon, 1 Jun 2020 19:18:25 +0000 (12:18 -0700)]
Merge pull request #34991 from smithfarm/wip-45489-octopus
octopus: rgw: add "rgw-orphan-list" tool and "radosgw-admin bucket radoslist ..."
Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
Yuri Weinstein [Mon, 1 Jun 2020 19:17:38 +0000 (12:17 -0700)]
Merge pull request #34538 from smithfarm/wip-45074-octopus
octopus: build/ops: address SElinux denials observed in rgw/multisite test run
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Mon, 1 Jun 2020 19:15:30 +0000 (12:15 -0700)]
Merge pull request #35253 from smithfarm/wip-45708-octopus
octopus: mds: preserve ESlaveUpdate logevent until receiving OP_FINISH
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Yuri Weinstein [Mon, 1 Jun 2020 19:14:54 +0000 (12:14 -0700)]
Merge pull request #35252 from smithfarm/wip-45685-octopus
octopus: mds: take xlock in the order requests start locking
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Yuri Weinstein [Mon, 1 Jun 2020 19:14:25 +0000 (12:14 -0700)]
Merge pull request #35251 from smithfarm/wip-45678-octopus
octopus: cephfs: allow pool names with hyphen and period
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Yuri Weinstein [Mon, 1 Jun 2020 19:13:20 +0000 (12:13 -0700)]
Merge pull request #35250 from smithfarm/wip-45674-octopus
octopus: qa: use py3 compat list from range
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Yuri Weinstein [Mon, 1 Jun 2020 18:40:00 +0000 (11:40 -0700)]
Merge branch 'octopus' of https://github.com/ceph/ceph into wip-yuriw-octopus-p2p-octopus
Changed to v15.2.3
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
Josh Durgin [Sat, 30 May 2020 00:19:27 +0000 (17:19 -0700)]
Merge branch 'octopus-saved' into octopus
Jenkins Build Slave User [Fri, 29 May 2020 16:24:50 +0000 (16:24 +0000)]
15.2.3
Neha Ojha [Thu, 28 May 2020 14:34:52 +0000 (14:34 +0000)]
bluestore, common/options.cc: disable bluefs_preextend_wal_files
This is a temporary fix for https://tracker.ceph.com/issues/45613
to avoid WAL corruption because of enabling bluefs_preextend_wal_files
and bluefs_buffered_io together.
Fixes: https://tracker.ceph.com/issues/45613
Signed-off-by: Neha Ojha <nojha@redhat.com>
Sebastian Wagner [Fri, 29 May 2020 11:15:18 +0000 (13:15 +0200)]
Merge pull request #35260 from sebastian-philipp/octopus-backport-35235
octopus: qa/cephadm: Add local dockerhub mirror
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Sebastian Wagner [Fri, 29 May 2020 10:23:58 +0000 (12:23 +0200)]
qa/cephadm: sudo_write_file doesn't support unicode
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Sebastian Wagner [Wed, 27 May 2020 11:17:58 +0000 (13:17 +0200)]
qa/cephadm: Docker doesn't ship a registries.conf
I guess not using the mirror for docker based tests is ok for now.
For adding docker support, we need to:
1. change the docker config
2. restart the docker daemon
Note that Docker's config only supports to mirror the docker.io registry.
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
9310b6e278c78bdf3d4a6f46e3b17f6837f828ef )
Sebastian Wagner [Mon, 25 May 2020 16:13:50 +0000 (18:13 +0200)]
qa/cephadm: Add local registry mirror
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
d6edd8199f0ad3e34260e3d7eeb05e64ce726ca5 )
Conflicts:
qa/tasks/cephadm.py
qa/tox.ini
Changes:
qa/tox.ini converted to py2
Yuri Weinstein [Tue, 26 May 2020 22:16:32 +0000 (15:16 -0700)]
Merge pull request #35150 from Vicente-Cheng/wip-45599-octopus
octopus: client: expose Client::ll_register_callback via libcephfs
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Yuri Weinstein [Tue, 26 May 2020 22:15:28 +0000 (15:15 -0700)]
Merge pull request #35148 from Vicente-Cheng/wip-45603-octopus
octopus: mds: Handle blacklisted error in purge queue
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Yuri Weinstein [Tue, 26 May 2020 22:14:33 +0000 (15:14 -0700)]
Merge pull request #35147 from Vicente-Cheng/wip-45601-octopus
octopus: mds: don't shallow copy when decoding xattr map
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Yuri Weinstein [Tue, 26 May 2020 22:13:30 +0000 (15:13 -0700)]
Merge pull request #34999 from smithfarm/wip-45495-octopus
octopus: cephfs: Client: fix Finisher assert failure
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Yuri Weinstein [Tue, 26 May 2020 22:10:06 +0000 (15:10 -0700)]
Merge pull request #34997 from smithfarm/wip-45477-octopus
octopus: client: only set MClientCaps::FLAG_SYNC when flushing dirty auth caps
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Yuri Weinstein [Tue, 26 May 2020 22:08:36 +0000 (15:08 -0700)]
Merge pull request #34996 from smithfarm/wip-45473-octopus
octopus: bash_completion: Do not auto complete obsolete and hidden cmds
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Yuri Weinstein [Tue, 26 May 2020 22:07:57 +0000 (15:07 -0700)]
Merge pull request #34727 from kotreshhr/octopus-ceph-fs-status-output
octopus: mgr/status: Fix "ceph fs status" json format writing to stderr
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Yuri Weinstein [Tue, 26 May 2020 22:07:25 +0000 (15:07 -0700)]
Merge pull request #34509 from smithfarm/wip-45028-octopus
octopus: mds: don't assert empty io context list when shutting down
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Jason Dillaman [Tue, 12 May 2020 14:16:36 +0000 (10:16 -0400)]
librbd: copy API should not inherit v1 image format by default
When copying from a v1 image, by default the new destination image
would be created using the v1 format. Since the creation of v1 images
is disallowed, this has been updated to default to using the v2
image format.
Fixes: https://tracker.ceph.com/issues/45518
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
69b6d5997e8c6a11739e4d5a32564e61eb2f470f )
Yuval Lifshitz [Fri, 8 May 2020 07:09:32 +0000 (10:09 +0300)]
rgw/notifications: version id was not sent in versioned buckets
Signed-off-by: Yuval Lifshitz <ylifshit@redhat.com>
Fixes: https://tracker.ceph.com/issues/45440
(cherry picked from commit
973b0b1ed8767767f0c4446d97248c1b8002f1d3 )
songxinying [Sun, 12 Apr 2020 14:01:00 +0000 (22:01 +0800)]
mds: preserve ESlaveUpdate::OP_PREPARE logevent before doing commit
Fixes: https://tracker.ceph.com/issues/45024
Signed-off-by: songxinying <songxinying@sensetime.com>
(cherry picked from commit
4940ab62e0d19ce36e53bcc67b2a2161c47f6c6d )
Conflicts:
src/mds/Mutation.h
- where master has "ceph::buffer::list", octopus has "bufferlist"
Yan, Zheng [Mon, 27 Apr 2020 06:48:33 +0000 (14:48 +0800)]
mds: take xlock in the order requests start locking
this avoid assertion in MutaionImpl::finish_locking()
Fix: https://tracker.ceph.com/issues/45261
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit
2e11a35d5b06312e0b2d0aecd83e8eb882ddf719 )
Ramana Raja [Thu, 14 May 2020 10:06:22 +0000 (15:36 +0530)]
cephfs: allow pool names with '-' and '.'
... to be set as pool layouts for files and directories.
Fixes: https://tracker.ceph.com/issues/45521
Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit
d9f8f8e3d073de8e1cfd5075159420ca8dfdcf2d )
Patrick Donnelly [Mon, 18 May 2020 19:57:43 +0000 (12:57 -0700)]
qa: use py3 compat list from range
Fixes: https://tracker.ceph.com/issues/45590
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
8d51b33e5d70feec3b65ac3eb819a3515befcdac )
J. Eric Ivancich [Tue, 26 May 2020 15:06:56 +0000 (11:06 -0400)]
rgw: remove unused function obj_force_ns
Removing the function eliminates a compiler warning.
Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit
9a1e89173d398bf6e39a431d4b4ef9ab1f20e2bb )
Enno Gotthold [Tue, 28 Apr 2020 11:34:16 +0000 (13:34 +0200)]
mgr/dashboard: Remove additional unneeded steps for the metrics calculation
Signed-off-by: Enno Gotthold <egotthold@suse.de>
(cherry picked from commit
dfb1e0020ed8130a2276be1ca94d8e7d7f931273 )
Enno Gotthold [Wed, 18 Mar 2020 12:28:39 +0000 (13:28 +0100)]
doc/mgr/prometheus: Change images to rbd-enabled pools
Signed-off-by: Enno Gotthold <egotthold@suse.de>
(cherry picked from commit
db76547c8d829e529dcebccde100fca438d64446 )
Enno Gotthold [Wed, 18 Mar 2020 11:50:06 +0000 (12:50 +0100)]
mgr/prometheus: Add config value to honor ceph config in prometheus
Signed-off-by: Enno Gotthold <egotthold@suse.de>
Author: Ernesto Puerta <epuertat@redhat.com>
(cherry picked from commit
6d5f88450e61122016fcf7b6cf9431dc67128d3d )
Enno G [Fri, 20 Mar 2020 08:19:01 +0000 (09:19 +0100)]
doc: Add information on how to enable the rbd-images dashboard
Fixes: https://tracker.ceph.com/issues/44623
Signed-off-by: Enno Gotthold <egotthold@suse.de>
In the previous commit (
1c52ee2b ) the added dashboard will stay empty
until it is manually enabled to display information.
(cherry picked from commit
6386095e51a1d58fa0093d37b26df25c524b72bc )
Enno Gotthold [Wed, 18 Mar 2020 12:30:18 +0000 (13:30 +0100)]
mgr/dashboard: Add grafana chart for rbd image details
Fixes: https://tracker.ceph.com/issues/44623
Signed-off-by: Enno Gotthold <egotthold@suse.de>
This dashboard will per default be empty as the already existing
dashboard with the summary for all rbd images.
(cherry picked from commit
9707cb30cbbfc0f7c669e19fb9d2482ea422993c )
Yuri Weinstein [Tue, 26 May 2020 17:28:24 +0000 (10:28 -0700)]
qa/tests: added v15.2.2 to parallel tests
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
Tatjana Dehler [Thu, 7 May 2020 13:59:08 +0000 (15:59 +0200)]
mgr/dashboard: replace hard coded telemetry URLs
Replace the hard coded telemetry URLs by the
actual config option values given by the cluster.
Fixes: https://tracker.ceph.com/issues/45319
Signed-off-by: Tatjana Dehler <tdehler@suse.com>
(cherry picked from commit
9735947b4c159aec616493021cc2a39049418dc1 )
Michael Fritch [Mon, 18 May 2020 21:40:43 +0000 (15:40 -0600)]
cephadm: fixup command_deploy log line
fixup log line to reflect the deploy action
(e.g. deploy, reconfig, redeploy)
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
2571d1bd6da97ff852d22d18f6bffb42b2180d23 )
Michael Fritch [Mon, 18 May 2020 21:40:39 +0000 (15:40 -0600)]
cephadm: skip `port_in_use` during redeploy
skip the `port_in_use` check during reconfig/redeploy
of the monitoring components and nfs-ganesha
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
c85a34aaa70aca55a79e11396b57b31ded14d0b3 )
Michael Fritch [Mon, 18 May 2020 21:40:29 +0000 (15:40 -0600)]
cephadm: remove unused `reconfig` param from create_daemon_dirs
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
7a2e4f4a8b2a39877f983eb18dcfbe37fb8dc5f8 )
Michael Fritch [Mon, 18 May 2020 21:40:23 +0000 (15:40 -0600)]
cephadm: don't check port in use during nfs reconfig
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
6f4b5ac9dd4839741e1ceb8d48bf33bd6a5d7793 )
Sebastian Wagner [Fri, 15 May 2020 10:04:14 +0000 (12:04 +0200)]
mgr/cephadm: Fix OSDs not being created
Fixes: https://tracker.ceph.com/issues/45560
This was caused by completions no longer getting
executed synchonously.
Also
* We don't want to have a busy loop when applying OSDs
* Added call to `_apply_all_services` to OSD test
This is a follow-up on
f7bf4d0c597080f45bb8466bd6bab3b9cecb03c4
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
91c1c6181671719e958ab787f8f3c96850167d82 )
Sebastian Wagner [Fri, 15 May 2020 12:17:38 +0000 (14:17 +0200)]
doc/cephadm: accessing the admin socket
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
f0f86ce8bad6a9d6b892cedf9de4a9f36cb717cd )
Kefu Chai [Tue, 19 May 2020 11:09:26 +0000 (19:09 +0800)]
qa/tasks/cephadm: ignore tarfile.ReadError
there is chance that /var/log/ceph (and other directories) is not
created when cephadm fails, but we always try to collect /var/log/ceph
by tar the directory on the test node and transfer it back for archiving
it. when we fail to do so, an exception is thrown, and this exception is
in turn logged as the cause of the failure instead of the one which
fails the test.
in this change, `tarfile.TarError`s is caught and ignored if it is
thrown by `misc.pull_directory()`, as normally, we don't consider it a fatal
failure when `misc.pull_directory()` fails because of `tar`. the
failures for the test are.
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
d67b0f1e3ac12d2b38ab6455b5311bcb051acb05 )
Sebastian Wagner [Mon, 11 May 2020 09:53:11 +0000 (11:53 +0200)]
qa/cephadm: rm ubuntu_latest for now
Fixes: https://tracker.ceph.com/issues/45462
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
3742a28415836234a047d4c24c7c2fe910dd3fad )
Sebastian Wagner [Mon, 18 May 2020 10:39:36 +0000 (12:39 +0200)]
doc/cephadm: Synopsis: add `cephadm unit`
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
de278519040a7ff6a407daddfa74678959b7388a )
Sebastian Wagner [Mon, 18 May 2020 10:35:34 +0000 (12:35 +0200)]
cephadm: `ls`: also return systemd_unit
Let users directly know the systemd unit name.
Enable things like
```
cephadm ls | jq -r '.[].systemd_unit' | xargs -n 1 systemctl status | cat
```
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
d8f81540600ee1687030259ed535a390a5b65f09 )
Georgios Kyratsas [Wed, 13 May 2020 11:29:35 +0000 (13:29 +0200)]
qa/tasks/cephadm: Add support for raw disks
Currently tests on raw disks are failing due to stripping '/dev/' from
device name. (ie https://tracker.ceph.com/issues/45383#change-165721)
Signed-off-by: Georgios Kyratsas <gkyratsas@suse.com>
(cherry picked from commit
35e158605ef557671e8feec691fd245b17ea6189 )
Georgios Kyratsas [Tue, 5 May 2020 07:27:45 +0000 (09:27 +0200)]
qa/tasks/cephadm.py: Support bootstrapped clusters
Add the possibility of being able to run cephadm.py on clusters that
were already bootstrapped by some other task/way so you can deploy the
rest of the daemons/services.
Signed-off-by: Georgios Kyratsas <gkyratsas@suse.com>
(cherry picked from commit
a002b28bc1aa75e087d850759138763a9a2a3916 )
Sebastian Wagner [Thu, 14 May 2020 14:29:56 +0000 (16:29 +0200)]
mgr/cephadm: upgrade: use check_mon_command
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
ec5b8de70a246276d892ab8d1fad7ee1bde1ca2a )
Kiefer Chang [Fri, 15 May 2020 09:22:15 +0000 (17:22 +0800)]
mgr/dashboard: support setting iSCSI gateways from orchestrator
- Dashboard doesn't actively query iSCSI gateways from orchestrator anymore.
Instead, Orchestrator backend invokes iscsi-gateway-add CLI after any
iSCSI daemons are deployed.
- Add an optional argument `name` to `iscsi-gateway-add` command. If
`name` is provided, Dashboard won't issue API request to iSCSI gateway
to get the hostname. This is required because when orchestrator sets
the gateway via CLI, the gateway is just spawned and might be not
ready yet.
Fixes: https://tracker.ceph.com/issues/45163
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit
28483b3be1f04b71464cce8f98a526c8670f630d )
Kiefer Chang [Fri, 15 May 2020 09:20:55 +0000 (17:20 +0800)]
mgr/cephadm: config iSCSI gateways in Dashboard
- Add `daemon_check_post` fuction to allow services implement actions
needed to be done after daemons are checked.
- After iSCSI daemons are spawned, call dashboard CLI to
set the API URL of the daemons.
Fixes: https://tracker.ceph.com/issues/45163
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit
5674f46f0cec041d5a502182066a097b214dd928 )
Kiefer Chang [Fri, 15 May 2020 09:17:54 +0000 (17:17 +0800)]
mgr/cephadm: move iSCSI service class to its own file
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit
1aea3a0850ea7fcc12c15b39b4bd9039dab2c594 )
Joshua Schmid [Fri, 15 May 2020 09:34:27 +0000 (11:34 +0200)]
mgr/orchestrator: adapting orch interface to preview changes
Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit
15076923684f6933dfb9c20671ecf3234b68b5fc )
Joshua Schmid [Fri, 15 May 2020 09:33:31 +0000 (11:33 +0200)]
mgr/cephadm: adapt cephadm to osdspec preview caching
Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit
2d4b8c0b791ee74ae98f114018149bd5f74864be )
Joshua Schmid [Fri, 15 May 2020 09:32:03 +0000 (11:32 +0200)]
mgr/cephadm: add preview caching to inventory.py
Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit
9498b5f77b7c7c32bf3bc0f08617d39b047c4132 )
Patrick Seidensal [Fri, 15 May 2020 09:01:35 +0000 (11:01 +0200)]
mgr/cephadm: increase global scrape interval
Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit
b4a2afa8d2437e7c19cf33863e8db65047e02634 )
Varsha Rao [Fri, 15 May 2020 18:21:01 +0000 (23:51 +0530)]
mgr/cephadm/nfs: Instead of CACHEINODE use MDCACHE
As CACHEINODE will be deprecated soon.
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
f5e4631dc32bf1b3baa764991450ef6e9a459d14 )
Matthew Oliver [Tue, 12 May 2020 04:02:40 +0000 (14:02 +1000)]
cephadm: enable logging to stderr in ceph-iscsi
All the other ceph servies when deployed are deployed with:
--default-log-to-stderr=true --default-log-stderr-prefix=debug
--default-log-to-file=false
Ceph-iscsi doesn't have these as commandline params but once
https://github.com/ceph/ceph-iscsi/pull/186 lands it'll have something
similar as config options. This patch sets these options
Signed-off-by: Matthew Oliver <moliver@suse.com>
(cherry picked from commit
f65584637f8ee44e79e0976dcecc086d2ba7fe45 )