]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
5 years agoMerge pull request #36331 from dillaman/wip-librbd-aio-completion-octopus
Yuri Weinstein [Tue, 18 Aug 2020 14:03:50 +0000 (07:03 -0700)]
Merge pull request #36331 from dillaman/wip-librbd-aio-completion-octopus

octopus: librbd: potential race conditions handling API IO completions

Reviewed-by: Mykola Golub <mgolub@mirantis.com>/
5 years agoMerge pull request #36660 from smithfarm/wip-46721-octopus
Yuri Weinstein [Tue, 18 Aug 2020 13:58:32 +0000 (06:58 -0700)]
Merge pull request #36660 from smithfarm/wip-46721-octopus

octopus: rbd: immutable-object-cache: fixed crashes on start up

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #36659 from smithfarm/wip-46719-octopus
Yuri Weinstein [Tue, 18 Aug 2020 13:58:08 +0000 (06:58 -0700)]
Merge pull request #36659 from smithfarm/wip-46719-octopus

octopus: rbd: librbd: don't resend async_complete if watcher is unregistered

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #36658 from smithfarm/wip-46711-octopus
Yuri Weinstein [Tue, 18 Aug 2020 13:57:38 +0000 (06:57 -0700)]
Merge pull request #36658 from smithfarm/wip-46711-octopus

octopus: rbd: librbd: flush all queued object IO from simple scheduler

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>/
5 years agoMerge pull request #36657 from smithfarm/wip-46309-octopus
Yuri Weinstein [Tue, 18 Aug 2020 13:56:56 +0000 (06:56 -0700)]
Merge pull request #36657 from smithfarm/wip-46309-octopus

octopus: tests/rbd_mirror: fix race on test shut down

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #36656 from smithfarm/wip-46150-octopus
Yuri Weinstein [Tue, 18 Aug 2020 13:56:07 +0000 (06:56 -0700)]
Merge pull request #36656 from smithfarm/wip-46150-octopus

octopus: rbd: librbd: race when disabling object map with overlapping in-flight writes

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #36662 from smithfarm/wip-46595-octopus
Yuri Weinstein [Tue, 18 Aug 2020 13:55:35 +0000 (06:55 -0700)]
Merge pull request #36662 from smithfarm/wip-46595-octopus

octopus: crush/CrushWrapper: rebuild reverse maps after rebuilding crush map

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
5 years agoMerge pull request #35772 from s0nea/wip-46205-octopus
Lenz Grimmer [Mon, 17 Aug 2020 15:00:26 +0000 (17:00 +0200)]
Merge pull request #35772 from s0nea/wip-46205-octopus

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
5 years agoMerge pull request #36350 from s0nea/wip-46751-octopus
Lenz Grimmer [Mon, 17 Aug 2020 13:32:27 +0000 (15:32 +0200)]
Merge pull request #36350 from s0nea/wip-46751-octopus

octopus: mgr/dashboard: Add hosts page unit tests

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agolibrbd: generic helper for tracking in-flight IO and managing flush requests 36658/head
Jason Dillaman [Thu, 7 May 2020 20:25:50 +0000 (16:25 -0400)]
librbd: generic helper for tracking in-flight IO and managing flush requests

Layers that potentially queue IOs but not all IOs will need to track all
in-flight IOs to properly ensure that a flush cannot complete while
older IO is still stuck in a queue.

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

Conflicts:
src/librbd/CMakeLists.txt
- no "io/ImageDispatch.cc" in octopus

5 years agoMerge pull request #36416 from shyukri/wip-46639-octopus
Nathan Cutler [Sat, 15 Aug 2020 13:41:31 +0000 (15:41 +0200)]
Merge pull request #36416 from shyukri/wip-46639-octopus

octopus: doc/rbd: add rbd-target-gw enable and start

Reviewed-by: Nathan Cutler <ncutler@suse.com>
5 years agocrush/CrushWrapper: rebuild reverse maps after rebuilding crush map 36662/head
Jason Dillaman [Tue, 14 Jul 2020 22:49:30 +0000 (18:49 -0400)]
crush/CrushWrapper: rebuild reverse maps after rebuilding crush map

The Objecter will crash when localized reads are enabled and two threads
attempt to rebuild the (invalidated) reverse maps concurrently. This
should address the issue for the Objecter use-case without the need to
add additional locking.

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

