]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Sebastian Wagner [Fri, 5 Jun 2020 10:55:15 +0000 (12:55 +0200)]
doc/cephadm: Adopt single-site RGW
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
10b4f7a6d822f175bf0aab6d8b26dd09cb737de0 )
Sebastian Wagner [Fri, 5 Jun 2020 10:17:03 +0000 (12:17 +0200)]
qa/cephadm: update adopt corpus
to
9cd9ad020d93b0b420924fec55da307aff8bd422
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
e45e9bf84e84a6e6c57c45b1f30283682ea40b07 )
Sebastian Wagner [Thu, 4 Jun 2020 07:53:10 +0000 (09:53 +0200)]
doc/cephadm: Add alternative error for missing CIDR network
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
bd43551304575a9eb22e0c01ba36ef535a65fa50 )
Sebastian Wagner [Wed, 3 Jun 2020 13:25:27 +0000 (15:25 +0200)]
doc/mgr: add docs for unmanaged=True
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
a46d582422bf9e24af920420f73e4b447dafbc61 )
Kiefer Chang [Fri, 29 May 2020 09:23:01 +0000 (17:23 +0800)]
mgr/cephadm: refactor templating in services
Using Jinja2 to render configs for services:
- Grafana
- Alertmanager
- Prometheus
- NFS
- iSCSI
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit
544629833949a4104e236f19054fc614e0077f96 )
Kiefer Chang [Fri, 29 May 2020 09:22:07 +0000 (17:22 +0800)]
mgr/cephadm: add template engine Jinja2
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit
64bb27f2f62010de44d50bc1a876436159770b56 )
Joshua Schmid [Wed, 3 Jun 2020 10:26:16 +0000 (12:26 +0200)]
doc/cephadm: align to all-available-devices flag
Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit
e9600666e0ab85203172b3d033322635197cd5c3 )
Michael Fritch [Thu, 4 Jun 2020 16:39:51 +0000 (10:39 -0600)]
mgr/orch: use keyword rather than positional arg
use keyword `service_id` from the orch cli
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
248888dab4bc3b173210c48fbdba031091fd3f19 )
Michael Fritch [Wed, 3 Jun 2020 20:50:40 +0000 (14:50 -0600)]
mgr/cephadm: use keyword rather than positional arg
use keyword `service_id` during the ServiceSpec tests
cephadm/tests/test_cephadm.py:51: in <module>
class TestCephadm(object):
cephadm/tests/test_cephadm.py:508: in TestCephadm
???
../../python-common/ceph/deployment/service_spec.py:606: in __init__
assert service_type == 'iscsi'
E AssertionError
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
a4a523d5fb9753945f677d9bd8eabb2e970691af )
Michael Fritch [Wed, 3 Jun 2020 20:44:30 +0000 (14:44 -0600)]
mgr/cephadm: fix RGWSpec mypy errors
cephadm/module.py:34: note: In module imported here:
cephadm/services/cephadmservice.py: note: In member "config" of class "RgwService":
cephadm/services/cephadmservice.py:167: error: Incompatible types in assignment (expression has type "List[str]", variable has type "str")
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
bd6ea9c6a92ffbfa8676212b85d590e12decdbf5 )
Michael Fritch [Wed, 3 Jun 2020 20:52:44 +0000 (14:52 -0600)]
python-common: fix pytest failure
523: error: Unsupported operand types for + ("str" and "None")
523: note: Right operand is of type "Optional[str]"
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
30a9c2f51747deb4861d1b6eaba667585e6957d0 )
Michael Fritch [Wed, 3 Jun 2020 17:08:29 +0000 (11:08 -0600)]
python-common: add ServiceSpec type checking
- add missing type checking to NFSServiceSpec and IscsiServiceSpec
- clean-up type checking for ServiceSpec and RGWSpec
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
5ca009c86857b9af301024db6a9c2d63ebb7cb3a )
gk [Tue, 2 Jun 2020 05:34:57 +0000 (13:34 +0800)]
cephadm: fix package is not running when enabler is not none
Signed-off-by: shinhwagk <shanghai_sl@hotmail.com>
(cherry picked from commit
76919e79bf7f9c462bf6df8bc00225e56ed9ba97 )
Kefu Chai [Sun, 24 May 2020 04:34:59 +0000 (12:34 +0800)]
mgr/cephadm: drop py2 compatible bits
since we've dropped Python3 support in octopus, there is no need to keep
the workaround for python2 anymore.
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
2c71d733d6327a29617ba05b5d56891d45ad28d8 )
Sebastian Wagner [Fri, 29 May 2020 23:20:42 +0000 (01:20 +0200)]
cephadm: Add a bunch of type annotations
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
888754ba2c74fba42bc26c9006361150ed7ddc16 )
Juan Miguel Olmo Martínez [Wed, 27 May 2020 07:57:14 +0000 (09:57 +0200)]
cephadm: Make easy manager modules development
A volume replaces content in </usr/share/mgr> folder in manager containers.
The new argument <shared_mgr_folder> sets the source folder for the volume
Signed-off-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
(cherry picked from commit
f615591808a9ba2fc7b2f088016d33b72068e3e5 )
Sebastian Wagner [Thu, 14 May 2020 14:19:45 +0000 (16:19 +0200)]
qa/cephadm: Add RGW
Fixes: https://tracker.ceph.com/issues/43911
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
ffef64d046cb175732b4b97f898dabac5d83df10 )
Joshua Schmid [Tue, 12 May 2020 08:25:40 +0000 (10:25 +0200)]
python-common: improve host matching funcs
Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit
d2aa0543d924d659fa0c5321b3fa9c607a44b5e3 )
Joshua Schmid [Tue, 12 May 2020 08:24:37 +0000 (10:24 +0200)]
mgr/test_orchestrator: placementspec->host matching adaption
Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit
646ff0f749a2c7bd7ffb1356bb6cec674f7c2c57 )
Joshua Schmid [Tue, 12 May 2020 08:24:25 +0000 (10:24 +0200)]
mgr/rook: placementspec->host matching adaption
Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit
d488de90ad7fbcf4ea838d8ca33511fdae7823d8 )
Joshua Schmid [Tue, 12 May 2020 08:24:10 +0000 (10:24 +0200)]
mgr/cephadm: placementspec->host matching adaption
Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit
02231859860d096689c4f2e3f5ea4d502d8dc761 )
Joshua Schmid [Thu, 30 Apr 2020 13:05:31 +0000 (15:05 +0200)]
python-common: only validate host_pattern if present
Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit
3b771811859b56bf004f5016fa0fb9173c417865 )
Daniel-Pivonka [Fri, 24 Apr 2020 13:46:46 +0000 (09:46 -0400)]
mgr/cephadm: cephadm bootstrap add --apply-spec <cluster.yaml>
Have a single command when setting up a cluster for Day 1
example spec
---
service_type: host
addr: jmo-node-00
hostname: jmo-node-00
labels:
- test
- test2
---
service_type: host
addr: jmo-node-01
hostname: jmo-node-01
labels:
- grafana
---
service_type: host
addr: jmo-node-02
hostname: jmo-node-02
---
service_type: grafana
placement:
label: "grafana"
---
service_type: osd
placement:
host_pattern: '*'
data_devices:
all: true
Signed-off-by: Daniel-Pivonka <dpivonka@redhat.com>
(cherry picked from commit
fed98dfab1436a136d0e017b51197f0ff10d78df )
Michael Fritch [Mon, 1 Jun 2020 21:24:35 +0000 (15:24 -0600)]
mgr/orch: allow '.' char in hostname
Fixes: https://tracker.ceph.com/issues/45399
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit
9c14f0d1cdf123ae9216029c9aaef1e09fd81c24 )
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 )