]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
5 years agorgw: nfs: disable gc, lc, quota, and sync threads by default
Matt Benjamin [Mon, 27 Apr 2020 23:07:47 +0000 (19:07 -0400)]
rgw: nfs: disable gc, lc, quota, and sync threads by default

These can be overridden by new options, should a site decide to
run a librgw with no radosgw instances.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit ccff9f122b94e25f1c6947cbc08a51577ccc6431)

5 years agorgwlc: properly accumulate in RGWLC::list_lc_progress()
Matt Benjamin [Fri, 24 Apr 2020 21:32:01 +0000 (17:32 -0400)]
rgwlc: properly accumulate in RGWLC::list_lc_progress()

Also track shard/index progress, clearing marker when the shard
is advanced.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit ed98de9fc45e4d28ba01b389fe2b2f225a4b8606)

5 years agorgwlc: LCOpAction MUST NOT acc. OCObjLister from WorkQ
Matt Benjamin [Tue, 21 Apr 2020 15:55:41 +0000 (11:55 -0400)]
rgwlc: LCOpAction MUST NOT acc. OCObjLister from WorkQ

Only a few actions had this coupling, and it is easily avoidable.
Making it -impossible- is left to future cleanup.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 7eb4e5b5cfe6b7e247612656c6793b28872f2639)

5 years agorgwlc: give radosgw-admin lc process more freedom to run
Matt Benjamin [Fri, 10 Apr 2020 14:47:46 +0000 (10:47 -0400)]
rgwlc: give radosgw-admin lc process more freedom to run

Makes two primary changes:

1. allows the admin lc process to re-run a bucket (but not
when a session is ACTIVE, to avoid overwriting session state)

2. to avoid confusion when rgw_lc_debug_interval is set and is small,
don't force lc process to exit early, allowing one run to clear all
expired objects during debug and test

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 759262cf1592cb7df3806e6964a80d75bead004a)

5 years agorgwlc: re-hook RGWRados::process_lc()
Matt Benjamin [Thu, 9 Apr 2020 19:31:51 +0000 (15:31 -0400)]
rgwlc: re-hook RGWRados::process_lc()

Allow the admin command to force a (single threaded) lifecycle
pass, do not instantiate background threads to do this.

Fix an apparent shutdown hang (found in the process_lc() path,
but actually general).

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 1051156c29b6a523350bb29523db0b386572e602)

5 years agorgwlc: revisions
Matt Benjamin [Tue, 31 Mar 2020 00:16:33 +0000 (20:16 -0400)]
rgwlc: revisions

Contains concurrency fixes, as well as improved debug prints.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 786358c224bd79f8f38bc2d2820af37564efcfec)

5 years agorgwlc: make rgwlc entries extensible and extend
Matt Benjamin [Wed, 1 Apr 2020 23:21:27 +0000 (19:21 -0400)]
rgwlc: make rgwlc entries extensible and extend

Add generation/run tracking to LC entries.  Define the entry as
a versioned structure, adapt accordingly.

N.B., has extra debug prints from later commit.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 394750597656d4f3ab7b8220af7046753117d39b)

Conflicts:
src/cls/rgw/cls_rgw.cc
src/cls/rgw/cls_rgw_client.h
src/cls/rgw/cls_rgw_ops.h
- adapt for Adam Emerson post-Octopus refactoring

5 years agoMerge pull request #36382 from ceph/fix-rbdmirroring-dropdown-menu
Lenz Grimmer [Fri, 7 Aug 2020 11:50:32 +0000 (13:50 +0200)]
Merge pull request #36382 from ceph/fix-rbdmirroring-dropdown-menu

octopus: mgr/dashboard: fix rbdmirroring dropdown menu

Reviewed-by: Ernesto Puertat <epuertat@redhat.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #36340 from smithfarm/wip-46742-octopus
Yuri Weinstein [Thu, 6 Aug 2020 17:59:52 +0000 (10:59 -0700)]
Merge pull request #36340 from smithfarm/wip-46742-octopus

octopus: osd: fix crash in _committed_osd_maps if incremental osdmap crc fails

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #36267 from Devp00l/wip-46693-octopus
Yuri Weinstein [Thu, 6 Aug 2020 17:59:08 +0000 (10:59 -0700)]
Merge pull request #36267 from Devp00l/wip-46693-octopus

octopus: mgr/dashboard: Always use fast angular unit tests

Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #36389 from smithfarm/wip-46798-octopus
Yuri Weinstein [Thu, 6 Aug 2020 15:20:20 +0000 (08:20 -0700)]
Merge pull request #36389 from smithfarm/wip-46798-octopus

octopus: rgw: append obj: prevent tail from being GC'ed

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agooctopus: mgr/dashboard: fix rbdmirroring dropdown menu 36382/head
Avan Thakkar [Thu, 30 Jul 2020 18:07:50 +0000 (23:37 +0530)]
octopus: mgr/dashboard: fix rbdmirroring dropdown menu