5 years agodoc/rbd: add note for the immutable-object-cache domain socket 36660/head
Jason Dillaman [Fri, 17 Jul 2020 14:27:14 +0000 (10:27 -0400)]
doc/rbd: add note for the immutable-object-cache domain socket

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

5 years agocommon/options: changed default immutable object cache path
Jason Dillaman [Mon, 20 Jul 2020 16:57:57 +0000 (12:57 -0400)]
common/options: changed default immutable object cache path

Switch the default path for the immutable object cache from "/tmp" to
"/tmp/ceph_immutable_object_cache" to prevent the deletion of all
files in the "/tmp" directory and sub-directories for unconfigured
daemons.

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

5 years agoimmutable-object-cache: fix error handling during start up
Jason Dillaman [Fri, 17 Jul 2020 14:25:20 +0000 (10:25 -0400)]
immutable-object-cache: fix error handling during start up

Previously the daemon would crash if it couldn't remove all the
files from the specified cache directory. It would also crash if
it could not access its specified domain socket file.

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

5 years agolibrbd: properly unregister failed async_complete request 36659/head
Mykola Golub [Thu, 9 Jul 2020 13:36:39 +0000 (14:36 +0100)]
librbd: properly unregister failed async_complete request

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

5 years agolibrbd: don't resend async_complete if watcher is unregistered
Mykola Golub [Wed, 8 Jul 2020 15:04:12 +0000 (16:04 +0100)]
librbd: don't resend async_complete if watcher is unregistered

Also wait for pending async_complete after unregistering the
watcher.

Fixes: https://tracker.ceph.com/issues/45268
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit 5b6804e19a8f524ab1528a638eb286482e12fe48)

5 years agolibrbd: flush all queued object IO from simple scheduler
Jason Dillaman [Wed, 22 Jul 2020 15:25:56 +0000 (11:25 -0400)]
librbd: flush all queued object IO from simple scheduler

Normally IO is tracked via the AioCompletion's async_op but the
scheduler will "complete" writes while the IO might be still
executing. Therefore, prior to shutting down this dispatch layer
we need to wait for all IO to complete.

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

5 years agotest/rbd_mirror: fix race on test shut down 36657/head
Mykola Golub [Thu, 18 Jun 2020 13:47:59 +0000 (14:47 +0100)]
test/rbd_mirror: fix race on test shut down

in TestMockImageReplayerSnapshotReplayer.UnlinkRemoteSnapshot

Fixes: https://tracker.ceph.com/issues/46076
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit c214785fa59ace2eb68a54b4354864ff707335ca)

5 years agolibrbd: race when disabling object map with overlapping in-flight writes 36656/head
Jason Dillaman [Thu, 18 Jun 2020 19:20:40 +0000 (15:20 -0400)]
librbd: race when disabling object map with overlapping in-flight writes

The block guard that protects against overlapping updates to the object
map needs to be flushed prior to closing the object map instance.

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

5 years agoMerge pull request #36327 from kotreshhr/fs-volumes-misc-octopus
Yuri Weinstein [Thu, 13 Aug 2020 18:38:24 +0000 (11:38 -0700)]
Merge pull request #36327 from kotreshhr/fs-volumes-misc-octopus

octopus: mgr/fs/volumes: misc fixes

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge pull request #36299 from smithfarm/wip-46712-octopus
Yuri Weinstein [Thu, 13 Aug 2020 18:37:55 +0000 (11:37 -0700)]
Merge pull request #36299 from smithfarm/wip-46712-octopus

octopus: mgr/nfs: Check if pseudo path is absolute path

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Varsha Rao <varao@redhat.com>
5 years agoMerge pull request #36220 from smithfarm/wip-46632-octopus
Yuri Weinstein [Thu, 13 Aug 2020 18:37:20 +0000 (11:37 -0700)]
Merge pull request #36220 from smithfarm/wip-46632-octopus

octopus: mgr/volumes: fix "ceph nfs export" help messages

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Varsha Rao <varao@redhat.com>
5 years agoMerge pull request #36346 from s0nea/wip-46753-octopus
Lenz Grimmer [Thu, 13 Aug 2020 14:36:55 +0000 (16:36 +0200)]
Merge pull request #36346 from s0nea/wip-46753-octopus

