]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
4 years agologrotate: include cephfs-mirror daemon 42097/head
Venky Shankar [Thu, 24 Jun 2021 04:57:29 +0000 (00:57 -0400)]
logrotate: include cephfs-mirror daemon

Fixes: http://tracker.ceph.com/issues/51318
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 957bae255c9f6fba8a4ccfcb885c2687784444aa)

4 years agocephfs-mirror: reopen logs on SIGHUP
Venky Shankar [Wed, 23 Jun 2021 06:59:13 +0000 (02:59 -0400)]
cephfs-mirror: reopen logs on SIGHUP

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 68ad416766e2c73109dbf44f179d1b85b9d61994)

4 years agoMerge pull request #41753 from ifed01/wip-ifed-fix-alloc-init-add-free-0-len-pac
Yuri Weinstein [Mon, 28 Jun 2021 17:07:12 +0000 (10:07 -0700)]
Merge pull request #41753 from ifed01/wip-ifed-fix-alloc-init-add-free-0-len-pac

pacific: os/bluestore: tolerate zero length for allocators' init_[add/rm]_free()

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #41752 from ifed01/wip-ifed-fix-repair-multithreading-pac
Yuri Weinstein [Mon, 28 Jun 2021 17:05:43 +0000 (10:05 -0700)]
Merge pull request #41752 from ifed01/wip-ifed-fix-repair-multithreading-pac

pacific: os/bluestore: introduce multithreading sync for bluestore's repairer

Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
4 years agoMerge pull request #42007 from rhcs-dashboard/wip-51343-pacific
Ernesto Puerta [Mon, 28 Jun 2021 16:49:14 +0000 (18:49 +0200)]
Merge pull request #42007 from rhcs-dashboard/wip-51343-pacific

pacific: mgr/dashboard: crushmap tree doesn't display crush type other than root

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #41450 from idryomov/wip-monc-rotating-timeout-pacific
Yuri Weinstein [Mon, 28 Jun 2021 16:32:16 +0000 (09:32 -0700)]
Merge pull request #41450 from idryomov/wip-monc-rotating-timeout-pacific

pacific: mon/MonClient: tolerate a rotating key that is slightly out of date

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #41249 from idryomov/wip-posix-memalign-fix-pacific
Yuri Weinstein [Mon, 28 Jun 2021 16:31:44 +0000 (09:31 -0700)]
Merge pull request #41249 from idryomov/wip-posix-memalign-fix-pacific

pacific: common/buffer: adjust align before calling posix_memalign()

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #41995 from batrick/i51335
Yuri Weinstein [Mon, 28 Jun 2021 16:30:56 +0000 (09:30 -0700)]
Merge pull request #41995 from batrick/i51335

pacific: mds: avoid journaling overhead for setxattr("ceph.dir.subvolume") for no-op case

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #41971 from trociny/wip-51313-pacific
Yuri Weinstein [Mon, 28 Jun 2021 16:29:07 +0000 (09:29 -0700)]
Merge pull request #41971 from trociny/wip-51313-pacific

pacific: osd: fix scrub reschedule bug

Reviewed-by: Friedmann <ofriedma@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #41947 from vshankar/wip-cephfs-mirror-pacfiic-backports-21062021
Yuri Weinstein [Mon, 28 Jun 2021 16:27:13 +0000 (09:27 -0700)]
Merge pull request #41947 from vshankar/wip-cephfs-mirror-pacfiic-backports-21062021

pacific: cephfs-mirror: backports

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
4 years agoMerge pull request #41019 from idryomov/wip-reset-authenticate-err-pacific
Yuri Weinstein [Mon, 28 Jun 2021 16:25:47 +0000 (09:25 -0700)]
Merge pull request #41019 from idryomov/wip-reset-authenticate-err-pacific

pacific: mon/MonClient: reset authenticate_err in _reopen_session()

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agomgr: expose CRUSHMap.find_roots() 42007/head
Kefu Chai [Wed, 26 May 2021 12:05:29 +0000 (20:05 +0800)]
mgr: expose CRUSHMap.find_roots()

so mgr module could use it to enumerate all nodes without parents

See-also: https://tracker.ceph.com/issues/50971
Signed-off-by: Kefu Chai <kchai@redhat.com>
4 years agomgr/dashboard: crushmap tree doesn't display crush type other than root
Avan Thakkar [Tue, 8 Jun 2021 14:34:00 +0000 (20:04 +0530)]
mgr/dashboard: crushmap tree doesn't display crush type other than root

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

4 years agoMerge pull request #41983 from neha-ojha/wip-50986-pacific
Yuri Weinstein [Sat, 26 Jun 2021 14:27:08 +0000 (07:27 -0700)]
Merge pull request #41983 from neha-ojha/wip-50986-pacific

pacific: crush/crush: ensure alignof(crush_work_bucket) is 1

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #41982 from neha-ojha/wip-50989-pacific
Yuri Weinstein [Sat, 26 Jun 2021 14:26:34 +0000 (07:26 -0700)]
Merge pull request #41982 from neha-ojha/wip-50989-pacific

pacific: mon/OSDMonitor: drop stale failure_info even if can_mark_down()

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #42016 from rhcs-dashboard/wip-50773-pacific
Ernesto Puerta [Fri, 25 Jun 2021 18:46:39 +0000 (20:46 +0200)]
Merge pull request #42016 from rhcs-dashboard/wip-50773-pacific