Fixes: https://tracker.ceph.com/issues/46566
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
This seems to be the same situation as https://tracker.ceph.com/issues/44458,
but in a different part of the frontend. Since we are not backporting
ngx-bootstrap to octopus, this has to be manually fixed in octopus.

5 years agoMerge pull request #35879 from ceph/wip-octopus-32493
Jan Fajerski [Tue, 4 Aug 2020 14:24:18 +0000 (16:24 +0200)]
Merge pull request #35879 from ceph/wip-octopus-32493

octopus: ceph-volume: don't use container classes in api/lvm.py

5 years agoMerge pull request #36409 from shyukri/wip-46148-octopus
Jan Fajerski [Tue, 4 Aug 2020 14:23:57 +0000 (16:23 +0200)]
Merge pull request #36409 from shyukri/wip-46148-octopus

octopus: ceph-volume: fix lvm functional tests

5 years agoMerge pull request #36410 from shyukri/wip-46112-octopus
Jan Fajerski [Tue, 4 Aug 2020 14:23:43 +0000 (16:23 +0200)]
Merge pull request #36410 from shyukri/wip-46112-octopus

octopus: ceph-volume: report correct rejected reason in inventory if device type is invalid

5 years agoMerge pull request #36332 from yuriw/wip-yuriw-octopus-p2p-octopus
Yuri Weinstein [Mon, 3 Aug 2020 18:21:47 +0000 (11:21 -0700)]
Merge pull request #36332 from yuriw/wip-yuriw-octopus-p2p-octopus

qa/tests: changed rbd/test_librbd_python.sh to run on v15.2.4

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #36143 from rhcs-dashboard/wip-46576-octopus
Lenz Grimmer [Mon, 3 Aug 2020 15:14:24 +0000 (17:14 +0200)]
Merge pull request #36143 from rhcs-dashboard/wip-46576-octopus

octopus: mgr/dashboard: add API team to CODEOWNERS

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoMerge pull request #36226 from bk201/wip-46351-octopus
Lenz Grimmer [Mon, 3 Aug 2020 15:11:29 +0000 (17:11 +0200)]
Merge pull request #36226 from bk201/wip-46351-octopus

octopus: mgr/dashboard: Re-enable OSD's table autoReload

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
5 years agoMerge pull request #36277 from s0nea/wip-46590-octopus
Lenz Grimmer [Mon, 3 Aug 2020 15:08:01 +0000 (17:08 +0200)]
Merge pull request #36277 from s0nea/wip-46590-octopus

octopus: mgr/dashboard: Use same required field message accross the UI

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #36322 from rhcs-dashboard/wip-46736-octopus
Lenz Grimmer [Mon, 3 Aug 2020 15:05:52 +0000 (17:05 +0200)]
Merge pull request #36322 from rhcs-dashboard/wip-46736-octopus

octopus: mgr/dashboard: cpu stats incorrectly displayed

Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #36369 from bk201/wip-44458
Lenz Grimmer [Mon, 3 Aug 2020 15:02:46 +0000 (17:02 +0200)]
Merge pull request #36369 from bk201/wip-44458

octopus: mgr/dashboard: right-align dropdown menu of column filters

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
5 years agoceph-volume: cleanup code 36410/head
Satoru Takeuchi [Fri, 22 May 2020 01:07:17 +0000 (01:07 +0000)]
ceph-volume: cleanup code

Simplify the logic and fix a typo.

Signed-off-by: Satoru Takeuchi <satoru.takeuchi@gmail.com>
(cherry picked from commit 0169b72fff48134ef01802ade38c55281b9f4510)

Conflicts:
src/ceph-volume/ceph_volume/util/device.py
Accept incoming change on octopus

5 years agoceph-volume: fix lvm functional tests 36409/head
Jan Fajerski [Tue, 16 Jun 2020 11:47:16 +0000 (13:47 +0200)]
ceph-volume: fix lvm functional tests

This is related to https://github.com/ceph/ceph-ansible/pull/5413 and
adjusts the tests to work with the related ansible fix.

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

5 years agorgw: append obj: prevent tail from being GC'ed 36389/head
Abhishek Lekshmanan [Mon, 24 Feb 2020 14:32:01 +0000 (15:32 +0100)]
rgw: append obj: prevent tail from being GC'ed

append object tail gets GC'ed otherwise as the state has a manifest similar to
atomic obj processor, but if the manifest exists and the position is correct, it
is not an overwrite and shouldn't be GC'ed

Fixes: https://tracker.ceph.com/issues/42670
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 2dad52a18f889cca4309e78a88c6c5c2c04d4947)

5 years agoMerge pull request #36247 from dillaman/wip-46674
Yuri Weinstein [Thu, 30 Jul 2020 16:06:07 +0000 (09:06 -0700)]
Merge pull request #36247 from dillaman/wip-46674