octopus: mgr/dashboard: wait longer for health status to be cleared

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #36588 from jan--f/wip-46911-octopus
Jan Fajerski [Thu, 13 Aug 2020 08:47:19 +0000 (10:47 +0200)]
Merge pull request #36588 from jan--f/wip-46911-octopus

octopus: ceph-volume: run flake8 in python3

5 years agoMerge pull request #35925 from smithfarm/wip-45889-octopus
Lenz Grimmer [Wed, 12 Aug 2020 16:11:02 +0000 (18:11 +0200)]
Merge pull request #35925 from smithfarm/wip-45889-octopus

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
5 years agoMerge pull request #36563 from s0nea/wip-46896-octopus
Lenz Grimmer [Wed, 12 Aug 2020 16:09:17 +0000 (18:09 +0200)]
Merge pull request #36563 from s0nea/wip-46896-octopus

octopus: mgr/dashboard: fix tasks.mgr.dashboard.test_rbd.RbdTest.test_move_image_to_trash error

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoMerge pull request #36562 from s0nea/wip-46895-octopus
Lenz Grimmer [Wed, 12 Aug 2020 16:07:20 +0000 (18:07 +0200)]
Merge pull request #36562 from s0nea/wip-46895-octopus

octopus: mgr/dashboard/api: increase API health timeout

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoceph-volume: run flake8 in pyhton3 36588/head
Jan Fajerski [Tue, 11 Aug 2020 12:08:33 +0000 (14:08 +0200)]
ceph-volume: run flake8 in pyhton3

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

5 years agoMerge pull request #36558 from jan--f/wip-46785-octopus
Jan Fajerski [Wed, 12 Aug 2020 13:02:45 +0000 (15:02 +0200)]
Merge pull request #36558 from jan--f/wip-46785-octopus

octopus: ceph-volume: add drive-group subcommand

5 years agoMerge pull request #35795 from callithea/wip-45449-octopus
Lenz Grimmer [Wed, 12 Aug 2020 07:37:53 +0000 (09:37 +0200)]
Merge pull request #35795 from callithea/wip-45449-octopus

octopus: mgr/dashboard: The max. buckets field in RGW user form should be pre-filled

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
5 years agoMerge pull request #36419 from bk201/wip-46794-octopus
Lenz Grimmer [Wed, 12 Aug 2020 07:32:17 +0000 (09:32 +0200)]
Merge pull request #36419 from bk201/wip-46794-octopus

octopus: mgr/dashboard: fix regression in delete OSD modal

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #36436 from yuriw/wip-yuriw-cleanup-octopus
Yuri Weinstein [Tue, 11 Aug 2020 17:41:52 +0000 (10:41 -0700)]
Merge pull request #36436 from yuriw/wip-yuriw-cleanup-octopus

qa/tests: moved client-upgrade-octopus-pacific under new dir

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #36460 from bk201/wip-46788-octopus
Lenz Grimmer [Tue, 11 Aug 2020 15:05:48 +0000 (17:05 +0200)]
Merge pull request #36460 from bk201/wip-46788-octopus

octopus: mgr/dashboard: Configure overflow of popover in health page

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agomgr/dashboard: add telemetry activation notification 35772/head
Tatjana Dehler [Wed, 13 May 2020 11:19:47 +0000 (13:19 +0200)]
mgr/dashboard: add telemetry activation notification

The commit adds 2 different parts to show the
Telemetry activation notification in the dashboard:

1. The Telemetry activation notification component
   itself. It contains the definition of the
   notification panel.
2. The Telemetry notification service. The service
   is needed to be able to show/hide the
   notification from:
   * the component itself (e.g. when clicking the
     button button)
   * the Telemetry configuration component (when
     enabling/disabling Telemetry)
   * the navigation component (to set the css-
     classes accordingly)

Fixes: https://tracker.ceph.com/issues/45464
Signed-off-by: Tatjana Dehler <tdehler@suse.com>
(cherry picked from commit f7e457952ba5780b4b7fc3a1e4290c02d4e5d70d)

Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/telemetry/telemetry.component.ts
A form loading directive has been introduced in master: https://github.com/ceph/ceph/pull/34746

src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.spec.ts
The test configuration has been improved in master: https://github.com/ceph/ceph/pull/34965