pacific: mgr/dashboard: fix typo: Filesystems to File Systems

Reviewed-by: Waad Alkhoury <walkhour@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: navinbarnwal <NOT@FOUND>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
4 years agoMerge pull request #42008 from rhcs-dashboard/wip-51180-pacific
Ernesto Puerta [Fri, 25 Jun 2021 18:46:01 +0000 (20:46 +0200)]
Merge pull request #42008 from rhcs-dashboard/wip-51180-pacific

pacific: mgr/dashboard: fix for right sidebar nav icon not clickable

Reviewed-by: Waad Alkhoury <walkhour@redhat.com>
Reviewed-by: aaryanporwal <NOT@FOUND>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
4 years agoMerge pull request #41948 from rhcs-dashboard/wip-51273-pacific
Ernesto Puerta [Fri, 25 Jun 2021 18:43:49 +0000 (20:43 +0200)]
Merge pull request #41948 from rhcs-dashboard/wip-51273-pacific

pacific: mgr/dashboard: bucket details: show lock retention period only in days

Reviewed-by: Waad Alkhoury <walkhour@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
4 years agoMerge pull request #41913 from sebastian-philipp/pacific-backport-41265-41746-41556...
Sebastian Wagner [Fri, 25 Jun 2021 12:33:11 +0000 (14:33 +0200)]
Merge pull request #41913 from sebastian-philipp/pacific-backport-41265-41746-41556-41632-41805-41799-41846-41820-41813-41346-

pacific: cephadm: june batch 3

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
4 years agomgr/dashboard: fix typo: Filesystems to File Systems 42016/head
Navin Barnwal [Tue, 11 May 2021 18:49:56 +0000 (00:19 +0530)]
mgr/dashboard: fix typo: Filesystems to File Systems

Fixes: https://tracker.ceph.com/issues/50341
Signed-off-by: Navin Barnwal <knbarnwal@gmail.com>
(cherry picked from commit 9879b442acb122b8a5842a3ea9d979272e738572)

4 years agomgr/dashboard: fix typo: Filesystems to File Systems
Navin Barnwal [Tue, 11 May 2021 18:29:53 +0000 (23:59 +0530)]
mgr/dashboard: fix typo: Filesystems to File Systems

Fixes: https://tracker.ceph.com/issues/50341
Signed-off-by: Navin Barnwal <knbarnwal@gmail.com>
(cherry picked from commit 537b5e70d97b8097b14d160355c6e4e23a18732e)

4 years agomgr/dashboard: fix typo: Filesystems to File Systems
Navin Barnwal [Tue, 11 May 2021 17:11:08 +0000 (22:41 +0530)]
mgr/dashboard: fix typo: Filesystems to File Systems

Fixes: https://tracker.ceph.com/issues/50341
Signed-off-by: Navin Barnwal <knbarnwal@gmail.com>
(cherry picked from commit e55ff44dfbbfb4687a496e284ca42848d6b17761)

4 years agomgr/dashboard: fix typo: Filesystems to File Systems
Navin Barnwal [Tue, 11 May 2021 10:58:08 +0000 (16:28 +0530)]
mgr/dashboard: fix typo: Filesystems to File Systems
Added breadcrumbs and edited Filesystem -> File Systems in dashboard
Navigation.

Fixes: https://tracker.ceph.com/issues/50341
Signed-off-by: Navin Barnwal <knbarnwal@gmail.com>
(cherry picked from commit 432e3279366e61e85f337c81609e4ec9a5592765)

4 years agoMerge pull request #41503 from idryomov/wip-50931-pacific
Yuri Weinstein [Thu, 24 Jun 2021 16:50:23 +0000 (09:50 -0700)]
Merge pull request #41503 from idryomov/wip-50931-pacific

pacific: rbd-mirror: fix segfault in snapshot replayer shutdown

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
4 years agoMerge pull request #41304 from MrFreezeex/wip-50713-pacific
Yuri Weinstein [Thu, 24 Jun 2021 16:49:02 +0000 (09:49 -0700)]
Merge pull request #41304 from MrFreezeex/wip-50713-pacific

pacific: librbd/mirror/snapshot: avoid UnlinkPeerRequest with a unlinked peer

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
4 years agoMerge pull request #42010 from trociny/wip-51345-pacific
Ilya Dryomov [Thu, 24 Jun 2021 14:42:05 +0000 (16:42 +0200)]
Merge pull request #42010 from trociny/wip-51345-pacific

pacific: test/librbd: use really invalid domain

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
4 years agotest/librbd: use really invalid domain 42010/head
Mykola Golub [Thu, 24 Jun 2021 10:23:21 +0000 (11:23 +0100)]
test/librbd: use really invalid domain

in TestMockMigrationHttpClient.OpenResolveFail

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

4 years agoMerge pull request #41987 from rhcs-dashboard/wip-51326-pacific
Ernesto Puerta [Thu, 24 Jun 2021 12:22:23 +0000 (14:22 +0200)]
Merge pull request #41987 from rhcs-dashboard/wip-51326-pacific

pacific: mgr/dashboard: Alertmanager fails to POST alerts

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
4 years agomgr/dashboard: fix for right sidebar nav icon not clickable 42008/head
Aaryan Porwal [Wed, 26 May 2021 08:58:15 +0000 (14:28 +0530)]
mgr/dashboard: fix for right sidebar nav icon not clickable