octopus: librbd: new 'write_zeroes' API methods to suppliment the `discard` APIs

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
5 years agomgr/dashboard: right-align dropdown menu of column filters 36369/head
Kiefer Chang [Thu, 30 Jul 2020 09:34:42 +0000 (17:34 +0800)]
mgr/dashboard: right-align dropdown menu of column filters

When the value of a filter is too long, the text of value will run out
of the viewport. Right-aligning the menu makes the text visible.

NOTE: This change can't be backported from master because in master we had
switched the bootstrap library to ng-bootstrap and the menu is already
right-aligned in the master.

Fixes: https://tracker.ceph.com/issues/44458
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
5 years agomgr/dashboard: Updates jest to fix cache failure 36267/head
Stephan Müller [Thu, 14 May 2020 14:37:48 +0000 (16:37 +0200)]
mgr/dashboard: Updates jest to fix cache failure

Fixes: https://tracker.ceph.com/issues/45545
Signed-off-by: Stephan Müller <smueller@suse.com>
 Conflicts:
src/pybind/mgr/dashboard/frontend/package-lock.json
- Changed through package change
src/pybind/mgr/dashboard/frontend/package.json
- Conflict because the jest version was even older than what the PR in
master was replacing

5 years agomgr/dashboard: Always use fast angular unit tests
Stephan Müller [Thu, 7 May 2020 15:13:57 +0000 (17:13 +0200)]
mgr/dashboard: Always use fast angular unit tests

This will replace the current approach having a fast testing workaround
that didn't fully work on every test. Now using ng-bullet's optimization
works with every test, therefore there is no need to keep the old
configuration files and use the slow testing on Jenkins.

Fixes: https://tracker.ceph.com/issues/45433
Signed-off-by: Stephan Müller <smueller@suse.com>
(cherry picked from commit 46e20a5e855beb1e9ff822b0c211a3af3a928d0c)

5 years agoqa/suites/rados/thrash/crc-failures: randomly inject bad incremental osdmap crc 36340/head
Neha Ojha [Tue, 28 Jul 2020 17:36:09 +0000 (10:36 -0700)]
qa/suites/rados/thrash/crc-failures: randomly inject bad incremental osdmap crc

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

5 years agoosd: don't write transaction when inc crc failed
Dan van der Ster [Mon, 27 Jul 2020 15:40:27 +0000 (17:40 +0200)]
osd: don't write transaction when inc crc failed

80da5f9a987c6a48b93f25228fdac85890013520 exposed a flaw in how
handle_osd_map falls back to a full osdmap if the crc of an incremental
failed.

If the first message in a map message had a crc error, then the
loop would exit with last < start, which would then cause a null
dereference in _committed_osd_maps.

Fixes: https://tracker.ceph.com/issues/46443
Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
(cherry picked from commit 99463cb523949289384a6210ea250114fbe852f4)

5 years agoqa/standalone/osd: add bad-inc-map.sh
Dan van der Ster [Mon, 27 Jul 2020 12:23:54 +0000 (14:23 +0200)]
qa/standalone/osd: add bad-inc-map.sh

Test that the osd doesn't crash when it gets a bad incremental osdmap.

Related-to: https://tracker.ceph.com/issues/46443
Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
(cherry picked from commit b550112dba23528655ec150cf9d6d093318abb8c)

5 years agoqa/tests: changed rbd/test_librbd_python.sh to run on v15.2.4 36332/head
Yuri Weinstein [Tue, 28 Jul 2020 19:40:32 +0000 (12:40 -0700)]
qa/tests: changed rbd/test_librbd_python.sh to run on v15.2.4

Fixes https://tracker.ceph.com/issues/46077
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
5 years agoMerge pull request #35995 from tchaikov/octopus-46408
Yuri Weinstein [Tue, 28 Jul 2020 14:59:52 +0000 (07:59 -0700)]
Merge pull request #35995 from tchaikov/octopus-46408

octopus: mgr: avoid false alarm of MGR_MODULE_ERROR

Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoMerge pull request #35957 from smithfarm/wip-46372-octopus
Yuri Weinstein [Tue, 28 Jul 2020 14:59:17 +0000 (07:59 -0700)]
Merge pull request #35957 from smithfarm/wip-46372-octopus

octopus: osd: expose osdspec_affinity to osd_metadata

Reviewed-by: Joshua Schmid <jschmid@suse.de>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agoMerge pull request #35893 from callithea/wip-46214-octopus
Yuri Weinstein [Tue, 28 Jul 2020 14:56:21 +0000 (07:56 -0700)]
Merge pull request #35893 from callithea/wip-46214-octopus

octopus: mgr/dashboard: Add host labels in UI

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
5 years agomgr/dashboard: cpu stats incorrectly displayed 36322/head
Avan Thakkar [Thu, 23 Jul 2020 06:27:32 +0000 (11:57 +0530)]
mgr/dashboard: cpu stats incorrectly displayed

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

5 years agoceph-volume: filter by osd-id or osd-fsid when zapping 35879/head
Guillaume Abrioux [Mon, 20 Jul 2020 13:43:38 +0000 (15:43 +0200)]
ceph-volume: filter by osd-id or osd-fsid when zapping