src/pybind/mgr/dashboard/frontend/src/app/shared/components/telemetry-notification/telemetry-notification.component.html
src/pybind/mgr/dashboard/frontend/src/app/shared/components/telemetry-notification/telemetry-notification.component.spec.ts
The alert component has been migrated from ngx-bootstrap to ng-boostrap in master: https://github.com/ceph/ceph/pull/35297
TestBed.get has been replaced by TestBed.inject in master: https://github.com/ceph/ceph/pull/34934

src/pybind/mgr/dashboard/frontend/src/app/shared/services/telemetry-notification.service.spec.ts
TestBed.get has been replaced by TestBed.inject in master: https://github.com/ceph/ceph/pull/34934

The backport contains one commit less (39a26ae4b2a1b154c88a414c4abee1c04808effa
is missing) than the original pull request because the migration from alert to
ngb-alert (https://github.com/ceph/ceph/pull/35297) has not been backported.

5 years agomgr/dashboard: reset pwd notification value
Tatjana Dehler [Tue, 26 May 2020 13:41:02 +0000 (15:41 +0200)]
mgr/dashboard: reset pwd notification value

Reset the password notification value if the
user logs out. Otherwise if a another user logs
in, who doesn't see the password expiration
notification (because his password is not going to
expire soon), will see a blank bar instead.

Signed-off-by: Tatjana Dehler <tdehler@suse.com>
(cherry picked from commit 7a6e5be64babc1c2d5f235e1f2e92bcbf60ceb63)

5 years agomgr/dashboard: support >1 top notification panels
Tatjana Dehler [Fri, 15 May 2020 13:54:04 +0000 (15:54 +0200)]
mgr/dashboard: support >1 top notification panels

Update navigation component in order to show more than
one notification panel on top of the page.

Signed-off-by: Tatjana Dehler <tdehler@suse.com>
(cherry picked from commit 455dca6bbe0c26ad682be394335a68399d17c486)

Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/shared/components/pwd-expiration-notification/pwd-expiration-notification.component.html
The alert component has been migrated from ngx-bootstrap to ng-boostrap in master: https://github.com/ceph/ceph/pull/35297

5 years agomgr/dashboard: fix tasks.mgr.dashboard.test_rbd.RbdTest.test_move_image_to_trash... 36563/head
Kiefer Chang [Mon, 3 Aug 2020 05:42:18 +0000 (13:42 +0800)]
mgr/dashboard: fix tasks.mgr.dashboard.test_rbd.RbdTest.test_move_image_to_trash error

The API call is a task and the response status is determined by whether
the call is completed within a pre-defined duration (2 seconds) or not.
We should also allow the status when the call takes longer.

Fixes: https://tracker.ceph.com/issues/46812
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit d208d67f9fc92873ba9d63190d7e5f5c202395a8)

5 years agomgr/dashboard/api: increase API health timeout 36562/head
Ernesto Puerta [Fri, 17 Jul 2020 13:21:55 +0000 (15:21 +0200)]
mgr/dashboard/api: increase API health timeout

Fixes: https://tracker.ceph.com/issues/46601
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
(cherry picked from commit cd9f680b1121d0a8cb14f260a21b0cab4dbeee0a)

5 years agoceph-volume: dependency on python-ceph-common 36558/head
Jan Fajerski [Thu, 30 Jul 2020 09:46:00 +0000 (11:46 +0200)]
ceph-volume: dependency on python-ceph-common

Since e5b585d15de8b07e0a179344d4187582a5c069f2 ceph-volume depends on
python-ceph-common. This commit introduces this dependency for the
ceph-osd rpm (which includes ceph-volume) and installs the dependency
for tox runs.

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

5 years agopython-common, spec.in: Add missing pyyaml dependency
Sebastian Wagner [Thu, 30 Jul 2020 07:55:08 +0000 (09:55 +0200)]
python-common, spec.in: Add missing pyyaml dependency

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

 Conflicts:
src/python-common/setup.py
        picked both changes

5 years agoceph-volume: add drive-group subcommand
Jan Fajerski [Tue, 21 Apr 2020 13:47:42 +0000 (15:47 +0200)]
ceph-volume: add drive-group subcommand

This new subcommand takes a drive group specification as json and deploys
the OSDs accordingly.

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

