]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
5 years agoPendingReleaseNotes: add note about batch refactor
Jan Fajerski [Wed, 7 Oct 2020 07:45:42 +0000 (09:45 +0200)]
PendingReleaseNotes: add note about batch refactor

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 485f0d797e4b21ffb7ac742f0949e8c0a23d43f2)

 Conflicts:
PendingReleaseNotes
        Sort ceph-volume entry under 15.2.6 heading

5 years agopybind/mgr/orchestrator: fix preview for new c-v batch output
Jan Fajerski [Wed, 30 Sep 2020 14:16:05 +0000 (16:16 +0200)]
pybind/mgr/orchestrator: fix preview for new c-v batch output

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 996df56a4aebe29e32fd529ae926ae484d240943)

 Conflicts:
src/pybind/mgr/orchestrator/tests/test_orchestrator.py
        drop test_handle_command(), not added by us

5 years agoceph-volume batch: return valid empty json reports
Jan Fajerski [Sat, 3 Oct 2020 07:40:33 +0000 (09:40 +0200)]
ceph-volume batch: return valid empty json reports

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

5 years agopython-common: do not skip unavailable devices
Joshua Schmid [Fri, 2 Oct 2020 09:37:58 +0000 (11:37 +0200)]
python-common: do not skip unavailable devices

Fixes: https://tracker.ceph.com/issues/47726
We should assemble the device set based on the drivegroups in
mgr/cephadm (regardless of their availability) and pass it to c-v.

This patch is the missing piece to actually do this.

related changes: https://github.com/ceph/ceph/pull/34740/commits/7d168ad7bdbb6d6d5231a4ae540ab03040b49a38

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

5 years agoceph-volume: pass filter_for_batch as keyword argument
Jan Fajerski [Mon, 5 Oct 2020 10:56:26 +0000 (12:56 +0200)]
ceph-volume: pass filter_for_batch as keyword argument

This PR also removes an unused ctor argument in the Devices class.

Fixes: 7d168ad7bdbb6d6d5231a4ae540ab03040b49a38
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit c5a711e5b6499915b7c2a7b7869f890fa7dc7e2d)

5 years agoceph-volume batch: fix very_fast_allocation plan and add tests
Jan Fajerski [Fri, 25 Sep 2020 09:35:19 +0000 (11:35 +0200)]
ceph-volume batch: fix very_fast_allocation plan and add tests

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 8178d5c48ac1a7f3915f0003abab6d625385bd78)

5 years agoceph-volume: batch: call the right prepare method
Jan Fajerski [Wed, 16 Sep 2020 13:43:00 +0000 (15:43 +0200)]
ceph-volume: batch: call the right prepare method

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit e75ef77f23ae07463510ec213ac4007f29cbe2da)

5 years agopython-common drive-groups: allow strings for wal and db size
Jan Fajerski [Mon, 14 Sep 2020 09:32:38 +0000 (11:32 +0200)]
python-common drive-groups: allow strings for wal and db size

This enables user to pass sizes like "10G", which batch now understands.

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 28e33f3025d03008b46b56989e5d939682b5720d)

5 years agoceph-volume inventory: add option to filter unwanted devices
Jan Fajerski [Fri, 11 Sep 2020 14:35:00 +0000 (16:35 +0200)]
ceph-volume inventory: add option to filter unwanted devices

Some device we never want to pass to the batch subcommand. For now this
includes devices that have a partition or are mounted on the machine.
One goal is to filter the root device, so it is not included on a batch
command and thus would contribute to its implicit sizing calculation.

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 7d168ad7bdbb6d6d5231a4ae540ab03040b49a38)

5 years agoceph-volume: address review comments
Jan Fajerski [Fri, 11 Sep 2020 08:36:43 +0000 (10:36 +0200)]
ceph-volume: address review comments

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 6f1592a1146529d352184c795aae8ce12f66e554)

5 years agoceph-volume: batch: fix size retrieval for lvs
Jan Fajerski [Thu, 10 Sep 2020 14:45:34 +0000 (16:45 +0200)]
ceph-volume: batch: fix size retrieval for lvs

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 24e4aa1296608ef861d4ea4b6a1892246a53ef76)

5 years agoceph-volume: include encryption in batch report
Jan Fajerski [Wed, 9 Sep 2020 11:04:14 +0000 (13:04 +0200)]
ceph-volume: include encryption in batch report

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