2f5c10c12c37e6865ce54bb4940d3779353cba4f introduced a bug:

`ceph-volume lvm zap` command fails under certain conditions.

when passing `--osd-id` or `--osd-fsid` to `ceph-volume lvm zap` command
it tries to zap additionnal devices that have nothing to do with the osd
being zapped.

When calling `api.get_lvs()` in `ensure_associated_lvs()` we have to
pass the osd-id/osd-fsid information so only related devices are
returned by `get_lvs()` method

Closes: https://tracker.ceph.com/issues/46627
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit e94aef6f96189648d0f204d8118501577dde5f52)

5 years agoMerge PR #36224 into octopus
Patrick Donnelly [Fri, 24 Jul 2020 18:23:41 +0000 (11:23 -0700)]
Merge PR #36224 into octopus

* refs/pull/36224/head:
mgr/nfs: Remove NParts and Cache_Size from MDCACHE block
doc/cephfs/nfs: Update about deploying nfs-ganesha with cephadm in vstart

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge pull request #36265 from sebastian-philipp/octopus-backport-35955-35709-35744...
Sebastian Wagner [Fri, 24 Jul 2020 13:17:56 +0000 (15:17 +0200)]
Merge pull request #36265 from sebastian-philipp/octopus-backport-35955-35709-35744-35991-35838-35471-35862-35901-35456-35846-36152-3599

octopus: cephadm batch backport July (3)

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
5 years agoMerge pull request #36160 from rhcs-dashboard/wip-46602-octopus
Laura Paduano [Fri, 24 Jul 2020 08:35:31 +0000 (10:35 +0200)]
Merge pull request #36160 from rhcs-dashboard/wip-46602-octopus

octopus: mgr/dashboard: fix ui api endpoints

Reviewed-by: Fabrizio D'Angelo <fdangelo@redhat.com>
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agomgr/dashboard: Use same required field message accross the UI 36277/head
Volker Theile [Tue, 7 Jul 2020 11:48:50 +0000 (13:48 +0200)]
mgr/dashboard: Use same required field message accross the UI

Some pages use the message 'Required field', but 99% use 'This field is required'. Use the latter everywhere.

Fixes: https://tracker.ceph.com/issues/46395
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit c70e5706652fb14cef078727749d4699aacc20fd)

5 years agocephadm: fix UnboundLocalError: `container_path` 36265/head
Sebastian Wagner [Mon, 20 Jul 2020 11:51:14 +0000 (13:51 +0200)]
cephadm: fix UnboundLocalError: `container_path`

Fixes: https://tracker.ceph.com/issues/46098
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 8532f5331111e2fd5a75df3e19ffb7d6b74c8498)

5 years agocephadm: remove ktdreyer's copr repository
Dimitri Savineau [Fri, 17 Jul 2020 17:38:14 +0000 (13:38 -0400)]
cephadm: remove ktdreyer's copr repository

This was needed as a temporary solution until all missing EL8 packages
are built on EPEL 8.
Because we now have all dependencies on EPEL 8 then we can remove that
repository.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 4cf99eb68e5c5e7e2423905dd83684b03e80b99b)

5 years agocephadm: Fix ipv6 network regex to support routes with expiry
Matthew Oliver [Thu, 16 Jul 2020 06:38:29 +0000 (06:38 +0000)]
cephadm: Fix ipv6 network regex to support routes with expiry

The regex I previously added didn't take into account ipv6 networks that
had an expiry, this patch updates the regex and includes an ipv6 route
version in the test.

Signed-off-by: Matthew Oliver <moliver@suse.com>
(cherry picked from commit f4a986cbffccbf00b499d2d0546ac4623c12ddad)

5 years agomgr/osd_support: add unittests
Joshua Schmid [Thu, 9 Jul 2020 09:40:54 +0000 (11:40 +0200)]
mgr/osd_support: add unittests

Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit 0fcfc5455dde176bc1bc82fb3176c8be4788c15d)

5 years agoceph: Fix `tell` for cephadm
Sebastian Wagner [Fri, 17 Jul 2020 10:50:07 +0000 (12:50 +0200)]
ceph: Fix `tell` for cephadm

The tell target might contain dots now. Like
`mds.myfs.myhost.rnusmq` is now a valid
target.

Fixes: https://tracker.ceph.com/issues/46560
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit d5b8e3d61cd42d23857d7066660e03aecc89d9ce)

5 years agocephadm: also retry on digest mismatch
Sebastian Wagner [Tue, 14 Jul 2020 13:11:46 +0000 (15:11 +0200)]
cephadm: also retry on digest mismatch

Fixes: https://tracker.ceph.com/issues/46534
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit ea080e669a83bc2f7478587ef5f4c6a658738a62)

5 years agocephadm: Retry pull on transient error
Sebastian Wagner [Tue, 30 Jun 2020 09:26:58 +0000 (11:26 +0200)]
cephadm: Retry pull on transient error