5 years agoMerge pull request #36291 from dzafman/wip-46707-octopus
Yuri Weinstein [Mon, 10 Aug 2020 17:18:14 +0000 (10:18 -0700)]
Merge pull request #36291 from dzafman/wip-46707-octopus

octopus: osd: Cancel in-progress scrubs (not user requested)

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #36123 from aclamk/wip-bluefs-log-replay-rescue-octopus
Yuri Weinstein [Mon, 10 Aug 2020 17:17:13 +0000 (10:17 -0700)]
Merge pull request #36123 from aclamk/wip-bluefs-log-replay-rescue-octopus

octopus: bluestore: Rescue procedure for extremely large bluefs log

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #36450 from sebastian-philipp/octopus-backport-35374-35667-36225...
Sebastian Wagner [Mon, 10 Aug 2020 01:53:45 +0000 (03:53 +0200)]
Merge pull request #36450 from sebastian-philipp/octopus-backport-35374-35667-36225-35839-36239-36301-36262-36012-36285-36235-36217-3572

octopus: cephadm batch backport August (1)

Reviewed-by: Michael Fritch <mfritch@suse.com>
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 agomgr/dashboard: Configure overflow of popover in health page 36460/head
Tiago Melo [Tue, 21 Jul 2020 20:41:46 +0000 (20:41 +0000)]
mgr/dashboard: Configure overflow of popover in health page

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

Conflicts:
      src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard/info-card/info-card-popover.scss
      - The order of CSS properties changed in the master.

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 agomgr/orchestrator: fix placement of '1' activating dry-run bug 36450/head
Daniel-Pivonka [Mon, 3 Aug 2020 19:28:35 +0000 (15:28 -0400)]
mgr/orchestrator: fix placement of '1' activating dry-run bug

when applying a placement of '1' for mon, mgr, rbd-mirror, crash, alertmanager, grafana, node-exporter, prometheus, or mds a dry-run was activated

Fixes: https://tracker.ceph.com/issues/46819
Signed-off-by: Daniel-Pivonka <dpivonka@redhat.com>
(cherry picked from commit 9f7c8f71fc19bf0b123dd2e76ea8025ed0b8ccc9)

5 years agocephadm: Fix error bootstraping with '--registry-json'
Ricardo Marques [Thu, 30 Jul 2020 14:48:21 +0000 (15:48 +0100)]
cephadm: Fix error bootstraping with '--registry-json'

We need to force setting registry auth options because
these options are unknown before the mgr first starts
and registers them.

Fixes: https://tracker.ceph.com/issues/46777
Signed-off-by: Ricardo Marques <rimarques@suse.com>
(cherry picked from commit 6f8aa25f645cdec1514daecc9b36264fa572234a)

5 years agomgr/cephadm: skip Dashboard configuration if Dashboard is disabled
Kiefer Chang [Fri, 31 Jul 2020 02:59:29 +0000 (10:59 +0800)]
mgr/cephadm: skip Dashboard configuration if Dashboard is disabled

Fixes: https://tracker.ceph.com/issues/46045
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit 95a66fed20ed71b31fa5548f50566f9ec780f298)

5 years agomgr/orch: disallow unimplemented format types
Michael Fritch [Wed, 29 Jul 2020 20:14:27 +0000 (14:14 -0600)]
mgr/orch: disallow unimplemented format types

unimplemented format types can cause the mgr to hang:
$ ceph orch ls --format xml

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

5 years agomgr/cephadm: track dependency in tox.ini
Kefu Chai [Sun, 2 Aug 2020 01:31:01 +0000 (09:31 +0800)]
mgr/cephadm: track dependency in tox.ini

* track dependency for running tox tests with tox.ini. the fix
  test is not performed by "make check", so `install-deps.sh`
  is not responsible for preparing the autopep8 wheels. hence
  we can just put it in tox.ini
* remove "python_version >= '3'" as we do not support python2

this change addresses a regression introduced by
7d8a3b60321da10af6f4557a9d69eda09ca2c620, which fails the rpmbuild like:

RPM build errors:
    Installed (but unpackaged) file(s) found:
   /usr/share/ceph/mgr/requirements-fix.txt

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

5 years agomgr/cephadm: Introduce tox and autopep8
Volker Theile [Wed, 29 Jul 2020 10:13:01 +0000 (12:13 +0200)]
mgr/cephadm: Introduce tox and autopep8