fixed the responsive sidebar not opening on click event, and close sidebar on clicking tasks and notification list item because it'll be over shadowed by the sidebar
Signed-off-by: Aaryan Porwal <aaryanporwal2233@gmail.com>
(cherry picked from commit 4e53a139d96215477d00eb709c1662d8277cba1d)

4 years agomds: avoid journaling overhead for ceph.dir.subvolume for no-op case 41995/head
Patrick Donnelly [Fri, 18 Jun 2021 16:27:54 +0000 (09:27 -0700)]
mds: avoid journaling overhead for ceph.dir.subvolume for no-op case

In preparation for acquiring the xlock on the directory inode, the MDS
must journal a few events before continuing on with the setvxattr. This
can cause significant delays in the volumes ceph-mgr module which needs
to regularly enable this vxattr from multiple code paths. We could cache
in that module whether the vxattr is set but it's also pretty easy to
adjust the MDS to acquire a rdlock on the directory to check if the
subvolume flag is already set. That is much lighter weight and the lock
is generally readily available.

Fixes: https://tracker.ceph.com/issues/51276
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit b5f736eee408c220ffdfb67b10667a7b553dac25)

4 years agoMerge pull request #41768 from neha-ojha/wip-50797-pacific
Yuri Weinstein [Wed, 23 Jun 2021 15:30:57 +0000 (08:30 -0700)]
Merge pull request #41768 from neha-ojha/wip-50797-pacific

pacific: mon: load stashed map before mkfs monmap

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
4 years agoMerge pull request #41872 from kamoltat/wip-ksirivad-backport-pacific-fix-49988
Yuri Weinstein [Wed, 23 Jun 2021 15:29:15 +0000 (08:29 -0700)]
Merge pull request #41872 from kamoltat/wip-ksirivad-backport-pacific-fix-49988

pacific: pybind/mgr/progress: Disregard unreported pgs

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #41893 from cfsnyder/wip-51001-pacific
Yuri Weinstein [Wed, 23 Jun 2021 15:09:13 +0000 (08:09 -0700)]
Merge pull request #41893 from cfsnyder/wip-51001-pacific

pacific: rgw: crash on multipart upload to bucket with policy

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
4 years agoMerge pull request #41877 from ideepika/wip-51241-pacific
Yuri Weinstein [Wed, 23 Jun 2021 15:08:51 +0000 (08:08 -0700)]
Merge pull request #41877 from ideepika/wip-51241-pacific

pacific: debian/control: ceph-mgr-modules-core does not Recommend ceph-mgr-rook

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
4 years agoMerge pull request #41863 from cfsnyder/wip-50710-pacific
Yuri Weinstein [Wed, 23 Jun 2021 15:08:14 +0000 (08:08 -0700)]
Merge pull request #41863 from cfsnyder/wip-50710-pacific

pacific: rgw: radosgw_admin remove bucket not purging past 1,000 objects

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
4 years agoMerge pull request #41862 from cfsnyder/wip-51094-pacific
Yuri Weinstein [Wed, 23 Jun 2021 15:07:00 +0000 (08:07 -0700)]
Merge pull request #41862 from cfsnyder/wip-51094-pacific

pacific: mgr/DaemonServer.cc: prevent mgr crashes caused by integer underflow that is triggered by large increases to pg_num/pgp_num

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agoMerge pull request #41755 from ifed01/wip-ifed-tchaikov-wip-rocksdb-pac
Yuri Weinstein [Wed, 23 Jun 2021 15:06:14 +0000 (08:06 -0700)]
Merge pull request #41755 from ifed01/wip-ifed-tchaikov-wip-rocksdb-pac

pacific: bluestore: use string_view and strip trailing slash for dir listing

Reviewed-by: Kefu Chai <kchai@redhat.com>
4 years agoMerge pull request #40819 from ivancich/wip-50301-pacific
Yuri Weinstein [Wed, 23 Jun 2021 15:05:37 +0000 (08:05 -0700)]
Merge pull request #40819 from ivancich/wip-50301-pacific

pacific: rgw: radoslist incomplete multipart parts marker

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
4 years agoMerge pull request #40804 from k0ste/wip-50294-pacific
Yuri Weinstein [Wed, 23 Jun 2021 15:04:09 +0000 (08:04 -0700)]
Merge pull request #40804 from k0ste/wip-50294-pacific

pacific: mgr/prometheus:Improve the pool metadata

Reviewed-by: Paul Cuzner <pcuzner@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
4 years agomgr/dashboard: Alertmanager fails to POST alerts 41987/head
Avan Thakkar [Tue, 22 Jun 2021 11:46:45 +0000 (17:16 +0530)]
mgr/dashboard: Alertmanager fails to POST alerts

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

4 years agocrush/crush: ensure alignof(crush_work_bucket) is 1 41983/head
Kefu Chai [Wed, 26 May 2021 06:58:33 +0000 (14:58 +0800)]
crush/crush: ensure alignof(crush_work_bucket) is 1

in do_rule(), we allocate the space for crush_work_bucket using

char work[crush_work_size(crush, maxout)];

where crush_work_size() calculate the size like:

map->working_size + result_max * 3 * sizeof(__u32);

so work is allocated on stack, but the alignment of the
crush_work_bucket struct is not taken into consideration, so in
crush_init_workspace(), point could point to an address which is not
aligned to 8 bytes, which is the alignment of crush_work_bucket by
default. so is its member variables, all of them are uint32_t, and hence
are also 8-bytes aligned.