5 years agoceph-volume lvm batch: use namedtuple instead of tuple
Jan Fajerski [Wed, 9 Sep 2020 07:41:15 +0000 (09:41 +0200)]
ceph-volume lvm batch: use namedtuple instead of tuple

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 98c991fc6fd17b18d5bfbebe4b8febe5ff8fa2f0)

5 years agoceph-volume: address review comments, mostly tidying, clarification
Jan Fajerski [Tue, 8 Sep 2020 14:53:53 +0000 (16:53 +0200)]
ceph-volume: address review comments, mostly tidying, clarification

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit d0735ce1c90c952a6d2e1b805c1326d13ff7b06c)

5 years agoidempotency must result in the same outcome
Jan Fajerski [Tue, 8 Sep 2020 12:11:15 +0000 (14:11 +0200)]
idempotency must result in the same outcome

...not should

Co-authored-by: Joshua Schmid <jschmid@suse.de>
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit fcacd0b96ab195e939f6f879b0a0362a06385f9a)

5 years agoceph-volume: batch test should pass --journal-devices with filestore
Jan Fajerski [Mon, 7 Sep 2020 12:54:40 +0000 (14:54 +0200)]
ceph-volume: batch test should pass --journal-devices with filestore

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 55ba8630176041dce898e8b979b5849f13e01ca5)

5 years agoceph-volume: make --journal optional, add --journal-slots
Jan Fajerski [Mon, 7 Sep 2020 12:54:01 +0000 (14:54 +0200)]
ceph-volume: make --journal optional, add --journal-slots

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 7f766846328aac82d75175ed2c1c0bf3438a99e0)

5 years agodoc: update ceph-volume lvm batch docs
Jan Fajerski [Mon, 29 Jun 2020 15:42:26 +0000 (17:42 +0200)]
doc: update ceph-volume lvm batch docs

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 7695d1ec539f54b7b7cea8d19925f0c320223f03)

5 years agopy-common/deployment: drop workarounds for old batch
Jan Fajerski [Fri, 26 Jun 2020 13:29:59 +0000 (15:29 +0200)]
py-common/deployment: drop workarounds for old batch

This commit drops two workarounds in drive groups for the old batch
behaviour. OSDs on LVs no longer need to be created individually by
create (related to functional testing) and ceph-volume batch now filters
unavailable drives itself.

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 0f6f2b46a347c41a15f7ab2d532efb299f226698)

5 years agoceph-volume batch: add deprecation warning for auto behaviour
Jan Fajerski [Fri, 26 Jun 2020 11:34:01 +0000 (13:34 +0200)]
ceph-volume batch: add deprecation warning for auto behaviour

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 1239f77c8871a45e21bd1e3e81be8bb8854f24da)

5 years agoceph-volume batch: add ceph.conf mocking to pass tests
Jan Fajerski [Tue, 23 Jun 2020 14:58:46 +0000 (16:58 +0200)]
ceph-volume batch: add ceph.conf mocking to pass tests

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit eef9dc7a1da6d5dde0d1b02b71301c1d7b7926a9)

5 years agoceph-volume batch: use disk.Size for size args
Jan Fajerski [Fri, 19 Jun 2020 10:58:17 +0000 (12:58 +0200)]
ceph-volume batch: use disk.Size for size args

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 0bc7f7424cdd0a2c5f2cd777467814dbb3959fb4)

5 years agoceph-volume batch: Fix osd_ids passing and improve plan formatting
Jan Fajerski [Fri, 19 Jun 2020 09:22:28 +0000 (11:22 +0200)]
ceph-volume batch: Fix osd_ids passing and improve plan formatting

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 2124aa57b355fb29dcfe13c643bc78b4011f15a6)

5 years agoceph-volume batch: track rel_size in percent, more tests
Jan Fajerski [Tue, 9 Jun 2020 14:40:46 +0000 (16:40 +0200)]
ceph-volume batch: track rel_size in percent, more tests

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 2327e92abae74518d463a55ef4d42dbb816c9200)

5 years agoceph-volume batch: improve backwards compatibility
Jan Fajerski [Wed, 29 Apr 2020 05:47:18 +0000 (07:47 +0200)]
ceph-volume batch: improve backwards compatibility

This restores legacy batch behavior and also adds some initial test and
adjusts existing tests to changes.

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit a23a02df02ec4a8f65df0864f3224fb311d25b11)

5 years agoceph-volume: batch - enable legacy auto behaviour
Jan Fajerski [Mon, 27 Apr 2020 10:26:20 +0000 (12:26 +0200)]
ceph-volume: batch - enable legacy auto behaviour

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit d32e0e4320b54302ab989f0a93b57a0404e2094b)