This PR introduces tox and autopep8 to format the Python code according to PEP8. It does NOT include any lint related things.

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

Conflicts:
src/pybind/mgr/tox.ini

5 years agocephadm: Deploying alertmanager image is broken
Volker Theile [Mon, 3 Aug 2020 14:53:31 +0000 (16:53 +0200)]
cephadm: Deploying alertmanager image is broken

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

5 years agomgr/cephadm: correct to_json output from str->dict
Joshua Schmid [Fri, 31 Jul 2020 11:33:24 +0000 (13:33 +0200)]
mgr/cephadm: correct to_json output from str->dict

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

5 years agocephadm: add unwrap_ipv6 helper method
Matthew Oliver [Thu, 30 Jul 2020 03:18:48 +0000 (13:18 +1000)]
cephadm: add unwrap_ipv6 helper method

When we pass in a mon-ip that is ipv6 we want it wrapped, this is so it
can be properly inserted into the mon_addrv address.
But there are times we need to unwrap it to test it's a valid ipv6
address.

This patch adds a helper method `unwrap_ipv6` which takes a string and
returns it either unwrapped or as it is, so it's harmless to other types
of ips.

This allows us to check a wrapped ipv6 base_ip with the networks on the
host.

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

5 years agobuild/debian: remove osd_support
Joshua Schmid [Tue, 28 Jul 2020 11:43:11 +0000 (13:43 +0200)]
build/debian: remove osd_support

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

5 years agodoc/cephadm: adjust osd removal docs
Joshua Schmid [Tue, 28 Jul 2020 07:35:56 +0000 (09:35 +0200)]
doc/cephadm: adjust osd removal docs

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

5 years agomgr/cephadm: add tests for new remove/replace logic
Joshua Schmid [Fri, 24 Jul 2020 13:25:31 +0000 (15:25 +0200)]
mgr/cephadm: add tests for new remove/replace logic

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

5 years agomgr/cephadm: implement osd remove/replace logic in cephadm
Joshua Schmid [Fri, 24 Jul 2020 13:24:38 +0000 (15:24 +0200)]
mgr/cephadm: implement osd remove/replace logic in cephadm

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

5 years agomgr/osd_support: remove module and all traces
Joshua Schmid [Fri, 24 Jul 2020 13:23:52 +0000 (15:23 +0200)]
mgr/osd_support: remove module and all traces

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

Conflicts:
src/mon/MgrMonitor.cc

5 years agomgr/cephadm: add qa tests for daemon restart
Paul Cuzner [Wed, 29 Jul 2020 21:02:04 +0000 (09:02 +1200)]
mgr/cephadm: add qa tests for daemon restart

Added tests to cove daemon stop/start and restart

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 5ff0a1d2daa7d36c9c3284523269c4a1a7daa437)

5 years agomgr/cephadm: fix call to cephadm for daemon restarts etc
Paul Cuzner [Wed, 29 Jul 2020 04:00:37 +0000 (16:00 +1200)]
mgr/cephadm: fix call to cephadm for daemon restarts etc

The call currently passes the daemon_type as the first
parameter - but the function expects the hostname. This
results in failures when attempting daemon restarts through the ceph orch daemon <action> <daemon_id>
command.

Fixes: https://tracker.ceph.com/issues/46740
Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
(cherry picked from commit 94e418581c9126dc199def6078d6a8449bdec8df)

5 years agomgr/cephadm: Add migration to keep the service names consistent
Sebastian Wagner [Fri, 24 Jul 2020 14:20:22 +0000 (16:20 +0200)]
mgr/cephadm: Add migration to keep the service names consistent

After 15.2.4, we unified some service IDs: MONs, MGRs etc no longer have a service id.
Which means, the service names changed:

mon.foo -> mon
mgr.foo -> mgr

This fixes the data structure consistency

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

5 years agomgr/cephadm: minor cleanup in test_migration
Sebastian Wagner [Fri, 24 Jul 2020 14:17:45 +0000 (16:17 +0200)]
mgr/cephadm: minor cleanup in test_migration

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

5 years agodoc/mgr/orchestrator: Fix formatting and examples in create OSDs
Varsha Rao [Thu, 30 Jul 2020 13:28:47 +0000 (15:28 +0200)]
doc/mgr/orchestrator: Fix formatting and examples in create OSDs

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