to ensure the compiler generate the correct assembly for accessing
the member variables without assuming that the struct is 8-byte
aligned, we should specify the alignment explicitly.

in this change, `__attribute__ ((packed))` is specified for
crush_work_bucket, so that its alignment is 1.

this issue is spotted by ASan, it complains like:

../src/crush/mapper.c:881:22: runtime error: member access within misaligned address 0x7ffe051f90dc for type 'struct crush_work_bucket', which requires 8 byte alignment
0x7ffe051f90dc: note: pointer points here
  1d e5 77 3d 68 55 00 00  00 00 00 00 00 00 00 00  20 93 1f 05 fe 7f 00 00  10 91 1f 05 fe 7f 00 00
              ^
../src/crush/mapper.c:882:22: runtime error: member access within misaligned address 0x7ffe051f90dc for type 'struct crush_work_bucket', which requires 8 byte alignment
0x7ffe051f90dc: note: pointer points here
  1d e5 77 3d 00 00 00 00  00 00 00 00 00 00 00 00  20 93 1f 05 fe 7f 00 00  10 91 1f 05 fe 7f 00 00
              ^
../src/crush/mapper.c:883:20: runtime error: member access within misaligned address 0x7ffe051f90dc for type 'struct crush_work_bucket', which requires 8 byte alignment
0x7ffe051f90dc: note: pointer points here
  1d e5 77 3d 00 00 00 00  00 00 00 00 00 00 00 00  20 93 1f 05 fe 7f 00 00  10 91 1f 05 fe 7f 00 00
              ^

Fixes: https://tracker.ceph.com/issues/50978
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 1fa8c925baeea549a824e463c89060dd60434f3f)

4 years agomon/OSDMonitor: drop stale failure_info even if can_mark_down() 41982/head
Kefu Chai [Tue, 25 May 2021 06:17:34 +0000 (14:17 +0800)]
mon/OSDMonitor: drop stale failure_info even if can_mark_down()

in a124ee85b03e15f4ea371358008ecac65f9f4e50, we add a check to drop
stale failure_info reports. but if osdmap does not prohibit us from
marking the osd in question down, the branch checking the stale info
is not executed. in general, it is allowed to mark an osd down, so
the fix of a124ee85b03e15f4ea371358008ecac65f9f4e50 just fails to
work.

in this change, we check for stale failure report of osd in question
as long as the osd is not marked down in the same function. this should
address the slow ops of failure report issue.

Fixes: https://tracker.ceph.com/issues/50964
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit df6916a56841f89d66fd211729a0a7adc13042cf)

4 years agoosd: fix scrub reschedule bug 41971/head
wanwencong [Thu, 25 Feb 2021 09:07:41 +0000 (17:07 +0800)]
osd: fix scrub reschedule bug

not all element can be visited during reschedule traverse

Fixes: https://tracker.ceph.com/issues/49487
Signed-off-by: wencong wan <wanwc@chinatelecom.cn>
(cherry picked from commit d7561a6e58fc8043b77648a2cdd5d12bb637f92b)

4 years agoMerge pull request #41714 from k0ste/wip-51105-pacific
Guillaume Abrioux [Tue, 22 Jun 2021 06:41:06 +0000 (08:41 +0200)]
Merge pull request #41714 from k0ste/wip-51105-pacific

pacific: ceph-volume: fix batch report and respect ceph.conf config values

4 years agomgr/dashboard: bucket details: show lock retention period only in days 41948/head
Alfonso Martínez [Thu, 10 Jun 2021 13:23:00 +0000 (15:23 +0200)]
mgr/dashboard: bucket details: show lock retention period only in days

Fixes: https://tracker.ceph.com/issues/51164
Signed-off-by: Alfonso Martínez <almartin@redhat.com>
(cherry picked from commit b927dc5bff56be742dc4f8608994f243ab18d2d2)

4 years agocephfs-mirror: silence warnings when connecting via mon host 41947/head
Venky Shankar [Mon, 14 Jun 2021 07:09:37 +0000 (03:09 -0400)]
cephfs-mirror: silence warnings when connecting via mon host

When connecting to remote cluster via mon address, the cluster
confuration file is not required. However, the mirror daemon
fills up the ceph context with the cluster name resulting in
the following warning in (systemctl) logs:

    auth: unable to find a keyring on ...

These warning messages need to be silence as they can mislead
the user.

Fixes: http://tracker.ceph.com/issues/51204
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 98a8980e863814fd1d303e062e863b54ca3184f9)

4 years agotest: add test to verify adding an active peer back to source
Venky Shankar [Thu, 22 Apr 2021 08:48:48 +0000 (04:48 -0400)]
test: add test to verify adding an active peer back to source

Fixes: http://tracker.ceph.com/issues/50447
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 074f55006edb605b35e3c9c20cdc70c4fa8d96e9)

4 years agopybind/mirroring: disallow adding a active peer back to source
Venky Shankar [Thu, 22 Apr 2021 08:48:20 +0000 (04:48 -0400)]
pybind/mirroring: disallow adding a active peer back to source

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit c8a5342e2b342dbfdad3ffe4f36b49d9ed192c47)

4 years agopybind/cephfs: interface to fetch file system id
Venky Shankar [Thu, 22 Apr 2021 08:47:52 +0000 (04:47 -0400)]
pybind/cephfs: interface to fetch file system id

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 2e9b840198041adee50b948ade89b9e7c837b6ce)