Fixes: https://tracker.ceph.com/issues/46271
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit f3e770f3541c716b4f568cf73255f25243c655e5)

5 years agomgr/cephadm: clean-up service module type checking
Michael Fritch [Fri, 17 Jul 2020 15:26:52 +0000 (09:26 -0600)]
mgr/cephadm: clean-up service module type checking

mypy cast to avoid:

cephadm/module.py: note: In member "_config_fn" of class "CephadmOrchestrator":
cephadm/module.py:1797: error: Incompatible return value type (got "Optional[function]", expected "Optional[Callable[[ServiceSpec], None]]")

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 502c574c36f49947cb7a501cafd5530455451773)

5 years agomgr/cephadm: assert the service_type during config/create
Michael Fritch [Wed, 15 Jul 2020 22:23:59 +0000 (16:23 -0600)]
mgr/cephadm: assert the service_type during config/create

ensure the passed ServiceSpec type matches the CephadmService type

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit f8186bd72f807df3c8a31b8c515d2a9e4bb69d09)

5 years agomgr/cephadm: clean-up service module type checking
Michael Fritch [Mon, 13 Jul 2020 22:22:59 +0000 (16:22 -0600)]
mgr/cephadm: clean-up service module type checking

- convert to py3 style type checks
- other misc type checking fixups

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 2bcdcef8ecc256cd86bc7744d392cda875341cb3)

5 years agomgr/cephadm: clean-up service module type checking
Michael Fritch [Tue, 14 Jul 2020 13:18:48 +0000 (07:18 -0600)]
mgr/cephadm: clean-up service module type checking

- add return type to `config` func
- add missing `NFSServiceSpec` annotation to `config` func

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 414e5507034f6380edac78de86419cd98dc59295)

5 years agomgr/cephadm: clean-up service module type checking
Michael Fritch [Mon, 13 Jul 2020 20:41:57 +0000 (14:41 -0600)]
mgr/cephadm: clean-up service module type checking

- add missing return type to `create` func

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 6c020b697e400461760ef41f246e94913923f9df)

5 years agocephadm: fix indentation
Patrick Seidensal [Tue, 7 Jul 2020 12:29:49 +0000 (14:29 +0200)]
cephadm: fix indentation

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit 8844ff41b6547d82c6f900493e830de8686660bc)

5 years agocephadm: remove unused/commented out code
Patrick Seidensal [Tue, 7 Jul 2020 12:29:12 +0000 (14:29 +0200)]
cephadm: remove unused/commented out code

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit 6aa87f7b0dfd516439a6c75681e20d7dffacaf4d)

5 years agocephadm: fix creating custom Prometheus image
Patrick Seidensal [Tue, 7 Jul 2020 11:58:27 +0000 (13:58 +0200)]
cephadm: fix creating custom Prometheus image

Fix the code by improving a condition where a zero as uid or gid leads
to an additional attempt to extract the uid/gid instead of uid/gid
simply being used correctly.

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

5 years agomgr/cephadm: Add CEPHADM_PAUSED to test_cli
Sebastian Wagner [Tue, 30 Jun 2020 13:13:51 +0000 (15:13 +0200)]
mgr/cephadm: Add CEPHADM_PAUSED to test_cli

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit aee1aed64131e615bbf5b9453f52fec5eef36bf9)

5 years agomgr/cephadm: Set exception context to populate orch events.
Sebastian Wagner [Sat, 6 Jun 2020 23:25:21 +0000 (01:25 +0200)]
mgr/cephadm: Set exception context to populate orch events.

Like when if daemon deployment fails

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 1dd2c5c4fbce49495736c12c3aea2c96f6ad4696)

5 years agomgr/cephadm: Add event when deploying a daemon
Sebastian Wagner [Sat, 6 Jun 2020 22:54:35 +0000 (00:54 +0200)]
mgr/cephadm: Add event when deploying a daemon

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 960f6bfac0d18eb92a017ea21ca97efa1a12b7cf)

5 years agomgr/cephadm: Add an event when creating a service
Sebastian Wagner [Sat, 6 Jun 2020 22:53:34 +0000 (00:53 +0200)]
mgr/cephadm: Add an event when creating a service

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 05ade49a0900ae0714a8bfe53a8b993d46d5be50)

5 years agomgr/cephadm: Add inventory.EventStore
Sebastian Wagner [Sat, 6 Jun 2020 22:51:38 +0000 (00:51 +0200)]
mgr/cephadm: Add inventory.EventStore

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit f5b0155e04ab23beecea5d832a59d4e14cd4e898)

5 years agomgr/orch: Add events to tests/test_orchestrator
Sebastian Wagner [Fri, 26 Jun 2020 10:44:44 +0000 (12:44 +0200)]
mgr/orch: Add events to tests/test_orchestrator

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 83c163683d3da644de9985c4da0f94ca31b48004)