5 years agomgr/orchestrator: For OSDs, the service_id is the osdspec_affinity
Sebastian Wagner [Fri, 31 Jul 2020 09:09:04 +0000 (11:09 +0200)]
mgr/orchestrator: For OSDs, the service_id is the osdspec_affinity

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

5 years agomgr/cephadm: get_daemons_by_service should use dd.service_name
Sebastian Wagner [Fri, 31 Jul 2020 09:06:35 +0000 (11:06 +0200)]
mgr/cephadm: get_daemons_by_service should use dd.service_name

daemon_name does not necessarily starts with the service_name.

Especially not for OSDs.

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

5 years agopython-common: don't assert when building rados url
Michael Fritch [Thu, 30 Jul 2020 17:34:33 +0000 (11:34 -0600)]
python-common: don't assert when building rados url

breaks the `orch ls --format yaml` command

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

5 years agomgr/cephadm: revamp ceph.conf distribution scheduling
Sebastian Wagner [Mon, 27 Jul 2020 12:27:12 +0000 (14:27 +0200)]
mgr/cephadm: revamp ceph.conf distribution scheduling

Having an in-memeory list doesn't work properly: Especially
when loading the mgr module, we didn't knwo if we should
deploy confs or not.

Now we only distribute ceph.confs, if there is a new mon_map.
We also store that info now in the config store

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

5 years agomgr/cephadm: Add test verifying the initializaiton order
Sebastian Wagner [Mon, 27 Jul 2020 10:09:30 +0000 (12:09 +0200)]
mgr/cephadm: Add test verifying the initializaiton order

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

5 years agovstart: infer the mon public_network
Michael Fritch [Tue, 28 Jul 2020 17:24:21 +0000 (11:24 -0600)]
vstart: infer the mon public_network

set the mon public_network when deploying with the cephadm flag

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

5 years agomgr/orch: allow for multiline OrchestratorEvent message
Michael Fritch [Tue, 28 Jul 2020 19:57:17 +0000 (13:57 -0600)]
mgr/orch: allow for multiline OrchestratorEvent message

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

5 years agomgr/cephadm: streamline rgw deployment
Daniel-Pivonka [Thu, 16 Jul 2020 12:24:47 +0000 (08:24 -0400)]
mgr/cephadm: streamline rgw deployment

cephadm will create realm, zonegroup, and zone if needed before creating rgw service

fixes: https://tracker.ceph.com/issues/43681
Signed-off-by: Daniel-Pivonka <dpivonka@redhat.com>
(cherry picked from commit 131001c453dc3c5d14c56691cdf25353e0127882)

5 years agomgr/cephadm: add `orch host ok-to-stop` command
Michael Fritch [Tue, 21 Jul 2020 21:06:19 +0000 (15:06 -0600)]
mgr/cephadm: add `orch host ok-to-stop` command

$ ceph orch host ok-to-stop host1
It is presumed safe to stop host host1

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

5 years agomgr/cephadm: return HandleCommandResult from ok_to_stop
Michael Fritch [Tue, 21 Jul 2020 21:26:43 +0000 (15:26 -0600)]
mgr/cephadm: return HandleCommandResult from ok_to_stop

- return output from the result of the ok_to_stop command
- log ok-to-stop result during all invocations

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

5 years agomgr/orch: add errno to OrchestratorError
Michael Fritch [Wed, 22 Jul 2020 23:43:05 +0000 (17:43 -0600)]
mgr/orch: add errno to OrchestratorError

add errno to OrchestratorError and ServiceSpecValidationError exceptions

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

5 years agocephadm: use src/mypy.ini instead
Sebastian Wagner [Mon, 20 Jul 2020 11:55:09 +0000 (13:55 +0200)]
cephadm: use src/mypy.ini instead

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

Conflicts:
src/cephadm/tox.ini

5 years agocephadm: Add tcmu-runner container when deploying ceph-iscsi
Matthew Oliver [Wed, 22 Jul 2020 07:09:12 +0000 (17:09 +1000)]
cephadm: Add tcmu-runner container when deploying ceph-iscsi

Currently when we deploy ceph-iscsi via cephadm it doesn't include a
running tcmu-runner. Which means initiators will be able to login but
you wont see the LUNS on the initiator.

This patch deploys an additional tcmu-runner container along side the
ceph-iscsi container that just runs the tcmu-runner service.