4 years agotest: update log-ignorelist for fs:mirror test
Venky Shankar [Thu, 20 May 2021 13:27:34 +0000 (09:27 -0400)]
test: update log-ignorelist for fs:mirror test

Also, have a fs:mirror specific whitelist override since
the current one is a symlink to a common YAML probably used
by other tests.

Fixes: http://tracker.ceph.com/issues/50867
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit d01b8c8566b21874ec5d3db700ffef45c6232330)

4 years agoMerge pull request #41891 from s0nea/wip-51053-pacific
Ernesto Puerta [Fri, 18 Jun 2021 18:06:35 +0000 (20:06 +0200)]
Merge pull request #41891 from s0nea/wip-51053-pacific

pacific: mgr/dashboard: show partially deleted RBDs

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
4 years agoMerge pull request #41818 from rhcs-dashboard/wip-api_label-pacific
Ernesto Puerta [Fri, 18 Jun 2021 18:03:12 +0000 (20:03 +0200)]
Merge pull request #41818 from rhcs-dashboard/wip-api_label-pacific

pacific: .github/labeler: add api-change label

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
4 years agoMerge pull request #41823 from batrick/i51186
Yuri Weinstein [Thu, 17 Jun 2021 19:55:37 +0000 (12:55 -0700)]
Merge pull request #41823 from batrick/i51186

pacific: qa: add async dirops testing

Reviewed-by: Jeff Layton <jlayton@redhat.com>
4 years agoMerge pull request #41822 from batrick/i51185
Yuri Weinstein [Thu, 17 Jun 2021 19:53:22 +0000 (12:53 -0700)]
Merge pull request #41822 from batrick/i51185

pacific: qa: update RHEL to 8.4

Reviewed-by: Jeff Layton <jlayton@redhat.com>
4 years agoMerge pull request #41811 from batrick/i51170
Yuri Weinstein [Thu, 17 Jun 2021 19:52:41 +0000 (12:52 -0700)]
Merge pull request #41811 from batrick/i51170

pacific: qa: AttributeError: 'RemoteProcess' object has no attribute 'split'

Reviewed-by: Jeff Layton <jlayton@redhat.com>
4 years agoMerge pull request #41691 from kotreshhr/wip-51084-pacific
Yuri Weinstein [Thu, 17 Jun 2021 19:52:16 +0000 (12:52 -0700)]
Merge pull request #41691 from kotreshhr/wip-51084-pacific

pacific: mds: Add full caps to avoid osd full check

Reviewed-by: Jeff Layton <jlayton@redhat.com>
4 years agoMerge pull request #41294 from kotreshhr/wip-50627-pacific
Yuri Weinstein [Thu, 17 Jun 2021 19:51:46 +0000 (12:51 -0700)]
Merge pull request #41294 from kotreshhr/wip-50627-pacific

pacific: client: Fix executeable access check for the root user

Reviewed-by: Jeff Layton <jlayton@redhat.com>
4 years agoMerge pull request #41915 from rhcs-dashboard/wip-51259-pacific
Ernesto Puerta [Thu, 17 Jun 2021 15:42:09 +0000 (17:42 +0200)]
Merge pull request #41915 from rhcs-dashboard/wip-51259-pacific

pacific: mgr/dashboard: Fix 500 error while exiting out of maintenance

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
4 years agomgr/dashboard: Fix 500 error while exiting out of maintenance 41915/head
Nizamudeen A [Tue, 15 Jun 2021 08:47:58 +0000 (14:17 +0530)]
mgr/dashboard: Fix 500 error while exiting out of maintenance

When you add a host in maintenance mode and then exit the maintenance
mode, a 500 server error will popup which will interrupt the whole
exit maintenance process and leave the host in an unknown/offline state.
It happened when I was setting the status of the host through the
HostSpec(). With this change, I am using the enter_maintenance api of
the orch to enable the maintenance.

Fixes: https://tracker.ceph.com/issues/51218
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit ea89b60e3f5e73a653eebf5cdcc3227acb7b2e62)

Conflicts:
     src/pybind/mgr/dashboard/controllers/host.py
 - Removed the addr and label variables since its not backported yet to
   pacific
 - Removed Versioning since for pacific this endpoint is not yet
   versioned to 0.1
src/pybind/mgr/dashboard/services/orchestrator.py
 - Removed the addr and label variables since its not backported yet to
   pacific
src/pybind/mgr/dashboard/frontend/src/app/shared/api/host.service.ts
 - Didn't included this file because the changes in there are irrelevant
   in pacific
src/pybind/mgr/dashboard/openapi.yaml
 - Regenerated the openapi file

4 years agodoc/cephadm: removing "Octopus" from procedure 41913/head
Zac Dover [Wed, 16 Jun 2021 14:34:10 +0000 (00:34 +1000)]
doc/cephadm: removing "Octopus" from procedure

This PR removes "Octopus" from the curl-based installation
procedure.

After we moved on to Pacific, referring to Octopus looks wrong.
It looks wrong because it now is wrong.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit 1036edd69ab91144ab5e1185f11eae18fdd00f0b)

4 years agomgr/cephadm: skip ok-to-stop for mds in upgrade if not enough mds daemons
Adam King [Fri, 14 May 2021 15:44:48 +0000 (11:44 -0400)]
mgr/cephadm: skip ok-to-stop for mds in upgrade if not enough mds daemons

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