5 years agoceph-volume: batch - major refactor
Jan Fajerski [Mon, 27 Apr 2020 09:47:04 +0000 (11:47 +0200)]
ceph-volume: batch - major refactor

This completely refactors the batch code in order to make use of the
create/prepare code path for creating OSDs instead of having a second
code path doing this. This not only eases the maintenance burden but
also adds various features and fixes bugs. This subcommand can now
handle LVs, replace OSDs, reuse VGs and has a better notion of
idempotency.

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit b0b797363fd66baa40eb54cf35dd6cfd11150be9)

5 years agoceph-volume: Device - available_lvm if 10 extents are free.
Jan Fajerski [Mon, 27 Apr 2020 09:35:51 +0000 (11:35 +0200)]
ceph-volume: Device - available_lvm if 10 extents are free.

This changes the available_lvm notion to only require 10 free extents
instead of 5GB.

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 6cb0841658ae45f23c2457a8f6a489457012d93e)

5 years agoceph-volume: Device - add vg_free property
Jan Fajerski [Mon, 27 Apr 2020 09:34:19 +0000 (11:34 +0200)]
ceph-volume: Device - add vg_free property

This new property returns the free space in any VGs present. If no VGs
are on the device we project how much space a VG will have.

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit b34f130f30daeca034b6b2365cc5a832ba8faa56)

5 years agoceph-volume: prepare/create - size args as Size class
Jan Fajerski [Mon, 27 Apr 2020 09:27:08 +0000 (11:27 +0200)]
ceph-volume: prepare/create - size args as Size class

This add the disk.Size class as all size related argument types. We
often create this class form args like this anyway and it enables users
to pass not only bytes but also strings like 50G.

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 2ff37321640a614fd965d7df6e20d8f9d1430fa3)

5 years agoceph-volume: disk.Size - add cast to bool
Jan Fajerski [Mon, 27 Apr 2020 09:45:26 +0000 (11:45 +0200)]
ceph-volume: disk.Size - add cast to bool

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit e7cdeab9dee2684c06b3543a482dd44a1db83c16)

5 years agoceph-volume: api/lvm - add VolumeGroup.free_percent property
Jan Fajerski [Mon, 27 Apr 2020 09:21:37 +0000 (11:21 +0200)]
ceph-volume: api/lvm - add VolumeGroup.free_percent property

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit bad54e97817dfef0e7dfcb834753cbb728c3de46)

5 years agoceph-volume: util.device - add vg_free_percent property
Jan Fajerski [Mon, 27 Apr 2020 09:44:56 +0000 (11:44 +0200)]
ceph-volume: util.device -  add vg_free_percent property

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit f48d225454e3ec347952d85262aa03b71bfb9111)

5 years agoceph-volume: api/lvm - query LV units in bytes
Jan Fajerski [Mon, 27 Apr 2020 09:44:20 +0000 (11:44 +0200)]
ceph-volume: api/lvm - query LV units in bytes

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit de7d67603a135825d8b4e37a06dd4b6a12dbcf1c)

5 years agoceph-volume: lvm/common - refactor common arg specification
Jan Fajerski [Tue, 14 Apr 2020 13:34:30 +0000 (15:34 +0200)]
ceph-volume: lvm/common - refactor common arg specification

This makes it easier to create valid Namespace objects/arg lists when
programmatically calling create/prepare.

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit fa62a7bf5f926db17dd2d7685878c175fc23500e)

5 years agoceph-volume: batch: fix argument help message
Jan Fajerski [Wed, 26 Feb 2020 14:36:53 +0000 (15:36 +0100)]
ceph-volume: batch: fix argument help message

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 51ca694bbe1552fd52b0385c43aad7e28fc5626f)

5 years agoMerge pull request #37337 from smithfarm/wip-47319-octopus
Yuri Weinstein [Tue, 6 Oct 2020 18:44:26 +0000 (11:44 -0700)]
Merge pull request #37337 from smithfarm/wip-47319-octopus

octopus: rgw: RGWObjVersionTracker tracks version over increments

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #37332 from callithea/wip-47569-octopus
Lenz Grimmer [Tue, 6 Oct 2020 13:31:44 +0000 (15:31 +0200)]
Merge pull request #37332 from callithea/wip-47569-octopus

octopus: mgr/dashboard: table detail rows overflow

Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
5 years agoMerge pull request #37308 from rhcs-dashboard/wip-47349-octopus
Lenz Grimmer [Tue, 6 Oct 2020 09:09:05 +0000 (11:09 +0200)]
Merge pull request #37308 from rhcs-dashboard/wip-47349-octopus