5 years agomgr/orch: Add OrchestratorEvent class
Sebastian Wagner [Sat, 6 Jun 2020 22:49:43 +0000 (00:49 +0200)]
mgr/orch: Add OrchestratorEvent class

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit b9ff9118470a1a0cfa94bf3ea4a3d341b25a6bd8)

5 years agovstart: Remove old ceph images if new cluster is deployed
Varsha Rao [Tue, 14 Jul 2020 10:26:07 +0000 (15:56 +0530)]
vstart: Remove old ceph images if new cluster is deployed

Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit d8c6e0d97b20be8a0feb53ecaaee0caf16c812ff)

5 years agocephadm: refactor update_firewalld
Sebastian Wagner [Thu, 2 Jul 2020 14:28:14 +0000 (16:28 +0200)]
cephadm: refactor update_firewalld

* split into three different methods
* untangle service and port lists

This helps in making our firewall handling more dynamic.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Co-authored-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
(cherry picked from commit 4f341819ec746d0a04b76e88b84b64158905e5b6)

5 years agomgr/cephadm: check-host should not fail as hard using fqdn
Adam King [Tue, 30 Jun 2020 21:49:09 +0000 (17:49 -0400)]
mgr/cephadm: check-host should not fail as hard using fqdn

Print error message instead of traceback when check-host
fails in due to host address not being found

Fixes: https://tracker.ceph.com/issues/45724
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit fb1ebb9dc1071a96b3b2e4e85be5744e4a18416c)

5 years agomgr/cephadm: Add test for _check_daemons()
Sebastian Wagner [Thu, 18 Jun 2020 12:07:54 +0000 (14:07 +0200)]
mgr/cephadm: Add test for _check_daemons()

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 1aeb0be49b3dc26f456da5d0d850b1d68aec88cf)

5 years agomgr/cephadm: refactor `_create_daemon()`
Sebastian Wagner [Mon, 8 Jun 2020 10:45:14 +0000 (12:45 +0200)]
mgr/cephadm: refactor `_create_daemon()`

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 69ed3d9cffda243275ab7c9e89d5f9a615f2ab98)

5 years agomgr/cephadm: Add CephadmDaemonSpec class
Sebastian Wagner [Mon, 8 Jun 2020 07:36:20 +0000 (09:36 +0200)]
mgr/cephadm: Add CephadmDaemonSpec class

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 7bc22f61cd69dcb5e7ee2aaa275f9f8cef3b3b26)

5 years agopython-common: RGW service_id might not contain a zone
Michael Fritch [Wed, 1 Jul 2020 14:27:02 +0000 (08:27 -0600)]
python-common: RGW service_id might not contain a zone

also adds missing RGWSpec.validate()

Fixes: https://tracker.ceph.com/issues/46268
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit b54a800b748dc94cb847cc44e23b481c8c3a85b4)

5 years agodoc/cephadm: remove a confusing sentence fragment
Zac Dover [Thu, 11 Jun 2020 19:11:09 +0000 (05:11 +1000)]
doc/cephadm: remove a confusing sentence fragment

Removed a confusing sentence fragment: "For each file system:"

Fixes: https://tracker.ceph.com/issues/46546
Signed-off-by: Zac Dover <zac.dover@gmail.com>
Co-authored-by: Varsha <rvarsha016@gmail.com>
(cherry picked from commit dcce296eea99fa025135d68f079008421de14fa3)

5 years agomgr/cephadm: Adapt Vagrantbox to el8
Volker Theile [Thu, 9 Jul 2020 10:41:49 +0000 (12:41 +0200)]
mgr/cephadm: Adapt Vagrantbox to el8

After el7 has been dropped with https://github.com/ceph/ceph/pull/35722 the Vagrantbox need to be adapted to el8.

Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit d8623ff67bb57ecb3e7b0ae814ea21f1fda54c9b)

Conflicts:
src/pybind/mgr/cephadm/Vagrantfile

5 years agodoc/mgr/orchestrator: Add information about unmanaged parameter
Juan Miguel Olmo Martínez [Wed, 24 Jun 2020 09:57:51 +0000 (11:57 +0200)]
doc/mgr/orchestrator: Add information about unmanaged parameter

Explain parameter 'unmanaged' in OSDs creation and deletion

Signed-off-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
(cherry picked from commit da62f752c5c233b5bac687ac6be5e00fe35084b9)

5 years agodoc/cephadm: add yaml infor for orch apply mon
Zac Dover [Tue, 14 Jul 2020 13:51:08 +0000 (23:51 +1000)]
doc/cephadm: add yaml infor for orch apply mon

This commit breaks one of the long sentences into
three shorter sentences, and adds a parenthetical
comment walking the reader through a series of commands,
explaining what each command does and why only the last
of the commands ends up having a lasting effect on the Ceph
environment.

Fixes: https://tracker.ceph.com/issues/46133
Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit b02c98bfa5f0ebe442abd97fab16d65b0ebfbf83)