4 years agomgr/cephadm: unit test for _enough_mds_for_ok_to_stop
Adam King [Fri, 14 May 2021 17:18:48 +0000 (13:18 -0400)]
mgr/cephadm: unit test for _enough_mds_for_ok_to_stop

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit dde64400ed6ab428c7dc60a0d92d7321d272f208)

4 years agocephadm: throw error when trying to add some unsupported repos
Adam King [Thu, 10 Jun 2021 19:49:05 +0000 (15:49 -0400)]
cephadm: throw error when trying to add some unsupported repos

we son't have any repos available for fedora os always error there.

unlike octopus, el7 yum/dnf distros are not supported in pacific
so error there as well.

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 32f4d8e0cfb3b013a8bfa5d51fb8da3fe9aff3a5)

4 years agocephadm: use gpg key for add-repo on ubuntu/debian
Adam King [Thu, 10 Jun 2021 19:16:15 +0000 (15:16 -0400)]
cephadm: use gpg key for add-repo on ubuntu/debian

We were using the ascii version of the gpg key which
was marked as an unsupported filetype by apt-get which
caused apt-get to not make use of the repo source we
were adding.

Additionally, added aomething to make sure we update the
package list after adding the source and key

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

4 years agocephadm: add log warn when unable to infer mon ip addr
Michael Fritch [Fri, 11 Jun 2021 03:22:56 +0000 (21:22 -0600)]
cephadm: add log warn when unable to infer mon ip addr

fixup for `--mon-ip` bootstrap test (introduced b3e2c43):
  ValueError: 'eth0' does not appear to be an IPv4 or IPv6 address

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

4 years agocephadm: raise `Error()` when unable to bind to an ip
Michael Fritch [Fri, 11 Jun 2021 03:15:14 +0000 (21:15 -0600)]
cephadm: raise `Error()` when unable to bind to an ip

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

4 years agocephadm: remove unit test inheritance
Michael Fritch [Thu, 10 Jun 2021 22:38:15 +0000 (16:38 -0600)]
cephadm: remove unit test inheritance

avoid running the `TestCephAdm` tests twice

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

4 years agodoc: fix typo in option
Patrick Donnelly [Mon, 14 Jun 2021 20:37:29 +0000 (13:37 -0700)]
doc: fix typo in option

Fixes: https://tracker.ceph.com/issues/51214
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 3511c83c6bf7519e2183b922e81805d5f18a50cb)

4 years agocephadm: validate `--fsid` during bootstrap
Michael Fritch [Wed, 9 Jun 2021 23:45:03 +0000 (17:45 -0600)]
cephadm: validate `--fsid` during bootstrap

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

4 years agocephadm: set TCMALLOC_MAX_TOTAL_THREAD_CACHE_BYTES=134217728
Sage Weil [Thu, 10 Jun 2021 12:39:11 +0000 (08:39 -0400)]
cephadm: set TCMALLOC_MAX_TOTAL_THREAD_CACHE_BYTES=134217728

This used to live in /etc/{sysconfig,defaults}/ceph, but that does not
apply inside the container.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 140653be0b26293fe2ebe97dadd8bd9dc41f6d99)

4 years agomgr/cephadm: fix errors in command <ceph orch osd> help and documentation
Juan Miguel Olmo Martínez [Tue, 1 Jun 2021 15:14:16 +0000 (17:14 +0200)]
mgr/cephadm: fix errors in command <ceph orch osd> help and documentation

Resolves: https://tracker.ceph.com/issues/51043

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

4 years agomgr/cephadm: unit test for orch ls --service-type flag usage
Adam King [Thu, 27 May 2021 19:42:53 +0000 (15:42 -0400)]
mgr/cephadm: unit test for orch ls --service-type flag usage

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit ea3e6b392dd6ef7fb771486349f6426a462d42ab)

4 years agomgr/cephadm: fix --service-type flag in orch ls when service has id
Adam King [Wed, 26 May 2021 16:16:38 +0000 (12:16 -0400)]
mgr/cephadm: fix --service-type flag in orch ls when service has id

The running daemon count comes out wrong if the service type is
for a service that has an id.

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

4 years agomgr/cephadm: When test osd active, it need to add "mock call" to make sure execute...
jianglong01 [Fri, 11 Jun 2021 02:56:30 +0000 (10:56 +0800)]
mgr/cephadm: When test osd active, it need to add "mock call" to make sure execute correctly

Signed-off-by: jianglong01 <jianglong01@qianxin.com>
(cherry picked from commit 73dd266dc837b9a11d27ee17cbe75f8b6c36c799)

4 years agomgr/cephadm: When create osd which include db, _create_daemon will be executed twice...
jianglong01 [Tue, 8 Jun 2021 06:00:48 +0000 (14:00 +0800)]
mgr/cephadm: When create osd which include db, _create_daemon will be executed twice. So we should filter the db type

Signed-off-by: jianglong01 <jianglong01@qianxin.com>
(cherry picked from commit ca52b4935111c7bb0439be111f5b6936f3993b3f)

4 years agodoc/cephadm: rewrite "config ssl/tls f. grafana"
Zac Dover [Mon, 10 May 2021 23:19:10 +0000 (09:19 +1000)]
doc/cephadm: rewrite "config ssl/tls f. grafana"