octopus: mgr/dashboard: REST API returns 500 when no Content-Type is specified

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoMerge pull request #37493 from votdev/wip-47695-octopus
Lenz Grimmer [Tue, 6 Oct 2020 09:00:52 +0000 (11:00 +0200)]
Merge pull request #37493 from votdev/wip-47695-octopus

octopus: mgr/dashboard: Copy to clipboard does not work in Firefox

5 years agoMerge pull request #36862 from tspmelo/wip-46091-octopus
Lenz Grimmer [Tue, 6 Oct 2020 08:18:41 +0000 (10:18 +0200)]
Merge pull request #36862 from tspmelo/wip-46091-octopus

octopus: mgr/dashboard: Auto close table column dropdown on click outside

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
5 years agoMerge pull request #37549 from smithfarm/wip-preextended-release-note-octopus
Nathan Cutler [Tue, 6 Oct 2020 08:01:28 +0000 (10:01 +0200)]
Merge pull request #37549 from smithfarm/wip-preextended-release-note-octopus

octopus: doc/PendingReleaseNotes: mention bluefs_preextend_wal_files

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #37034 from smithfarm/wip-46520-octopus
Yuri Weinstein [Mon, 5 Oct 2020 23:32:48 +0000 (16:32 -0700)]
Merge pull request #37034 from smithfarm/wip-46520-octopus

octopus: mds: do not submit omap_rm_keys if the dir is the basedir of merge

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge pull request #37020 from Vicente-Cheng/wip-46522-octopus
Yuri Weinstein [Mon, 5 Oct 2020 23:32:10 +0000 (16:32 -0700)]
Merge pull request #37020 from Vicente-Cheng/wip-46522-octopus

octopus: mds: fix hang issue when accessing a file under a lost parent directory

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge pull request #37017 from Vicente-Cheng/wip-46516-octopus
Yuri Weinstein [Mon, 5 Oct 2020 23:31:33 +0000 (16:31 -0700)]
Merge pull request #37017 from Vicente-Cheng/wip-46516-octopus

octopus: cephfs: client: fix directory inode can not call release callback

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
5 years agoMerge pull request #36813 from smithfarm/wip-47080-octopus
Yuri Weinstein [Mon, 5 Oct 2020 23:30:50 +0000 (16:30 -0700)]
Merge pull request #36813 from smithfarm/wip-47080-octopus

octopus: messages,mds: Fix decoding of enum types on big-endian systems

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge pull request #36713 from kotreshhr/wip-46947-octopus
Yuri Weinstein [Mon, 5 Oct 2020 23:30:17 +0000 (16:30 -0700)]
Merge pull request #36713 from kotreshhr/wip-46947-octopus

octopus: qa: Fix traceback during fs cleanup between tests

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agodoc/PendingReleaseNotes: mention bluefs_preextend_wal_files 37549/head
Nathan Cutler [Mon, 5 Oct 2020 15:16:52 +0000 (17:16 +0200)]
doc/PendingReleaseNotes: mention bluefs_preextend_wal_files

Signed-off-by: Nathan Cutler <ncutler@suse.com>
5 years agoMerge pull request #37452 from callithea/wip-47606-octopus
Lenz Grimmer [Mon, 5 Oct 2020 07:54:27 +0000 (09:54 +0200)]
Merge pull request #37452 from callithea/wip-47606-octopus

octopus: mgr/dashboard: log in non-admin users successfully if the telemetry notification is shown

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
5 years agoMerge pull request #37217 from callithea/wip-47462-octopus
Yuri Weinstein [Sat, 3 Oct 2020 16:06:18 +0000 (09:06 -0700)]
Merge pull request #37217 from callithea/wip-47462-octopus

octopus: mgr: PyModuleRegistry::unregister_client() can run endlessly

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
5 years agoMerge pull request #37022 from Vicente-Cheng/wip-46524-octopus
Yuri Weinstein [Sat, 3 Oct 2020 16:05:33 +0000 (09:05 -0700)]
Merge pull request #37022 from Vicente-Cheng/wip-46524-octopus

octopus: mds: add request to batch_op before taking auth pins and locks

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge pull request #36970 from Vicente-Cheng/wip-46473-octopus
Yuri Weinstein [Sat, 3 Oct 2020 15:58:39 +0000 (08:58 -0700)]
Merge pull request #36970 from Vicente-Cheng/wip-46473-octopus