5 years agomgr/cephadm: do not accept filestore osds in osdspecs
Joshua Schmid [Tue, 7 Jul 2020 08:33:51 +0000 (10:33 +0200)]
mgr/cephadm: do not accept filestore osds in osdspecs

Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit 4974a2c1b8e67426db12b7bb2ea3d1af892ca16e)

5 years agodoc: add note about filter_logic
Joshua Schmid [Mon, 6 Jul 2020 09:40:36 +0000 (11:40 +0200)]
doc: add note about filter_logic

Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit 73475f3b396bf7892b921985b5b4fcf3e9732f42)

5 years agopython-common/drivegroups: implement option to change filter_logic
Joshua Schmid [Wed, 1 Jul 2020 09:10:14 +0000 (11:10 +0200)]
python-common/drivegroups: implement option to change filter_logic

Filters are applied to disks using an AND gate by default. In some
scenarios you can only achieve the desired behavior when using an OR
gate without expanding the available filters.

This patch allows to switch between `AND` and `OR` gates.

Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit f00fba87925f6f72448128649694d98b4df3e748)

5 years agomgr/cephadm: also list vendor/model/rotational in device ls
Joshua Schmid [Mon, 6 Jul 2020 15:41:25 +0000 (17:41 +0200)]
mgr/cephadm: also list vendor/model/rotational in device ls

Fixes: https://tracker.ceph.com/issues/45872
Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit 7c18893f94b01f10aa35ebcec13ee3a3a785c94a)

5 years agoMerge pull request #35880 from ceph/wip-octopus-34744
Jan Fajerski [Thu, 23 Jul 2020 07:42:17 +0000 (09:42 +0200)]
Merge pull request #35880 from ceph/wip-octopus-34744

octopus: ceph-volume: handle idempotency with batch and explicit scenarios

5 years agorbd: use new 'write_zeroes' API to ensure zeroed extents will be zeroed 36247/head
Jason Dillaman [Tue, 30 Jun 2020 12:47:48 +0000 (08:47 -0400)]
rbd: use new 'write_zeroes' API to ensure zeroed extents will be zeroed

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

5 years agopybind/rbd: add new write_zeroes/aio_write_zeroes API methods
Jason Dillaman [Tue, 30 Jun 2020 15:20:31 +0000 (11:20 -0400)]
pybind/rbd: add new write_zeroes/aio_write_zeroes API methods

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

5 years agolibrbd: add 'write_zeroes' public C/C++ API methods
Jason Dillaman [Tue, 30 Jun 2020 12:44:38 +0000 (08:44 -0400)]
librbd: add 'write_zeroes' public C/C++ API methods

Unlike the existing 'discard' option which is more of a hint to
attempt to release space, the new 'write_zeroes' APIs will ensure
that the entire provided extent is fully zeroed.

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

Conflicts:
src/librbd/api/Io.h/cc: logic exists in ImageRequestWQ files
src/librbd/librbd.cc: trivial resolution due missing api::Io
src/test/librbd/test_librbd.cc: trivial resolution

5 years agoMerge pull request #36137 from rhcs-dashboard/wip-46570-octopus
Yuri Weinstein [Wed, 22 Jul 2020 16:05:25 +0000 (09:05 -0700)]
Merge pull request #36137 from rhcs-dashboard/wip-46570-octopus

octopus: mgr/dashboard: fix pool usage calculation

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoMerge pull request #36049 from smithfarm/wip-46009-octopus
Yuri Weinstein [Wed, 22 Jul 2020 16:04:34 +0000 (09:04 -0700)]
Merge pull request #36049 from smithfarm/wip-46009-octopus

octopus: tests: objectstore/store_test: kill ExcessiveFragmentation test case.

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #36048 from smithfarm/wip-46015-octopus
Yuri Weinstein [Wed, 22 Jul 2020 16:03:49 +0000 (09:03 -0700)]
Merge pull request #36048 from smithfarm/wip-46015-octopus

octopus: common: log: fix timestap precision of log can't set to millisecond.

Reviewed-by: Adam Emerson <aemerson@redhat.com>
5 years agoMerge pull request #36037 from smithfarm/wip-46489-octopus
Yuri Weinstein [Wed, 22 Jul 2020 16:03:19 +0000 (09:03 -0700)]
Merge pull request #36037 from smithfarm/wip-46489-octopus

octopus: pybind/mgr/pg_autoscaler/module.py: do not update event if ev.pg_num== ev.pg_num_target

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #36036 from smithfarm/wip-46460-octopus
Yuri Weinstein [Wed, 22 Jul 2020 16:02:34 +0000 (09:02 -0700)]
Merge pull request #36036 from smithfarm/wip-46460-octopus

octopus: pybind/mgr/balancer: use "==" and "!=" for comparing str

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
5 years agomgr/dashboard: Re-enable OSD's table autoReload 36226/head
Tiago Melo [Wed, 17 Jun 2020 16:38:25 +0000 (16:38 +0000)]
mgr/dashboard: Re-enable OSD's table autoReload