This PR streamlines the grammar in the subsection
called "Configuring SSL/TLS for Grafana" in the
monitoring.rst file. It also corrects the prompt
rst.

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit b9554b0840d6973a3abc71d0f816e32c70202dd2)

4 years agodebian/control: ceph-mgr-modules-core does not Recommend ceph-mgr-rook anymore 41877/head
Kefu Chai [Fri, 4 Jun 2021 03:25:12 +0000 (11:25 +0800)]
debian/control: ceph-mgr-modules-core does not Recommend ceph-mgr-rook anymore

per https://www.debian.org/doc/debian-policy/ch-relationships.html

> Recommends
>   This declares a strong, but not absolute, dependency.
>
> The Recommends field should list packages that would be found together
> with this one in all but unusual installations.

ceph-mgr-modules-core provides a set of ceph-mgr modules which are
always enabeld. but the rook module enables ceph-mgr to install and
configure a Ceph cluster using Rook. this module is very useful but
it does not have such a strong connection with ceph-mgr-modules-core.
we can always install it separately for using better intergration with
Rook.

See-also: https://tracker.ceph.com/issues/45574
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 814fb28892370bef3337f90edccfd6f9c00bf350)

4 years agorgw: crash on multipart upload to bucket with policy 41893/head
Or Friedmann [Thu, 13 May 2021 12:39:02 +0000 (15:39 +0300)]
rgw: crash on multipart upload to bucket with policy

crash on multipart upload to bucket with policy Fixes: https://tracker.ceph.com/issues/50556

Signed-off-by: Or Friedmann <ofriedma@redhat.com>
(cherry picked from commit 413b23a5483d1feb5ea087ee96bd31b14bc0a285)

Conflicts:
  src/rgw/rgw_op.cc
- rgw::sal::RGWObject renamed to rgw::sal::Object

4 years agomgr/dashboard: show partially deleted RBDs 41891/head
Tatjana Dehler [Thu, 27 May 2021 09:46:50 +0000 (11:46 +0200)]
mgr/dashboard: show partially deleted RBDs

An RBD might be partially deleted if the deletion
process has been started but was interrupted. In
this case return the RBD as part of the RBD list
and mark it as partially deleted.

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

Conflicts:
src/pybind/mgr/dashboard/services/rbd.py
Fixed minor imports conflict.

4 years agoMerge pull request #41815 from sebastian-philipp/pacific-backport-41555-41444-41693...
Sebastian Wagner [Wed, 16 Jun 2021 11:57:42 +0000 (13:57 +0200)]
Merge pull request #41815 from sebastian-philipp/pacific-backport-41555-41444-41693-41653-41241-41242

pacific: cephadm: june batch 2

Reviewed-by: Michael Fritch <mfritch@suse.com>
4 years agoMerge pull request #41680 from neha-ojha/wip-50706-pacific
Yuri Weinstein [Tue, 15 Jun 2021 18:50:20 +0000 (11:50 -0700)]
Merge pull request #41680 from neha-ojha/wip-50706-pacific

pacific: osd/PG.cc: handle removal of pgmeta object

Reviewed-by: Neha Ojha <nojha@redhat.com>
4 years agopybind/mg/progress: Disregard unreported pgs 41872/head
Kamoltat [Thu, 13 May 2021 17:38:10 +0000 (17:38 +0000)]
pybind/mg/progress: Disregard unreported pgs

The global recovery event progress calculations only
takes into account pgs with `reported_epoch < start_epoch_of_event`
but sometimes the pgs doesn't get move before or after the creation
of the global recovery event, therefore this might result in a bug
where the global event gets stuck forever unless there is another
event that specifically makes the pgs that get stuck moves and updates
its `reported_epoch`.

Therefore, we decided to disregard pgs that are in active+clean state
but has `reported_epoch < start_epoch_of_event`.

Fixes: https://tracker.ceph.com/issues/49988
Signed-off-by: Kamoltat <ksirivad@redhat.com>
(cherry picked from commit 4b00f1c2bd5b15bcf7e5d143eebb2168c007b602)

4 years agorgw: radosgw_admin remove bucket not purging past 1,000 objects 41863/head
J. Eric Ivancich [Mon, 3 May 2021 21:52:22 +0000 (17:52 -0400)]
rgw: radosgw_admin remove bucket not purging past 1,000 objects

The zipper refactoring combines use of old is_truncated variable and
newer structure that manages is_truncated. This prevented advancing
past the first page of 1,000 entries.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit 459d59f505e6c40697ffd71f3ce853b187466fa4)

Conflicts:
src/rgw/rgw_sal_rados.cc

4 years agomgr/DaemonServer.cc: prevent integer underflow that is triggered by large increases... 41862/head
Cory Snyder [Fri, 28 May 2021 19:08:49 +0000 (15:08 -0400)]
mgr/DaemonServer.cc: prevent integer underflow that is triggered by large increases to pg_num/pgp_num

This fixes a scenario where mgrs continually crash while attempting to apply large increases to pg_num/pgp_num. The max step size (estmax) for each incremental update to the pgp_num is calculated as a percentage of the pg_num, which permits the possibility for the max step size (estmax) to be greater than the current pgp_num when the increase is large; this causes an integer underflow when the max step size is subtracted from the pgp_num in order to calculate the next step size with std::clamp. The integer underflow causes hi < lo in args passed to std::clamp, which causes a failed assertion, SIGABRT, and ultimately crashing mgr.