Fixes: https://tracker.ceph.com/issues/46540
Signed-off-by: Matthew Oliver <moliver@suse.com>
(cherry picked from commit eb604d3338b32a7a11e36e05df6556dbd95ac4a0)

5 years agomgr/orch: Add some more type annotations
Sebastian Wagner [Fri, 24 Jul 2020 15:29:28 +0000 (17:29 +0200)]
mgr/orch: Add some more type annotations

Made `orch.Completion` a generic type

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

5 years agomgr/cephadm: allow use of authenticated registry
Adam King [Fri, 10 Jul 2020 12:09:39 +0000 (08:09 -0400)]
mgr/cephadm: allow use of authenticated registry

Add option to use custom authenticated registry during
bootstrap as well as a registry-login command in order
to let user change authenticated registry login info

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

5 years agomgr/cephadm: re-add `apply_drivegroups()`
Sebastian Wagner [Thu, 23 Jul 2020 08:43:17 +0000 (10:43 +0200)]
mgr/cephadm: re-add `apply_drivegroups()`

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

5 years agodoc/cephadm: `status` doesn't show a progress
Sebastian Wagner [Mon, 27 Jul 2020 14:50:01 +0000 (16:50 +0200)]
doc/cephadm: `status` doesn't show a progress

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

5 years agomgr/cephadm: create OSDs in parallel
Sebastian Wagner [Wed, 22 Jul 2020 12:45:09 +0000 (14:45 +0200)]
mgr/cephadm: create OSDs in parallel

Should speedup day 1 OSD creation by something like factor 10

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

5 years agomgr/cephadm: move `forall_hosts()` to utils module
Sebastian Wagner [Wed, 22 Jul 2020 12:39:26 +0000 (14:39 +0200)]
mgr/cephadm: move `forall_hosts()` to utils module

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

5 years agodoc/mgr/orchestrator: add missing OSD service_id
Michael Fritch [Wed, 22 Jul 2020 22:35:32 +0000 (16:35 -0600)]
doc/mgr/orchestrator: add missing OSD service_id

example for deploying multiple specs via yaml was missing the service_id

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

5 years agopython-common: clean-up ServiceSpec.service_id handling
Michael Fritch [Tue, 30 Jun 2020 22:06:20 +0000 (16:06 -0600)]
python-common: clean-up ServiceSpec.service_id handling

service_id is required for iscsi, mds, nfs, osd, rgw.

any other service_type (mon, mgr, etc.) should not contain a service_id

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

5 years agodoc/cephadm: Fix typos in 'Cephadm Concepts' document.
Volker Theile [Wed, 22 Jul 2020 08:00:18 +0000 (10:00 +0200)]
doc/cephadm: Fix typos in 'Cephadm Concepts' document.

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

5 years agodoc: add notes about --dry-run
Joshua Schmid [Mon, 6 Jul 2020 09:59:49 +0000 (11:59 +0200)]
doc: add notes about --dry-run

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

5 years agomgr/cephadm: rework --dry-run/previews
Joshua Schmid [Wed, 10 Jun 2020 08:33:36 +0000 (10:33 +0200)]
mgr/cephadm: rework --dry-run/previews

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

Conflicts:
src/pybind/mgr/orchestrator/module.py

5 years agomgr/cephadm: adapt tests to have OSDSPEC_AFFINITY
Joshua Schmid [Thu, 4 Jun 2020 07:53:32 +0000 (09:53 +0200)]
mgr/cephadm: adapt tests to have OSDSPEC_AFFINITY

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

5 years agomgr/cephadm: re-enable osdspec affinity passing
Joshua Schmid [Thu, 4 Jun 2020 06:52:38 +0000 (08:52 +0200)]
mgr/cephadm: re-enable osdspec affinity passing

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

5 years agoqa/tests: moved client-upgrade-octopus-pacific under new dir 36436/head
Yuri Weinstein [Mon, 3 Aug 2020 17:05:52 +0000 (10:05 -0700)]
qa/tests: moved client-upgrade-octopus-pacific under new dir

The motivation for this chnage is to enable more developers to use and run upgrades tests in more simplified way as "-s upgrades/"

"client-upgrade-octopus-pacific" doesn't fit this logic as it need to use suites from older branches, so that's why they are separated.

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>