Fixes: https://tracker.ceph.com/issues/45303
Signed-off-by: Tiago Melo <tmelo@suse.com>
(cherry picked from commit e5d94e24ecf676afc5bca7810459f8d1ebda4642)

Conflicts:
  src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.html
    - Template structure change
  src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.html
    - Template structure change
  src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/device-list/device-list.component.ts
    - Optional chaining is not available in older version of TypeScript, use
      `_.get` to implement it.

Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
5 years agomgr/nfs: Remove NParts and Cache_Size from MDCACHE block 36224/head
Varsha Rao [Thu, 16 Jul 2020 09:34:45 +0000 (15:04 +0530)]
mgr/nfs: Remove NParts and Cache_Size from MDCACHE block

As setting them to small value affects the performance and they are not related
to metadata caching. https://review.gerrithub.io/c/ffilz/nfs-ganesha/+/495185

Fixes: https://tracker.ceph.com/issues/46579
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 90c0ebc45efdbc1e7008d4aa1d1dfeb429981ecd)

5 years agodoc/cephfs/nfs: Update about deploying nfs-ganesha with cephadm in vstart
Varsha Rao [Thu, 16 Jul 2020 11:36:11 +0000 (17:06 +0530)]
doc/cephfs/nfs: Update about deploying nfs-ganesha with cephadm in vstart

Fixes: https://tracker.ceph.com/issues/46571
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 7f911a710d0fff7afab467f8c8216e3bdbff40b7)

5 years agoMerge pull request #35889 from s0nea/wip-46328-octopus
Laura Paduano [Mon, 20 Jul 2020 07:30:14 +0000 (09:30 +0200)]
Merge pull request #35889 from s0nea/wip-46328-octopus

octopus: mgr/dashboard: remove cdCopy2ClipboardButton `formatted` attribute

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoMerge pull request #36076 from smithfarm/wip-46514-octopus
Yuri Weinstein [Fri, 17 Jul 2020 17:32:36 +0000 (10:32 -0700)]
Merge pull request #36076 from smithfarm/wip-46514-octopus

octopus: mgr/progress: Skip pg_summary update if _events dict is empty.

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
5 years agoMerge pull request #36085 from smithfarm/wip-46511-octopus
Yuri Weinstein [Fri, 17 Jul 2020 16:49:04 +0000 (09:49 -0700)]
Merge pull request #36085 from smithfarm/wip-46511-octopus

octopus:  rgw: lc: fix Segmentation Fault when the tag of the object was not found

Reviewed-by: Friedmann <ofriedma@redhat.com>
5 years agoMerge pull request #36028 from smithfarm/wip-46467-octopus
Yuri Weinstein [Fri, 17 Jul 2020 16:45:19 +0000 (09:45 -0700)]
Merge pull request #36028 from smithfarm/wip-46467-octopus

octopus: rgw: radoslist incomplete multipart uploads fix marker progression

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
5 years agoMerge pull request #36027 from smithfarm/wip-46459-octopus
Yuri Weinstein [Fri, 17 Jul 2020 16:44:41 +0000 (09:44 -0700)]
Merge pull request #36027 from smithfarm/wip-46459-octopus

octopus: rgw: orphan list teuthology test & fully-qualified domain issue

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
Reviewed-by: Adam Emerson <aemerson@redhat.com>
5 years agoMerge pull request #36025 from smithfarm/wip-46005-octopus
Yuri Weinstein [Fri, 17 Jul 2020 16:44:00 +0000 (09:44 -0700)]
Merge pull request #36025 from smithfarm/wip-46005-octopus

octopus: rgw: add check for index entry's existing when adding bucket stats during bucket reshard.

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
5 years agoMerge pull request #36024 from smithfarm/wip-45951-octopus
Yuri Weinstein [Fri, 17 Jul 2020 16:40:20 +0000 (09:40 -0700)]
Merge pull request #36024 from smithfarm/wip-45951-octopus

octopus: rgw: add access log to the beast frontend

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #36023 from smithfarm/wip-45933-octopus
Yuri Weinstein [Fri, 17 Jul 2020 16:35:56 +0000 (09:35 -0700)]
Merge pull request #36023 from smithfarm/wip-45933-octopus

octopus: rgw: Add subuser to OPA request

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
5 years agoMerge pull request #36022 from smithfarm/wip-45931-octopus
Yuri Weinstein [Fri, 17 Jul 2020 16:34:32 +0000 (09:34 -0700)]
Merge pull request #36022 from smithfarm/wip-45931-octopus

octopus: rgw: Add support wildcard subuser for bucket policy

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
5 years agoMerge pull request #36021 from smithfarm/wip-45928-octopus
Yuri Weinstein [Fri, 17 Jul 2020 16:30:38 +0000 (09:30 -0700)]
Merge pull request #36021 from smithfarm/wip-45928-octopus

octopus: rgw: fix loop problem with swift stat on account.

Reviewed-by: Casey Bodley <cbodley@redhat.com>