octopus: mds: make threshold for MDS_TRIM configurable

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
5 years agoMerge pull request #37401 from smithfarm/wip-47644-octopus
Yuri Weinstein [Fri, 2 Oct 2020 18:29:14 +0000 (11:29 -0700)]
Merge pull request #37401 from smithfarm/wip-47644-octopus

octopus: rpm,deb: drop /etc/sudoers.d/cephadm

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #37349 from smithfarm/wip-47346-octopus
Yuri Weinstein [Fri, 2 Oct 2020 18:26:47 +0000 (11:26 -0700)]
Merge pull request #37349 from smithfarm/wip-47346-octopus

octopus: qa/*/mon/mon-last-epoch-clean.sh: mark osd out instead of down

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #37348 from smithfarm/wip-47251-octopus
Yuri Weinstein [Fri, 2 Oct 2020 18:25:31 +0000 (11:25 -0700)]
Merge pull request #37348 from smithfarm/wip-47251-octopus

octopus: tools/osdmaptool.cc: add ability to clean_temps

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #37341 from smithfarm/wip-47466-octopus
Yuri Weinstein [Fri, 2 Oct 2020 18:25:03 +0000 (11:25 -0700)]
Merge pull request #37341 from smithfarm/wip-47466-octopus

octopus: common/admin_socket: always validate the parameters

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #37302 from bk201/wip-47192-octopus
Yuri Weinstein [Fri, 2 Oct 2020 18:23:40 +0000 (11:23 -0700)]
Merge pull request #37302 from bk201/wip-47192-octopus

octopus: mgr/telemetry: fix device id splitting when anonymizing serial

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Yaarit Hatuka <yaarithatuka@gmail.com>
5 years agoMerge pull request #37264 from ifed01/wip-ifed-finer-mempool-granularity-octopus
Yuri Weinstein [Fri, 2 Oct 2020 18:21:57 +0000 (11:21 -0700)]
Merge pull request #37264 from ifed01/wip-ifed-finer-mempool-granularity-octopus

octopus: bluestore: mempool's finer granularity + adding missed structs

Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
5 years agoMerge pull request #37257 from smithfarm/wip-47545-octopus
Yuri Weinstein [Fri, 2 Oct 2020 18:20:58 +0000 (11:20 -0700)]
Merge pull request #37257 from smithfarm/wip-47545-octopus

octopus: ceph.spec, debian: add smartmontools, nvme-cli dependencies

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #37253 from bstillwell/wip-47424-octopus
Yuri Weinstein [Fri, 2 Oct 2020 18:20:16 +0000 (11:20 -0700)]
Merge pull request #37253 from bstillwell/wip-47424-octopus

octopus: compressor: Add a config option to specify Zstd compression level

Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #37412 from jan--f/wip-47649-octopus
Jan Fajerski [Fri, 2 Oct 2020 07:18:58 +0000 (09:18 +0200)]
Merge pull request #37412 from jan--f/wip-47649-octopus

octopus: [ceph-volume]: remove unneeded call to get_devices()

5 years agoMerge pull request #37344 from jan--f/wip-47284-octopus
Jan Fajerski [Fri, 2 Oct 2020 07:18:20 +0000 (09:18 +0200)]
Merge pull request #37344 from jan--f/wip-47284-octopus

octopus: ceph-volume: fix journal size argument not work

5 years agoMerge pull request #36921 from tspmelo/wip-npm-octopus
Lenz Grimmer [Wed, 30 Sep 2020 15:09:13 +0000 (17:09 +0200)]
Merge pull request #36921 from tspmelo/wip-npm-octopus

octopus: mgr/dashboard: Fix npm package's vulnerabilities

Reviewed-by: Stephan Müller <smueller@suse.com>
5 years agoMerge pull request #37390 from tspmelo/wip-46999-octopus
Lenz Grimmer [Wed, 30 Sep 2020 12:00:33 +0000 (14:00 +0200)]
Merge pull request #37390 from tspmelo/wip-46999-octopus

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agomgr/dashboard: Copy to clipboard does not work in Firefox 37493/head
Volker Theile [Tue, 22 Sep 2020 12:09:52 +0000 (14:09 +0200)]
mgr/dashboard: Copy to clipboard does not work in Firefox

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

Conflicts:
  src/pybind/mgr/dashboard/frontend/src/app/shared/directives/copy2clipboard-button.directive.spec.ts

5 years agoMerge pull request #37277 from tspmelo/wip-47559-octopus
Lenz Grimmer [Wed, 30 Sep 2020 09:50:58 +0000 (11:50 +0200)]
Merge pull request #37277 from tspmelo/wip-47559-octopus

octopus: mgr/dashboard: Allow editing iSCSI targets with initiators logged-in

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Ricardo Marques <rimarques@suse.com>
5 years agomgr/dashboard: check config opt permissions 37452/head
Tatjana Dehler [Mon, 7 Sep 2020 14:56:10 +0000 (16:56 +0200)]
mgr/dashboard: check config opt permissions

Getting the user object fails for a non-admin user. Check
the permissions directory if the user is allowed to access the
config options instead.

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

 Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/shared/components/telemetry-notification/telemetry-notification.component.spec.ts
src/pybind/mgr/dashboard/frontend/src/app/shared/components/telemetry-notification/telemetry-notification.component.ts
- Resolved import conflicts in both files; Resolved TestBed conflict (we have to stick with TestBed.get(); in octopus vs. master
  TestBed.inject(); which is related to Angular 9 being used in master and is not backported to octopus

5 years agoMerge pull request #37270 from badone/wip-octopus-enable-mgr-client-debug
Yuri Weinstein [Tue, 29 Sep 2020 21:52:15 +0000 (14:52 -0700)]
Merge pull request #37270 from badone/wip-octopus-enable-mgr-client-debug

octopus: qa: Enable debug_client for mgr tests

Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
5 years agoMerge pull request #37422 from tchaikov/octopus-37388
Yuri Weinstein [Tue, 29 Sep 2020 21:51:13 +0000 (14:51 -0700)]
Merge pull request #37422 from tchaikov/octopus-37388

octopus: debian: Add missing Python dependency for ceph-mgr

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
5 years agoMerge pull request #37373 from smithfarm/wip-46350-octopus
Yuri Weinstein [Tue, 29 Sep 2020 21:50:31 +0000 (14:50 -0700)]
Merge pull request #37373 from smithfarm/wip-46350-octopus

octopus: bluestore: remove preextended WAL support.

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #37347 from smithfarm/wip-47091-octopus
Yuri Weinstein [Tue, 29 Sep 2020 21:49:45 +0000 (14:49 -0700)]
Merge pull request #37347 from smithfarm/wip-47091-octopus

octopus: mon: mark pgtemp messages as no_reply more consistenly in preprocess_…

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #37032 from smithfarm/wip-47351-octopus
Yuri Weinstein [Tue, 29 Sep 2020 21:48:40 +0000 (14:48 -0700)]
Merge pull request #37032 from smithfarm/wip-47351-octopus

octopus: core: include/encoding: Fix encode/decode of float types on big-endian systems

Reviewed-by: Neha Ojha <nojha@redhat.com>
5 years agoMerge pull request #36945 from vumrao/wip-vumrao-47258
Yuri Weinstein [Tue, 29 Sep 2020 21:46:54 +0000 (14:46 -0700)]
Merge pull request #36945 from vumrao/wip-vumrao-47258

octopus: mon/PGMap: add pg count for pools in the ceph df command

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
5 years agoMerge pull request #36047 from smithfarm/wip-46479-octopus
Yuri Weinstein [Tue, 29 Sep 2020 21:45:49 +0000 (14:45 -0700)]
Merge pull request #36047 from smithfarm/wip-46479-octopus

octopus: mds: send scrub status to ceph-mgr only when scrub is running

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
5 years agoMerge pull request #37346 from smithfarm/wip-47460-octopus
Yuri Weinstein [Tue, 29 Sep 2020 16:15:44 +0000 (09:15 -0700)]
Merge pull request #37346 from smithfarm/wip-47460-octopus

octopus: qa/workunits/mon: fixed excessively large pool PG count

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #37343 from smithfarm/wip-47416-octopus
Yuri Weinstein [Tue, 29 Sep 2020 16:14:52 +0000 (09:14 -0700)]
Merge pull request #37343 from smithfarm/wip-47416-octopus

octopus: rbd: include RADOS namespace in krbd symlinks

5 years agoMerge pull request #37342 from smithfarm/wip-47082-octopus
Yuri Weinstein [Tue, 29 Sep 2020 16:14:31 +0000 (09:14 -0700)]
Merge pull request #37342 from smithfarm/wip-47082-octopus

octopus: rbd-mirror: peer setup can still race and fail creation of peer

5 years agoMerge pull request #37340 from smithfarm/wip-47412-octopus
Yuri Weinstein [Tue, 29 Sep 2020 16:13:48 +0000 (09:13 -0700)]
Merge pull request #37340 from smithfarm/wip-47412-octopus

octopus: rgw: urlencode bucket name when forwarding request

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
5 years agoMerge pull request #37339 from smithfarm/wip-47348-octopus
Yuri Weinstein [Tue, 29 Sep 2020 16:12:57 +0000 (09:12 -0700)]
Merge pull request #37339 from smithfarm/wip-47348-octopus

octopus: rgw: Swift API anonymous access should 401

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
5 years agoMerge pull request #37338 from smithfarm/wip-47321-octopus
Yuri Weinstein [Tue, 29 Sep 2020 16:12:13 +0000 (09:12 -0700)]
Merge pull request #37338 from smithfarm/wip-47321-octopus

octopus: rgw: replace '+' with "%20" in canonical query string for s3 v4 auth.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #37336 from smithfarm/wip-47314-octopus
Yuri Weinstein [Tue, 29 Sep 2020 16:11:40 +0000 (09:11 -0700)]
Merge pull request #37336 from smithfarm/wip-47314-octopus

octopus: rgw: radosgw-admin: period pull command is not always a raw_storage_op

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #37335 from smithfarm/wip-47245-octopus
Yuri Weinstein [Tue, 29 Sep 2020 16:10:57 +0000 (09:10 -0700)]
Merge pull request #37335 from smithfarm/wip-47245-octopus

octopus: rgw: Add bucket name to bucket stats error logging

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agoMerge pull request #37208 from smithfarm/wip-46982-octopus
Yuri Weinstein [Tue, 29 Sep 2020 16:10:16 +0000 (09:10 -0700)]
Merge pull request #37208 from smithfarm/wip-46982-octopus

octopus: test/rbd-mirror: pool watcher registration error might result in race

5 years agoMerge pull request #37180 from callithea/wip-47410-octopus
Yuri Weinstein [Tue, 29 Sep 2020 16:09:43 +0000 (09:09 -0700)]
Merge pull request #37180 from callithea/wip-47410-octopus

octopus: mgr: don't update pending service map epoch on receiving map from mon

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoMerge pull request #37116 from dillaman/wip-47371-octopus
Yuri Weinstein [Tue, 29 Sep 2020 16:05:15 +0000 (09:05 -0700)]
Merge pull request #37116 from dillaman/wip-47371-octopus

octopus: librbd: ensure that thread pool lock is held when processing throttled IOs

5 years agoMerge pull request #36860 from dillaman/wip-46791-octopus
Yuri Weinstein [Tue, 29 Sep 2020 16:03:35 +0000 (09:03 -0700)]
Merge pull request #36860 from dillaman/wip-46791-octopus

octopus: librbd: handle DNE from immutable-object-cache

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
5 years agoMerge pull request #36691 from smithfarm/wip-46998-octopus
Yuri Weinstein [Tue, 29 Sep 2020 16:02:58 +0000 (09:02 -0700)]
Merge pull request #36691 from smithfarm/wip-46998-octopus

octopus: rgw: s3: mark bucket encryption as not implemented

Reviewed-by: Casey Bodley <cbodley@redhat.com>
5 years agorgw: ObjectCache::put() clears stale objv 37337/head
Casey Bodley [Tue, 8 Sep 2020 19:27:55 +0000 (15:27 -0400)]
rgw: ObjectCache::put() clears stale objv

if an existing object is cached with an object version, but it's
mutated without updating that version number, clear the OBJV flag so
that later cache reads asking for an object version result in a miss and
re-read the version from the osd

Fixes: https://tracker.ceph.com/issues/47306
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit cf531cdd5e655a033f47e04b7dda81435a90271d)

5 years agoMerge pull request #37405 from rhcs-dashboard/wip-47619-octopus
Lenz Grimmer [Tue, 29 Sep 2020 11:53:39 +0000 (13:53 +0200)]
Merge pull request #37405 from rhcs-dashboard/wip-47619-octopus

octopus: mgr/dashboard: fix perf. issue when listing large amounts of buckets

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
5 years agoMerge pull request #37299 from p-se/wip-47547-octopus
Laura Paduano [Mon, 28 Sep 2020 13:26:56 +0000 (15:26 +0200)]
Merge pull request #37299 from p-se/wip-47547-octopus

octopus: mgr/dashboard: Fix many-to-many issue in host-details Grafana dashboard

Reviewed-by: Ernesto Puertat <epuertat@redhat.com>
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoos/bluestore: bind attrs to bluestore_cache_meta mempool. 37264/head
Igor Fedotov [Sun, 20 Sep 2020 10:45:28 +0000 (13:45 +0300)]
os/bluestore: bind attrs to bluestore_cache_meta mempool.

This seems to be a better choice over bluestore_cache_data

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit f4e09fc103454fa8a41b5ffb822639368a89522d)

 Conflicts:
src/os/bluestore/bluestore_types.h
 Caused by the lack of explicit std:: reference in headers - master has
 got this as a part of crimson effort.

5 years agoos/bluestore: add missing structs to bluestore_cache_other mempool
Igor Fedotov [Sun, 20 Sep 2020 09:22:05 +0000 (12:22 +0300)]
os/bluestore: add missing structs to bluestore_cache_other mempool

Fixes: https://tracker.ceph.com/issues/47551
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit 4592c5df554190065fa9a994f7b6dc3fed7ea214)

5 years agoMerge pull request #36991 from s0nea/wip-46407-octopus
Laura Paduano [Mon, 28 Sep 2020 09:01:17 +0000 (11:01 +0200)]
Merge pull request #36991 from s0nea/wip-46407-octopus

octopus: mgr/dashboard: Fix bugs in a unit test and i18n translation

Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoMerge pull request #36875 from tspmelo/wip-46342-octopus
Laura Paduano [Mon, 28 Sep 2020 08:59:36 +0000 (10:59 +0200)]
Merge pull request #36875 from tspmelo/wip-46342-octopus

octopus: mgr/dashboard: Remove useless tab in monitoring/alerts datatable details

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
5 years agoMerge pull request #36705 from ShyamsundarR/wip-47014-octopus
Yuri Weinstein [Sun, 27 Sep 2020 22:59:43 +0000 (15:59 -0700)]
Merge pull request #36705 from ShyamsundarR/wip-47014-octopus

octopus: mon: store mon updates in ceph context for future MonMap instantiation

Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
5 years agoMerge pull request #36985 from k0ste/wip-47282-octopus
Yuri Weinstein [Sun, 27 Sep 2020 15:46:54 +0000 (08:46 -0700)]
Merge pull request #36985 from k0ste/wip-47282-octopus

octopus: prometheus: Properly split the port off IPv6 addresses

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
5 years agodebian: Add missing Python dependency for ceph-mgr 37422/head
Johannes M. Scheuermann [Thu, 24 Sep 2020 10:10:13 +0000 (12:10 +0200)]
debian: Add missing Python dependency for ceph-mgr

The file mgr/volumes/fs/operations/pin_util.py imports distutils.util for using
strtobool and thus the python package is required.

Signed-off-by: Johannes M. Scheuermann <joh.scheuer@gmail.com>
(cherry picked from commit 868e708c9e6538684f9b053d44497bba543ea5eb)

5 years agoMerge pull request #37408 from idryomov/wip-krbd-read-only-override-octopus
Ilya Dryomov [Fri, 25 Sep 2020 15:37:57 +0000 (17:37 +0200)]
Merge pull request #37408 from idryomov/wip-krbd-read-only-override-octopus

octopus: rbd: make common options override krbd-specific options

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
5 years agoceph-volume: remove unneeded call to get_devices() 37412/head
Marc Gariepy [Tue, 22 Sep 2020 13:01:33 +0000 (09:01 -0400)]
ceph-volume: remove unneeded call to get_devices()

there is no need to probe the device to generate the argparse help
message.

also removing the test on the function as it's not there anymore.

Signed-off-by: Marc Gariepy <gariepy.marc@gmail.com>
Fixes: https://tracker.ceph.com/issues/47502
(cherry picked from commit 5c6f66166a7afad87627032cafdc5c4f11f94eac)

5 years agorbd: make common options override krbd-specific options 37408/head
Ilya Dryomov [Fri, 25 Sep 2020 07:56:29 +0000 (09:56 +0200)]
rbd: make common options override krbd-specific options

ceph-csi has added support for passing custom map and unmap options via
mapOptions and unmapOptions storage class parameters.  However, it also
uses --read-only for implementing ROX (ReadOnlyMany) PVs.  If the user
supplies "mapOptions: rw", they will get around the intended read-only
restriction (at least on the block device).

ceph-csi could be patched to use "-o ro", but it actually makes sense
for common options to win over device type-specific equivalents.

Fixes: https://tracker.ceph.com/issues/47625
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit a107c47360ecdb8c09768ca9eab2341100245711)

Conflicts:
src/tools/rbd/action/Kernel.cc [ snapshot quiesce support and
  commit 34f539d8af33 ("rbd: delay parsing of default kernel map
  options") not in octopus ]