]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Varsha Rao [Tue, 24 Mar 2020 09:56:51 +0000 (15:26 +0530)]
vstart: Use random port instead of default Ganesha port
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
91334cb8eab1f6eb203f74267ead141747780696 )
Varsha Rao [Fri, 6 Mar 2020 20:33:51 +0000 (02:03 +0530)]
vstart: Use "NFS" instead "GANESHA" for starting nfs ganesha clusters
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
765cafdb6169836d1ba216b1cd7d4e118fc559e7 )
Varsha Rao [Fri, 6 Mar 2020 20:19:30 +0000 (01:49 +0530)]
mgr/volumes: Improve readability of ganesha common config
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
2b0f9646e237b3a5b748087c54adecaf2eb3104a )
Varsha Rao [Fri, 6 Mar 2020 19:56:57 +0000 (01:26 +0530)]
vstart: Add note about mounting cephfs exports
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
1be7e547e40a0808de481c2c889e3b759f58d4e5 )
Varsha Rao [Thu, 5 Mar 2020 09:56:03 +0000 (15:26 +0530)]
src/vstart: Set CEPH_CONF environment variables
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
751a994f6798bcf0b8e2de7a9dfed330c84702fa )
Varsha Rao [Tue, 3 Mar 2020 13:42:58 +0000 (19:12 +0530)]
mgr/volumes/fs: Update default ganesha conf options
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
05dade8f768629a3a02a4399374be255e8461349 )
Varsha Rao [Tue, 25 Feb 2020 14:21:06 +0000 (19:51 +0530)]
doc: Add document about fs nfs interface to create CephFS exports
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
48c8e8b546066085c9a32c7214c34efd15692a4d )
Varsha Rao [Tue, 25 Feb 2020 10:45:25 +0000 (16:15 +0530)]
vstart: Update fs nfs export create command
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
4ba9376ca53cd4ebfe85acd59abe479c9a48139d )
Varsha Rao [Tue, 25 Feb 2020 08:31:07 +0000 (14:01 +0530)]
mgr/volumes: Update nfs export create and delete command
Remove fill_keys function and add key to nfsconfig object.
Export create and delete methods that no longer require ganeshaconf object to
be passed.
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
2fb2a823f18ffeba4e13719f775278ecb483431c )
Varsha Rao [Tue, 25 Feb 2020 07:27:44 +0000 (12:57 +0530)]
mgr/volumes: Remove create_rados_pool method
Pool is created by cluster command.
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
ae49ab3c789550379138bbd58a3b306dbb046100 )
Varsha Rao [Mon, 24 Feb 2020 12:19:14 +0000 (17:49 +0530)]
mgr/volumes: Changes to nfs export delete and create
Fixes: https://tracker.ceph.com/issues/44193
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
30bba72281800b5be7f4a2d79ed00940dbe1c4f4 )
Varsha Rao [Fri, 21 Feb 2020 06:09:45 +0000 (11:39 +0530)]
mgr/volumes: While creating nfs-ganesha user update its cap
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
6363b887eeb50cb5dba8f7ef3c8d075fda5d1b27 )
Varsha Rao [Wed, 19 Feb 2020 13:26:52 +0000 (18:56 +0530)]
mgr/volumes: Update caps for new user created and add it's key to keyring
Fixes: https://tracker.ceph.com/issues/44193
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
0f2f7b0b1a903c0611dd86fb5e05cf901b1217f1 )
Varsha Rao [Wed, 12 Feb 2020 07:58:23 +0000 (13:28 +0530)]
vstart: Update vstart according to cluster create command
Fixes: https://tracker.ceph.com/issues/44193
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
e89cf6f58df138d5c8e2fdc06a26634fa6e6f65d )
Varsha Rao [Wed, 12 Feb 2020 07:48:27 +0000 (13:18 +0530)]
mgr/volumes: Add Ganesha common config
Fixes: https://tracker.ceph.com/issues/44193
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
c1412fa64e77f56ee10b5703bc0956bc93df4842 )
Varsha Rao [Thu, 30 Jan 2020 04:37:44 +0000 (10:07 +0530)]
mgr/volumes: Create NFSConfig class
Move the ganesha config functions into this class.
Fixes: https://tracker.ceph.com/issues/44193
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
a4debfdc906d0410b45cf291caeb7378fd375507 )
Varsha Rao [Mon, 27 Jan 2020 10:06:48 +0000 (15:36 +0530)]
mgr/volumes: Add command to create nfs-ganesha clusters
ceph fs nfs cluster create <cluster_id> [--size=1]
cluster_id: Name of the nfs cluster
This command creates a common recovery pool for all Ganesha daemons, creates
new user and nfs cluster. Orchestrator needs to be enabled.
Fixes: https://tracker.ceph.com/issues/44193
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
cc50d4c154d1f2acee238b95484d429180eeec7b )
Varsha Rao [Fri, 3 Jan 2020 13:21:28 +0000 (18:51 +0530)]
mgr: Create pool for nfs ganesha recovery
Fixes: https://tracker.ceph.com/issues/44193
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
8c945eda6ccd9828eb0e473fafe11d3555e5f9e0 )
Varsha Rao [Thu, 19 Dec 2019 12:03:39 +0000 (17:33 +0530)]
mgr: Add "ceph fs nfs delete <export_id>" to delete exports
Fixes: https://tracker.ceph.com/issues/44193
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
26d948735aaa360cc0494bbb3268b355d1ad61ad )
Varsha Rao [Fri, 22 Nov 2019 05:34:01 +0000 (11:04 +0530)]
mgr: Add command to create exports for nfs-ganesha
'ceph fs nfs create': This command creates export objects for nfs-ganesha.
vstart ganesha daemon fetches the export block from rados object.
Fixes: https://tracker.ceph.com/issues/44193
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
960688169f26b0cdbbcd90d3e7cefe9a176d17dc )
Yuri Weinstein [Tue, 7 Jul 2020 23:04:54 +0000 (16:04 -0700)]
Merge pull request #35711 from rhcs-dashboard/wip-46020-octopus
octopus: mgr/dashboard: work with v1 RBD images
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Lenz Grimmer [Tue, 7 Jul 2020 13:49:34 +0000 (15:49 +0200)]
Merge pull request #35620 from rhcs-dashboard/wip-46048-octopus
octopus: mgr/dashboard: cropped actions menu in nested details
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Laura Paduano [Tue, 7 Jul 2020 12:31:50 +0000 (14:31 +0200)]
Merge pull request #35705 from tspmelo/wip-45855-octopus
octopus: mgr/dashboard: Improve Summary's subscribe methods
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Lenz Grimmer [Tue, 7 Jul 2020 11:02:23 +0000 (13:02 +0200)]
Merge pull request #35883 from bk201/wip-46314-octopus
octopus: mgr/dashboard: fix wal/db slots controls in the OSD form
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Avan Thakkar [Thu, 28 May 2020 16:14:15 +0000 (21:44 +0530)]
mgr/dashboard: cropped actions menu in nested details
Fixes: https://tracker.ceph.com/issues/45508
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit
ec3c731d2dc28839984e94f6faddab761ea1a7a5 )
(cherry picked from commit
9d56135ff704043860f5dc52afd02819abdfc8af )
Lenz Grimmer [Mon, 6 Jul 2020 12:30:25 +0000 (14:30 +0200)]
Merge pull request #35885 from rhcs-dashboard/wip-46313-octopus
octopus: mgr/dashboard: Prometheus query error in the metrics of Pools, OSDs and RBD images
Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Patrick Donnelly [Thu, 2 Jul 2020 16:44:27 +0000 (09:44 -0700)]
Merge PR #35759 into octopus
* refs/pull/35759/head:
qa: fix flake8 warnings
doc: add documentation for new ephemeral pinning feature
pybind/mgr/volumes: wire up pinning subvolumes/subvolumegroups
qa: adapt tests for empty pinned dir export
qa: break export pin tests into discrete tests
qa: add more ephemeral pin tests
qa: add tests for ephemeral pinning
mds: add maximum random ephemeral pin percentage
mds: replicate random pin state
mds: finish implementation of ephemeral pins
mds: do string equality comparison
mds: add ephemeral pinning for subtrees
mds: trim pinned and empty subtrees
mds: refactor remove_subtree
mds: allow export of pinned directory if empty
mds: reduce subtree processing verbosity
mds: skip export of empty directories
mds: remove frozen export pin from queue
mds: simplify for loop construction
mds: add debug messages for export queue processing
qa: refactor _wait_subtree and _get_subtree
qa: use status from wait_for_daemons
qa: quietly print json output from asok commands
Reviewed-by: Sidharth Anupkrishnan <sanupkri@redhat.com>
Sebastian Wagner [Thu, 2 Jul 2020 09:26:52 +0000 (11:26 +0200)]
Merge pull request #35568 from sebastian-philipp/octopus-backport-34633-35099-35459-35521-35504-35474-35538
octopus: cephadm batch backport June (3)
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Avan Thakkar [Mon, 13 Apr 2020 09:50:00 +0000 (15:20 +0530)]
mgr/dashboard: Prometheus query error in the metrics of Pools, OSDs and RBD images
Fixes: https://tracker.ceph.com/issues/45068
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit
47b515c09496da8fc326300bab6618250466effe )
Kiefer Chang [Mon, 15 Jun 2020 07:16:57 +0000 (15:16 +0800)]
mgr/dashboard: fix wal/db slots controls in the OSD form
Controls should be updated immediately after changing.
Fixes: https://tracker.ceph.com/issues/44985
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit
2a7b392d873f224e71c50d2916dbd1a63e4360f9 )
Patrick Donnelly [Wed, 24 Jun 2020 17:26:16 +0000 (10:26 -0700)]
qa: fix flake8 warnings
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
683153c56e4db9ac5d17dbdcc6b741a27fb37062 )
Patrick Donnelly [Tue, 9 Jun 2020 22:30:28 +0000 (15:30 -0700)]
doc: add documentation for new ephemeral pinning feature
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
6cd10c591af61c37f7175c9cd6873568caa099f6 )
Patrick Donnelly [Wed, 10 Jun 2020 04:14:23 +0000 (21:14 -0700)]
pybind/mgr/volumes: wire up pinning subvolumes/subvolumegroups
Fixes: https://tracker.ceph.com/issues/41541
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
982041e89d6db6aa764e287a05f1c2937efa719a )
Patrick Donnelly [Fri, 19 Jun 2020 20:52:22 +0000 (13:52 -0700)]
qa: adapt tests for empty pinned dir export
Previously, empty pinned directories were not migrated.
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
69e3f556a73f20ce099d3cf41fd839761ef5198b )
Patrick Donnelly [Mon, 15 Jun 2020 16:40:55 +0000 (09:40 -0700)]
qa: break export pin tests into discrete tests
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
091e8ffd9dd174d47cf683f14abb2ec23581705e )
Patrick Donnelly [Tue, 9 Jun 2020 22:28:21 +0000 (15:28 -0700)]
qa: add more ephemeral pin tests
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
aef549e49e6fe69635307a0c1f66221e75d81f5d )
Sidharth Anupkrishnan [Wed, 19 Feb 2020 14:28:15 +0000 (19:58 +0530)]
qa: add tests for ephemeral pinning
Signed-off-by: Sidharth Anupkrishnan <sanupkri@redhat.com>
(cherry picked from commit
aa99c8546be2c33793803fa2c1d733ed39933573 )
Patrick Donnelly [Tue, 9 Jun 2020 23:49:20 +0000 (16:49 -0700)]
mds: add maximum random ephemeral pin percentage
This new config is designed to prevent creating too many subtrees from a
random ephemeral pinning policy.
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
c8d343d592de92af91c6f9eecb6aab0ebed54657 )
Patrick Donnelly [Tue, 9 Jun 2020 22:15:00 +0000 (15:15 -0700)]
mds: replicate random pin state
This is slightly evil in its current form. The MDS should use locks to
transmit state changes but right now it's just set when the CInode is
replicated. This replication of this state marker is necessary for
failover situations where we want the randomly pinned subtree to remain
pinned across failovers.
Note: this problem does not exist for the ephemeral distributed pins
because simple knowledge of the immediate parent's setting (which is
replicated normally) is sufficient to determine if the CInode is
ephemerally distributed. Ditto for regular export pins.
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
306003c51b1070a10c8e3818f67117d987640ba0 )
Conflicts:
src/mds/CInode.h
Patrick Donnelly [Sat, 7 Mar 2020 03:20:58 +0000 (19:20 -0800)]
mds: finish implementation of ephemeral pins
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
703e4b01fa83f81cda4fdc46b91f24a5e92f95f0 )
Patrick Donnelly [Sat, 7 Mar 2020 03:09:50 +0000 (19:09 -0800)]
mds: do string equality comparison
The string::find method would return true for ceph.dir.pin even for the
other ephemeral pin xattr names. For this reason, it was never possible
to actually turn ephemeral pins on!
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
21872bdb118c5eef4c2cfdadcc62737bb9471022 )
Sidharth Anupkrishnan [Tue, 14 Jan 2020 13:35:47 +0000 (19:05 +0530)]
mds: add ephemeral pinning for subtrees
This PR introduces inode xattrs export_ephemeral_random and
export_ephemeral_distributed which enables two different metadata
distribution strategies - the first being suitable for a more depthwise
scaling of metadata (height of the tree keeps increasing) and the latter
for horizontal scaling (many subtrees under a single parent).
export_ephemeral_distributed applies is not hierarchical. Any direct
descendant directory (i.e. a child directory) has an ephemeral export
pin applied to it according to a consistent hash of the child directory
inode number. export_ephemeral_distributed is hierarchical like
"export_pin". Any CDir loaded into the cache may be ephemerally pinned
to a random rank. Like "export_ephemeral_distributed", the random rank
is determined by a consistent hash.
The metadata distribution strategies are facilitated by using John
Lamping and Eric Veach's Jump Consistent Hashing as the consistent hash
algorithm. This hashing algorithm eliminates the need to store the data
structures representing the consistent hash cluster state and performs
as well as Akamai's original implementation providing a fairly uniform
distribution. This algorithm only works for distributed systems with
numbered buckets (nodes) arranged in ascending order and cluster resizes
does not produce any holes in the arrangement of nodes i.e (0, 1, 2, 3)
--[removing node 1]--> (0, 1, 2). CephFS satisfies these conditions as
the MDSs are arranged as numbered ranks and cluster modifications does
not produce any holes in the resulting arrangement of ranks.
Fixes: https://tracker.ceph.com/issues/41302
Signed-off-by: Sidharth Anupkrishnan <sanupkri@redhat.com>
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
ced15ed7ef70ff832d4bebedecb89944276b0395 )
Conflicts:
src/mds/MDSRank.cc
Patrick Donnelly [Fri, 5 Jun 2020 02:00:04 +0000 (19:00 -0700)]
mds: trim pinned and empty subtrees
Before export (and ephemeral) pinned subtrees are stuck in cache
forever.
Add qa test for checking export pinned directories can be trimmed.
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
5eea6761cc7e5950810cb0a625d49bd3f788183c )
Patrick Donnelly [Fri, 5 Jun 2020 01:58:10 +0000 (18:58 -0700)]
mds: refactor remove_subtree
Search each map only once as necessary.
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
747687f5dec8adc86abafb367275373bb44d96e9 )
Patrick Donnelly [Mon, 8 Jun 2020 23:50:44 +0000 (16:50 -0700)]
mds: allow export of pinned directory if empty
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
4749e5abb16a38b34ed63d11dbcd8bf3831b3f13 )
Patrick Donnelly [Wed, 10 Jun 2020 16:20:25 +0000 (09:20 -0700)]
mds: reduce subtree processing verbosity
and some mild loop refactoring.
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
c0271eea75eb83de2e38219f6dcc6597d41a5653 )
Patrick Donnelly [Sat, 7 Mar 2020 03:19:49 +0000 (19:19 -0800)]
mds: skip export of empty directories
Note: empty as in no cached sub-entries.
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
570e6cfbcfc98f877a0e21cf536dfc826a4f9d15 )
Patrick Donnelly [Sat, 7 Mar 2020 03:15:03 +0000 (19:15 -0800)]
mds: remove frozen export pin from queue
The export already belongs on the node id so there's no need to keep it
in the queue.
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
70ba356bbdd5c10979f9ff6a630de23d8304fb35 )
Patrick Donnelly [Sat, 7 Mar 2020 03:13:46 +0000 (19:13 -0800)]
mds: simplify for loop construction
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
d3158bf11ea1ea4934b12f48f6c373d912072c31 )
Patrick Donnelly [Tue, 9 Jun 2020 22:14:23 +0000 (15:14 -0700)]
mds: add debug messages for export queue processing
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
461fad8f807bdc01fbb19d79934573ee94d5712a )
Patrick Donnelly [Fri, 5 Jun 2020 02:40:00 +0000 (19:40 -0700)]
qa: refactor _wait_subtree and _get_subtree
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
c0506230653b0c190d4793feb77ca197b45d85ee )
Conflicts:
qa/tasks/cephfs/mount.py
Patrick Donnelly [Fri, 5 Jun 2020 02:49:09 +0000 (19:49 -0700)]
qa: use status from wait_for_daemons
Avoid an extra `fs dump` call.
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
ddb18091a64b29bb69aafa2941cda01e3f749cf5 )
Patrick Donnelly [Sun, 14 Jun 2020 03:26:35 +0000 (20:26 -0700)]
qa: quietly print json output from asok commands
Pretty print output once. Use --format=json so the stdout on teuthology
is not pretty printed, taking hundreds of lines.
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
f451c43aca58945ca5d4646bf057e009deb0a787 )
Josh Durgin [Wed, 1 Jul 2020 19:29:27 +0000 (12:29 -0700)]
Merge branch 'wip-46095-octopus' into octopus - from https://github.com/ceph/ceph/pull/35685
octopus: mon: Warn when too many reads are repaired on an OSD
Reviewed-by: Neha Ojha <nojha@redhat.com>
David Zafman [Tue, 16 Jun 2020 23:28:58 +0000 (16:28 -0700)]
test: flush_pg_stats() ignore OSDs that don't respond to getting sequence
This eliminates bogus errors in the logs and returned from flush_pg_stats()
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
41322eaa62be0de20fdedb44d5817a3f1916ab5e )
David Zafman [Wed, 10 Jun 2020 02:24:00 +0000 (19:24 -0700)]
mgr: Warn when too many reads are repaired on an OSD
Include test case
Configurable by setting mon_osd_warn_num_repaired (default 10)
Ignore new health warning with random eio injection test
Fixes: https://tracker.ceph.com/issues/41564
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
661996d4342c427209b1eae4b0247f8210a00fc3 )
Yuri Weinstein [Wed, 1 Jul 2020 19:22:32 +0000 (12:22 -0700)]
Merge pull request #35715 from dzafman/wip-46115
octopus: tools: Add statfs operation to ceph-objecstore-tool
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Yuri Weinstein [Wed, 1 Jul 2020 19:20:35 +0000 (12:20 -0700)]
Merge pull request #35550 from neha-ojha/wip-reduce-noise-octopus
octopus: qa/tasks/ceph_manager.py: dump more useful info before failing
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Yuri Weinstein [Wed, 1 Jul 2020 19:19:39 +0000 (12:19 -0700)]
Merge pull request #35136 from shyukri/wip-45209-octopus
octopus: monitoring: alert for pool fill up broken
Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Jan Fajerski [Wed, 1 Jul 2020 12:30:06 +0000 (14:30 +0200)]
Merge pull request #35830 from guits/wip-46251-octopus
octopus: ceph-volume: add dmcrypt support in raw mode
Nathan Cutler [Wed, 1 Jul 2020 10:42:02 +0000 (12:42 +0200)]
Merge pull request #35753 from smithfarm/wip-wipe-prn-octopus
octopus: doc: PendingReleaseNotes: clean slate for 15.2.5
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Patrick Donnelly [Tue, 30 Jun 2020 21:22:15 +0000 (14:22 -0700)]
Merge PR #35809 into octopus
* refs/pull/35809/head:
qa/tasks/vstart_runner.py: be python3 compatible
doc/dev/developer_guide: use python3 to launch vstart_runner.py
pybind/mgr/dashboard/run-backend-api-tests.sh: use python3 by default
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Jenkins Build Slave User [Tue, 30 Jun 2020 15:40:51 +0000 (15:40 +0000)]
15.2.4
Guillaume Abrioux [Thu, 25 Jun 2020 11:33:09 +0000 (13:33 +0200)]
ceph-volume: remove unused function
This function is never called in raw context, let's remove it.
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit
20e8286f5e1b79678b17659272daa1e28e763618 )
Guillaume Abrioux [Tue, 23 Jun 2020 12:54:50 +0000 (14:54 +0200)]
ceph-volume: add raw testing coverage
This commit adds testing against `ceph-volume raw` subcommand.
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit
7bb811c3b6ec25ca34734131115cee531439f0ff )
Guillaume Abrioux [Fri, 24 Apr 2020 14:45:02 +0000 (16:45 +0200)]
ceph-volume: add dmcrypt support in raw mode
This commit adds the dmcrypt support in `ceph-volume raw` mode.
Note about `ceph-volume raw list` change:
Given `lsblk -J` (json output) option isn't available on all OS, I came up with
adding '--inverse' option to the existing command which allows us to get the
mapper devices list in that command output. Not listing root devices containing
partitions shouldn't have side effect since we are in `ceph-volume raw`
context.
example:
running `lsblk --paths --nodeps --output=NAME --noheadings` doesn't allow to
get the mapper list because the output is like following :
$ lsblk --paths --nodeps --output=NAME --noheadings
/dev/sda
/dev/sdb
/dev/sdc
/dev/sdd
the dmcrypt mappers are hidden because of the `--nodeps` given they are
displayed as a dependency.
$ lsblk --paths --output=NAME --noheadings
/dev/sda
|-/dev/mapper/ceph-
3b52c90d -6548-407d-bde1-
efd31809702f -sda-block-dmcrypt
`-/dev/mapper/ceph-
3b52c90d -6548-407d-bde1-
efd31809702f -sda-db-dmcrypt
/dev/sdb
/dev/sdc
/dev/sdd
adding `--inverse` is a trick to get around this issue, the counterpart is that
we can't list root devices if they contain at least one partition but this
shouldn't be an issue in `ceph-volume raw` context given we only deal with
raw devices.
Fixes: https://tracker.ceph.com/issues/45959
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit
159c30d29f009c07e51a4bd7cd5ecea8cf6c8739 )
Kefu Chai [Mon, 20 Apr 2020 10:27:58 +0000 (18:27 +0800)]
qa/tasks/vstart_runner.py: be python3 compatible
differentiate `str` and `bytes` instances, and drop python2 support from
vstart_runner.py, as we've moved to python3 already
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
bedea85019076999a205c421bbf593ab8ab0641b )
Kefu Chai [Mon, 20 Apr 2020 10:26:27 +0000 (18:26 +0800)]
doc/dev/developer_guide: use python3 to launch vstart_runner.py
as vstart_runner.py is compatible with python3, and so is the tests
under `qa/` directory.
and use `pip` to install teuthology, simpler this way.
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
c6e48ef0f024b4a3f4b457367544d773197933d4 )
Kefu Chai [Mon, 20 Apr 2020 11:13:52 +0000 (19:13 +0800)]
pybind/mgr/dashboard/run-backend-api-tests.sh: use python3 by default
since vstart_runner.py is now py3, let's use python3 by default
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
d54f3ea43e05c2823c813e9687194b0b1fe15ffe )
Yuri Weinstein [Fri, 26 Jun 2020 20:22:29 +0000 (13:22 -0700)]
Merge pull request #35807 from cbodley/wip-qa-rgw-ceph-octopus
octopus: qa/rgw: run external tests against ceph-octopus branch
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Casey Bodley [Fri, 26 Jun 2020 20:03:34 +0000 (16:03 -0400)]
octopus: qa/rgw: run external tests against ceph-octopus branch
Signed-off-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Fri, 26 Jun 2020 15:44:51 +0000 (08:44 -0700)]
Merge pull request #35801 from yuriw/wip-yuriw-rgw-octopus
qa/test: fixed s3tests, changed to `force-branch: ceph-octopus`
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Fri, 26 Jun 2020 13:47:42 +0000 (06:47 -0700)]
qa/test: fixed s3tests, changed to `force-branch: ceph-octopus`
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
Yuri Weinstein [Thu, 25 Jun 2020 18:28:58 +0000 (11:28 -0700)]
Merge pull request #35780 from sebastian-philipp/octopus-qa-cephad-upgrade-no-rgw
octopus: qa/cephadm/upgrade: Exclude RGW for now
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Abhishek L [Thu, 25 Jun 2020 17:42:22 +0000 (19:42 +0200)]
Merge pull request #35774 from theanalyst/octopus-rgw-cors-fixes
octopus: rgw: sanitize newlines in s3 CORSConfiguration's ExposeHeader
Reviewed-By: Josh Durgin <jdurgin@redhat.com>
Reviewed-By: Abhishek Lekshmanan <abhishek@suse.com>
Sebastian Wagner [Thu, 25 Jun 2020 08:54:24 +0000 (10:54 +0200)]
qa/cephadm/upgrade: use quay.ceph.io
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
ab1d42c991037741064f35a9e881c7a45ef8b6c4 )
Sebastian Wagner [Thu, 25 Jun 2020 07:55:51 +0000 (09:55 +0200)]
qa/cephadm/upgrade: Exclude RGW for now
tasks/cephadm.py gained RGW support very recently and
I'm now facing a dilemman:
* Either we set the upgrade start to 15.2.4 and thus
no longer upgrade from an old version, or
* Disable RGW upgrade for now.
I think doing both would be optinal, but for now, let's
disable RGW, in order to keep the coverage for everything
else.
Fixes: https://tracker.ceph.com/issues/46157
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit
4c5b20f9168d2d7ea40f48702f1bc9fb999bbce3 )
Casey Bodley [Tue, 26 May 2020 19:03:03 +0000 (15:03 -0400)]
rgw: sanitize newlines in s3 CORSConfiguration's ExposeHeader
the values in the <ExposeHeader> element are sent back to clients in a
Access-Control-Expose-Headers response header. if the values are allowed
to have newlines in them, they can be used to inject arbitrary response
headers
this issue only affects s3, which gets these values from an xml document
in swift, they're given in the request header
X-Container-Meta-Access-Control-Expose-Headers, so the value itself
cannot contain newlines
Signed-off-by: Casey Bodley <cbodley@redhat.com>
Reported-by: Adam Mohammed <amohammed@linode.com>
Nathan Cutler [Wed, 24 Jun 2020 19:08:40 +0000 (21:08 +0200)]
doc: PendingReleaseNotes: clean slate for 15.2.5
All of these Pending Release Notes have been included in the official
15.2.4 Release Notes, so keeping them in this file any longer would be
counterproductive.
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Tiago Melo [Thu, 14 May 2020 16:01:57 +0000 (16:01 +0000)]
mgr/dashboard: Improve RbdMirroringService's subscribe methods
Signed-off-by: Tiago Melo <tmelo@suse.com>
(cherry picked from commit
b599a5db7b5c162e6e1c4a68df5efea725b6d381 )
Modified nfs-list.component.spec.ts:134 to be able to pass the unit tests.
Ernesto Puerta [Mon, 11 May 2020 18:33:25 +0000 (20:33 +0200)]
mgr/dashboard: work with RBD images v1
Add support for RBD Image Format v1:
- This format lacks ID field, required for dashboard. Instead,
RBD image `block_name_prefix` is used as unique ID (together with pool
id and namespace)
- Additionally, `image_format` is now exposed.
- In the front-end side:
- Copy action on a v1 image will cause the image to be copied to v2
format.
- List doesn't allow Move to Trash on v1 images,
- Details section now shows `image_format` for images,
- Edit Form disables flags not supported for v1 (`deep-flatten`,
`layering`, `exclusive-lock`).
- Protect does not work on v1 images or v2 images created from v1
ones.
Fixes: https://tracker.ceph.com/issues/36354
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
(cherry picked from commit
119851ec89745026c273334efbcbf2d50128c99d )
Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/ceph/block/rbd-details/rbd-details.component.html: keep only new row
src/pybind/mgr/dashboard/services/ceph_service.py: keep only 1 method, add import Union
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
Sebastian Wagner [Tue, 23 Jun 2020 20:38:23 +0000 (22:38 +0200)]
Merge pull request #35625 from kshtsk/wip-46061-octopus
octopus: qa/tasks/cephadm: setup site based container registry
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
Yuri Weinstein [Tue, 23 Jun 2020 20:15:47 +0000 (13:15 -0700)]
Merge pull request #35517 from votdev/wip-45952-octopus
octopus: mgr/dashboard: Show labels in hosts page
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Yuri Weinstein [Tue, 23 Jun 2020 20:14:40 +0000 (13:14 -0700)]
Merge pull request #35498 from ifed01/wip-ifed-hybrid-alloc-octopus
octopus: os/bluestore: introduce hybrid allocator
Reviewed-by: Adam Kupczyk <akupczyk@redhat.com>
Yuri Weinstein [Tue, 23 Jun 2020 20:13:10 +0000 (13:13 -0700)]
Merge pull request #35463 from bk201/wip-45836-octopus
octopus: monitoring: fixing some issues in RBD detail dashboard
Reviewed-by: Stephan Müller <smueller@suse.com>
Yuri Weinstein [Tue, 23 Jun 2020 20:12:24 +0000 (13:12 -0700)]
Merge pull request #35446 from smithfarm/wip-45682-octopus
octopus: os/bluestore: fix large (>2GB) writes when bluefs_buffered_io = true
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Yuri Weinstein [Tue, 23 Jun 2020 20:11:29 +0000 (13:11 -0700)]
Merge pull request #35236 from smithfarm/wip-45676-octopus
octopus: qa/workunits: Remove redundant Xenial cmake3 requirements
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Yuri Weinstein [Tue, 23 Jun 2020 20:10:18 +0000 (13:10 -0700)]
Merge pull request #34849 from rhcs-dashboard/wip-45346-octopus
octopus: mgr/dashboard: Asynchronous unique username validation for User Component
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Lenz Grimmer [Tue, 23 Jun 2020 10:13:21 +0000 (12:13 +0200)]
Merge pull request #35718 from callithea/wip-46136-octopus
octopus: mgr/dashboard: fix autocomplete input backgrounds in chrome and firefox
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Ishan Rai <ishanrai05@gmail.com>
Laura Paduano [Tue, 23 Jun 2020 08:47:41 +0000 (10:47 +0200)]
Merge pull request #35135 from shyukri/wip-45557-octopus
octopus: mgr/dashboard: Prevent dashboard breakdown on bad pool selection
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Laura Paduano [Tue, 23 Jun 2020 08:40:59 +0000 (10:40 +0200)]
Merge pull request #35706 from tspmelo/wip-45541-octopus
octopus: mgr/dashboard: Fix random E2E error in mgr-modules
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Laura Paduano [Tue, 23 Jun 2020 07:27:50 +0000 (09:27 +0200)]
Merge pull request #35693 from rhcs-dashboard/wip-45727-octopus
octopus: mgr/dashboard: grafana panels for rgw multisite sync performance
Reviewed-by: Ernesto Puertat <epuertat@redhat.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Laura Paduano <lpaduano@suse.com>
Ishan Rai [Fri, 19 Jun 2020 14:56:16 +0000 (14:56 +0000)]
mgr/dashboard: fix autocomplete input backgrounds in chrome and firefox
Fixes: https://tracker.ceph.com/issues/46109
Signed-off-by: Ishan Rai <ishanrai05@gmail.com>
(cherry picked from commit
01df08a49d7d06c7688cc1bcb5eac1fac402c5da )
David Zafman [Thu, 18 Jun 2020 01:08:25 +0000 (18:08 -0700)]
tools: Add statfs operation to ceph-objecstore-tool
Fixes: https://tracker.ceph.com/issues/46064
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
19054ceb43bb2f56dadfe5462d546f2ee1de9263 )
Yuri Weinstein [Mon, 22 Jun 2020 17:45:30 +0000 (10:45 -0700)]
Merge pull request #35670 from kotreshhr/wip-46001-octopus
octopus: mgr/volumes: Add snapshot info command
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>
Yuri Weinstein [Mon, 22 Jun 2020 17:44:54 +0000 (10:44 -0700)]
Merge pull request #35671 from kotreshhr/wip-45849-octopus
octopus: mgr/volumes: Create subvolume with isolated rados namespace
Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Yuri Weinstein [Mon, 22 Jun 2020 17:43:16 +0000 (10:43 -0700)]
Merge pull request #35600 from smithfarm/wip-46013-octopus
octopus: qa/vstart_runner: update vstart_runner.LocalRemote.sh
Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Kyr Shatskyy <kyrylo.shatskyy@suse.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Mon, 22 Jun 2020 17:41:14 +0000 (10:41 -0700)]
Merge pull request #35555 from Vicente-Cheng/wip-45851-octopus
octopus: mds: flag backtrace scrub failures for new files as okay
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Yuri Weinstein [Mon, 22 Jun 2020 17:39:51 +0000 (10:39 -0700)]
Merge pull request #35554 from Vicente-Cheng/wip-45848-octopus
octopus: qa/tasks/vstart_runner.py: add def mountpoint parameter
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Yuri Weinstein [Mon, 22 Jun 2020 17:37:30 +0000 (10:37 -0700)]
Merge pull request #35451 from smithfarm/wip-45846-octopus
octopus: tests: cephfs: run modprobe beforehand so that /sys/fs/fuse/connections is never absen
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>t