Fixes: https://tracker.ceph.com/issues/47738
Signed-off-by: Cory Snyder <csnyder@iland.com>
(cherry picked from commit b4316d257e928b3789b818054927c2e98bb3c0d6)

4 years agoqa: test nowsync option in kernel client workflows 41823/head
Patrick Donnelly [Wed, 17 Feb 2021 02:38:29 +0000 (18:38 -0800)]
qa: test nowsync option in kernel client workflows

Fixes: https://tracker.ceph.com/issues/49341
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 84ae38594db0e8ac39bfd3a025dae277fe1ad44c)

4 years agoqa: deep merge top level overrides for fuse/kclient
Patrick Donnelly [Wed, 17 Feb 2021 02:37:35 +0000 (18:37 -0800)]
qa: deep merge top level overrides for fuse/kclient

This allows for array/dict configs like mntopts to accumulate changes
from multiple yaml fragments.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 88f74dbfa634b904253fc14ab4787e51a7a4f9c4)

4 years agoqa: update RHEL to 8.4 41822/head
Patrick Donnelly [Thu, 3 Jun 2021 19:41:57 +0000 (12:41 -0700)]
qa: update RHEL to 8.4

Fixes: https://tracker.ceph.com/issues/51082
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit b9bf490974872e9172b9b562907011b10ab7e18d)

4 years agoMerge pull request #41634 from rhcs-dashboard/wip-51038-pacific
Ernesto Puerta [Fri, 11 Jun 2021 17:45:23 +0000 (19:45 +0200)]
Merge pull request #41634 from rhcs-dashboard/wip-51038-pacific

pacific: mgr/dashboard: fix base-href

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
4 years ago.github/labeler: add api-change label 41818/head
Ernesto Puerta [Tue, 8 Jun 2021 15:12:36 +0000 (17:12 +0200)]
.github/labeler: add api-change label

To flag PRs changing the Ceph REST API. It might also work for another
APIs.

Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
(cherry picked from commit 756d4b18aa9cb8590d2edb92de803b8f589247df)

4 years agodoc/dev/cephadm: cephadm bootstrap --shared_ceph_folder 41815/head
Sebastian Wagner [Fri, 4 Jun 2021 09:24:48 +0000 (11:24 +0200)]
doc/dev/cephadm: cephadm bootstrap --shared_ceph_folder

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit 5f1aa05563fe3a2fc54ef02d39ad279f573da914)

4 years agomgr/cephadm: allow monitoring stack services to bind to network and port
Daniel Pivonka [Wed, 12 May 2021 17:46:11 +0000 (13:46 -0400)]
mgr/cephadm: allow monitoring stack services to bind to network and port

Signed-off-by: Daniel Pivonka <dpivonka@redhat.com>
(cherry picked from commit adecb2d2dad5732d610d53181e41d195819bdbb8)

4 years agodoc/cephadm: enriching "setting a limit"
Zac Dover [Wed, 2 Jun 2021 14:11:59 +0000 (00:11 +1000)]
doc/cephadm: enriching "setting a limit"

This PR improves the flow and syntax of the
sentences in the "Setting a Limit" section of the
"Service Management" chapter of the cephadm documentation.
(This section is about setting limits to the number of
daemons created, and about limiting the creation of daemons
to a specified number of hosts.)

Signed-off-by: Zac Dover <zac.dover@gmail.com>
(cherry picked from commit 8db4a8458f4fbaad2b556ec9c2313d370467e5d3)

4 years agocephadm: add `--allow-fqdn-hostname` test
Michael Fritch [Fri, 28 May 2021 17:12:12 +0000 (11:12 -0600)]
cephadm: add `--allow-fqdn-hostname` test

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

4 years agocephadm: add `--config` test
Michael Fritch [Thu, 27 May 2021 13:49:01 +0000 (07:49 -0600)]
cephadm: add `--config` test

follow-up test for:
https://github.com/ceph/ceph/pull/41351

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

4 years agocephadm: add `bootstrap --mon-ip` test
Michael Fritch [Thu, 27 May 2021 13:18:40 +0000 (07:18 -0600)]
cephadm: add `bootstrap --mon-ip` test

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

4 years agocephadm: add `bootstrap --skip-mon-network` test
Michael Fritch [Thu, 27 May 2021 13:17:37 +0000 (07:17 -0600)]
cephadm: add `bootstrap --skip-mon-network` test

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

4 years agocephadm: add basic `bootstrap` test
Michael Fritch [Thu, 27 May 2021 13:17:27 +0000 (07:17 -0600)]
cephadm: add basic `bootstrap` test

bootstrap requires --mon-ip or --mon-addrv

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

4 years agocephadm: move podman/docker test mock
Michael Fritch [Wed, 26 May 2021 13:05:24 +0000 (07:05 -0600)]
cephadm: move podman/docker test mock

to use as a default value in the fixtures

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

Conflicts:
src/cephadm/tests/test_cephadm.py

4 years agocephadm: add cephadm ContextManager
Michael Fritch [Mon, 24 May 2021 13:53:04 +0000 (07:53 -0600)]
cephadm: add cephadm ContextManager

to mock the CephadmContext during unit tests

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

4 years agocephadm: add pyfakefs fixture
Michael Fritch [Mon, 24 May 2021 14:03:55 +0000 (08:03 -0600)]
cephadm: add pyfakefs fixture

to mock the cephadm filesystem

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