]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Ilya Dryomov [Thu, 9 Jul 2020 15:25:45 +0000 (17:25 +0200)]
qa/suites/krbd: turn on balanced reads for the fsx subsuite
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
d15e0cad1a6c1912820c43463cd8f8576968a870 )
Ilya Dryomov [Thu, 9 Jul 2020 20:27:41 +0000 (22:27 +0200)]
test/librbd/fsx: respect rbd_default_map_options in krbd_open()
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
b29dfc4624f3b8286d345ec62894fa70c5f6cf9b )
Ilya Dryomov [Wed, 17 Jun 2020 12:13:12 +0000 (14:13 +0200)]
rbd: recognize compression_hint map option
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
4983eabd6fe75bb6f669d9d18388349f342a5d27 )
Ilya Dryomov [Wed, 17 Jun 2020 12:12:01 +0000 (14:12 +0200)]
rbd: recognize crush_location and read_from_replica map options
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
e3874a25f0e828e2a6bd8735dbeb14197008896c )
Nathan Cutler [Sat, 11 Jul 2020 10:39:03 +0000 (12:39 +0200)]
Merge pull request #36050 from smithfarm/wip-46307-octopus
octopus: tests: unittest_lockdep: skip lockdep test if CEPH_DEBUG_MUTEX is not defined
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Tue, 30 Jun 2020 15:15:44 +0000 (23:15 +0800)]
test/unittest_lockdep: skip lockdep test if CEPH_DEBUG_MUTEX is not defined
this change addresses a regression introduced by
2dc50b5f91476cf10429dbcdd52b00e32f599d5c
Fixes: https://tracker.ceph.com/issues/46267
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
fb74d5443a289c5235210f4c0f1500f2a90cb047 )
Yuri Weinstein [Fri, 10 Jul 2020 18:51:17 +0000 (11:51 -0700)]
Merge pull request #35877 from ivancich/octopus-rgw-ordered-listing-stuck
octopus: rgw: fix bug where ordered bucket listing gets stuck
Reviewed-by: Adam Emerson <aemerson@redhat.com>
Lenz Grimmer [Fri, 10 Jul 2020 14:35:24 +0000 (16:35 +0200)]
Merge pull request #35796 from callithea/wip-45786-octopus
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Ishan Rai <ishanrai05@gmail.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
Lenz Grimmer [Fri, 10 Jul 2020 13:54:16 +0000 (15:54 +0200)]
Merge pull request #35926 from rhcs-dashboard/wip-46354-octopus
octopus: mgr/dashboard: Display users current bucket quota usage
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Avan Thakkar [Fri, 17 Apr 2020 08:51:48 +0000 (14:21 +0530)]
mgr/dashboard: Display users current bucket quota usage
Fixes: https://tracker.ceph.com/issues/45011
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit
966d887f7a5e0765b4210ab4edcb1cea3e03ac35 )
(cherry picked from commit
4fabba0bb772d480dcddc83272c83e7714726fc1 )
Conflicts:
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-list/rgw-bucket-list.component.spec.ts
- Replace cd-usage-bar totalBytes and usedBytes with total and bytes
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
Lenz Grimmer [Fri, 10 Jul 2020 09:58:03 +0000 (11:58 +0200)]
Merge pull request #35892 from callithea/wip-46308-octopus
octopus: mgr/dashboard: Display check icon instead of true|false in various datatables
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Igor Fedotov [Thu, 9 Jul 2020 09:23:25 +0000 (12:23 +0300)]
Merge pull request #35748 from ifed01/wip-ifed-better-bluefs-stats-octopus
octopus:os/bluestore: improve/fix bluefs stats reporting
Lenz Grimmer [Thu, 9 Jul 2020 07:56:39 +0000 (09:56 +0200)]
Merge pull request #35847 from callithea/wip-46171-octopus
Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Patrick Seidensal <pnawracay@suse.com>
Reviewed-by: Yuri Weinstein <yweinste@redhat.com>
Igor Fedotov [Wed, 15 Apr 2020 13:43:21 +0000 (16:43 +0300)]
os/bluestore: show file count for 'bluefs-stats'
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit
974906c2b48dee61faf2cffcb6a7f36b8b75fe59 )
Conflicts:
src/os/bluestore/BlueFS.h - trivial
Igor Fedotov [Wed, 15 Apr 2020 13:15:32 +0000 (16:15 +0300)]
bluestore/bluestore-tool: add bluefs-stats command
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit
b411594a6130dcfa8e97ef5e8b292aadb87d0a83 )
Igor Fedotov [Wed, 15 Apr 2020 14:05:17 +0000 (17:05 +0300)]
bluestore/bluestore_tool: fix execute_command return handling
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit
edcbc66844858b4e5192f5f9f9577a1711eec4f9 )
Igor Fedotov [Wed, 15 Apr 2020 13:57:11 +0000 (16:57 +0300)]
os/bluestore/store_test: fix execute_command return handling
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit
82e501b7fcebdd1ded159c7f431bbcc906fec256 )
Igor Fedotov [Wed, 15 Apr 2020 13:02:15 +0000 (16:02 +0300)]
os/bluestore: fix incomplete 'bluestore bluefs stats' cmd rename
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
(cherry picked from commit
b253e2d2ba08a2b169eb3a3f656c6c71f2e77642 )
Yuri Weinstein [Wed, 8 Jul 2020 19:34:49 +0000 (12:34 -0700)]
Merge pull request #35799 from sseshasa/wip-46229-octopus
octopus: mon/OSDMonitor: Reset grace period if failure interval exceeds a threshold.
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Wed, 8 Jul 2020 19:34:20 +0000 (12:34 -0700)]
Merge pull request #35793 from callithea/wip-46183-octopus
octopus: mgr/DaemonServer.cc: make 'config show' on fsid work
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Yuri Weinstein [Wed, 8 Jul 2020 19:32:18 +0000 (12:32 -0700)]
Merge pull request #35737 from neha-ojha/wip-46165-octopus
octopus: osd: make message cap option usable again
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Vikhyat Umrao <vikhyat@redhat.com>
Yuri Weinstein [Wed, 8 Jul 2020 19:28:19 +0000 (12:28 -0700)]
Merge pull request #35797 from callithea/wip-45475-octopus
octopus: qa: mgr/dashboard: Replace Telemetry module in REST API test
Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Yuri Weinstein [Wed, 8 Jul 2020 19:26:56 +0000 (12:26 -0700)]
Merge pull request #35794 from callithea/wip-46117-octopus
octopus: mgr: fix race between module load and notify
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Yuri Weinstein [Wed, 8 Jul 2020 19:25:55 +0000 (12:25 -0700)]
Merge pull request #35766 from callithea/wip-46173-octopus
octopus: mgr/dashboard: allow preserving OSD IDs when deleting OSDs
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
Yuri Weinstein [Wed, 8 Jul 2020 19:24:54 +0000 (12:24 -0700)]
Merge pull request #35720 from idryomov/wip-msgr21-octopus
octopus: New msgr2 crc and secure modes (msgr2.1)
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Yuri Weinstein [Wed, 8 Jul 2020 19:21:23 +0000 (12:21 -0700)]
Merge pull request #34943 from ifed01/wip-ifed-fix-spillover-octopus
octopus: test/store_test: refactor bluestore spillover test
Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Patrick Donnelly [Wed, 8 Jul 2020 14:58:27 +0000 (07:58 -0700)]
Merge PR #35499 into octopus
* refs/pull/35499/head:
qa/tasks/test_nfs: Add test for cluster info
mgr/volumes/nfs: Add cluster show info command
volumes/fs/nfs: Don't parse rados export objects during FSExport init
pybind/mgr/volumes/nfs: Fix flake8 errors
qa/tasks/test_nfs: Add todo note for cluster update test
qa/tasks/cephfs/test_nfs: Add test for get and list detailed export
qa/tasks/cephfs/test_nfs: Add test for export user id
qa/tasks/cephfs/test_nfs: Add description for each test
doc/cephfs: Add list and get export usage
qa/tasks/cephfs: Add tests for export create with non-existing fsname and cluster id
qa/tasks/cephfs: Add tests for invalid cluster id, export type and modify list cluster
qa/tasks/cephfs: Add test for listing exports
pybind/mgr/volumes/nfs: Reorder FSExport and NFSCluster class methods
mgr/volumes/nfs: Set pool_namespace and cluster_id through decorator
mgr/volumes/nfs: Check cluster availability in export command methods
mgr/volumes/nfs: Misc changes to export get and ls command
qa/tasks/cephfs: Add test for nfs cluster ls command
mgr/volumes/nfs: Add nfs cluster ls command
mgr/volumes/nfs: Remove 'ganesha-' prefix from orch returned service id
qa/tasks/cephfs: Add test to check if export is available on restarting mgr
mgr/volumes/nfs: get export in a nfs cluster
mgr/volumes/nfs: list exports within a ganesha cluster
mgr/volumes/nfs: Check if cluster exists before creating exports
mgr/volumes/nfs: Fetch exports in persistent way if mgr is restarted
mgr/volume/nfs: allow only [A-Za-z0-9-_.] characters
qa/tasks/cephfs: Add idempotency test for nfs commands
mgr/volumes/nfs: Reorder imports
qa/tasks/cephfs/test_nfs.py: flake8 fixes
qa/tasks/cephfs/nfs: Poll for max 60 seconds to ensure removal of ganesha services
vstart: just use ganesha.nfsd that's in $PATH
vstart: Add ip value to nfs mount information
pybind/mgr/volumes/nfs: Remove unused cephfs module
mgr/volumes/nfs: Ignore if ganesha disconnects
mgr/volumes/nfs: use f-string for creating Exception
vstart: allow specifying a different ganesha binary
vstart: handle multiple ganesha's more sanely
vstart.sh: update comment to use ganesha from CentOS Storage SIG
vstart: set $CEPH_CONF when running ganesha-rados-grace
vstart: Support deployment of ganesha daemon by cephadm with NFS option.
mgr/test_orchestrator: List nfs daemon
qa/tasks/cephfs: Enable multiple exports tests
mgr/nfs: Instead of 'auth del' use 'auth rm'
qa/tasks/cephfs: Don't enable cephadm in TestNFS
qa/tasks/cephfs: Add tests for nfs exports
mgr/volumes/nfs: Fix idempotency of cluster and export commands
mgr/volumes/nfs: Fix incorrect read only access_type value
mgr/fs/nfs: Use check_mon_command() instead of mon_command()
qa/cephfs: Add tests for nfs
mgr/volumes/nfs: Remove type option from export create interface
vstart: Instead of CACHEINODE use MDCACHE
mgr/volumes: Rearrange nfs export interface
mgr/volumes/nfs: Delete common config object on cluster deletion
mgr/volumes/nfs: Delete all exports on cluster deletion
mgr/volumes: Make nfs create export interface idempotent
vstart: Add watch url for conf-nfs object
mgr/volumes/nfs: Delete user on removing export
mgr/volumes: Create user for given path and fs
vstart: Ensure cephadm and NFS does not conflict
vstart: Update details about ganesha packages
mgr/volumes/nfs: Add delete cephfs export command
mgr/volumes/nfs: Add RADOS notify for common config object
mgr/volumes/nfs: Pass cluster_id directly to NFSCluster {create, update, delete} methods
mgr/volumes: Add nfs cluster delete interface
mgr/volumes: Add nfs cluster update interface
vstart: Enable test_orchestrator in start_ganesha()
mgr/volumes: Add placement option to create nfs cluster interface
mgr/volumes/nfs: Change common ganesha config object name to 'conf-nfs.ganesha-<cluster_id>'
mgr/volumes/nfs: Call orch nfs apply
mgr/volumes: Add a note about placement option in nfs cluster create
mgr/volumes: Remove unused typing module
mgr/volumes: Make cluster id option mandatory in nfs create export
mgr/volumes: Update nfs cluster and export interface
vstart: Update the nfs cluster create and export interface
mgr/volumes: Remove GaneshaConf and NFSConfig class
mgr/volumes: Create multiple CephFS exports
mgr/volumes: Move ganesha common config to vstart
mgr/volumes/nfs: Fix mypy errors
mgr/volumes/nfs: Update the export class to remove unecessary config options
mgr/volumes: Remove dependency on dashboard ganesha module
vstart: Use random port instead of default Ganesha port
vstart: Use "NFS" instead "GANESHA" for starting nfs ganesha clusters
mgr/volumes: Improve readability of ganesha common config
vstart: Add note about mounting cephfs exports
src/vstart: Set CEPH_CONF environment variables
mgr/volumes/fs: Update default ganesha conf options
doc: Add document about fs nfs interface to create CephFS exports
vstart: Update fs nfs export create command
mgr/volumes: Update nfs export create and delete command
mgr/volumes: Remove create_rados_pool method
mgr/volumes: Changes to nfs export delete and create
mgr/volumes: While creating nfs-ganesha user update its cap
mgr/volumes: Update caps for new user created and add it's key to keyring
vstart: Update vstart according to cluster create command
mgr/volumes: Add Ganesha common config
mgr/volumes: Create NFSConfig class
mgr/volumes: Add command to create nfs-ganesha clusters
mgr: Create pool for nfs ganesha recovery
mgr: Add "ceph fs nfs delete <export_id>" to delete exports
mgr: Add command to create exports for nfs-ganesha
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Varsha Rao [Tue, 30 Jun 2020 10:55:20 +0000 (16:25 +0530)]
qa/tasks/test_nfs: Add test for cluster info
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
93aa5e4012e232d935884a8c69396684efc274e3 )
Varsha Rao [Mon, 22 Jun 2020 18:38:28 +0000 (00:08 +0530)]
mgr/volumes/nfs: Add cluster show info command
Fixes: https://tracker.ceph.com/issues/45743
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
1faed4b1aab736d63590b069aa0c1739a380f058 )
Patrick Donnelly [Sat, 27 Jun 2020 00:00:46 +0000 (17:00 -0700)]
volumes/fs/nfs: Don't parse rados export objects during FSExport init
Instead we can do it if any export commands are used. This fixes ImportError
raised when FSExport is initialized with cephadm module disabled.
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
4ebb2581d655ae903d42942b4ef1f2c3c6fe5b8a )
Varsha Rao [Thu, 25 Jun 2020 07:03:04 +0000 (12:33 +0530)]
pybind/mgr/volumes/nfs: Fix flake8 errors
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
4da75816754e888f7c4a7ac7375039763b5f9a35 )
Varsha Rao [Thu, 25 Jun 2020 06:53:39 +0000 (12:23 +0530)]
qa/tasks/test_nfs: Add todo note for cluster update test
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
d7396fdc0f0950133ab0bfc431b43213d2727960 )
Varsha Rao [Tue, 23 Jun 2020 18:25:46 +0000 (23:55 +0530)]
qa/tasks/cephfs/test_nfs: Add test for get and list detailed export
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
5f506e39695c6f8f7df103331f0675bb3d2d0c23 )
Varsha Rao [Tue, 23 Jun 2020 18:17:43 +0000 (23:47 +0530)]
qa/tasks/cephfs/test_nfs: Add test for export user id
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
1aa2a660bdf2ae4d523908ada1a3cf0095700a86 )
Varsha Rao [Fri, 19 Jun 2020 17:36:12 +0000 (23:06 +0530)]
qa/tasks/cephfs/test_nfs: Add description for each test
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
dfa3ab43496ca790af5cba89ee5051def4149c88 )
Varsha Rao [Tue, 16 Jun 2020 10:29:19 +0000 (15:59 +0530)]
doc/cephfs: Add list and get export usage
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
55fd634e881d07c633af97c6ced35054bf121ec8 )
Varsha Rao [Tue, 16 Jun 2020 10:04:36 +0000 (15:34 +0530)]
qa/tasks/cephfs: Add tests for export create with non-existing fsname and cluster id
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
eab60b5fad6d2e0166d40f255b9507eada831b87 )
Varsha Rao [Tue, 16 Jun 2020 08:45:22 +0000 (14:15 +0530)]
qa/tasks/cephfs: Add tests for invalid cluster id, export type and modify list cluster
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
285ab1b4ae7a378a885661ff92e3400d23c26317 )
Varsha Rao [Mon, 15 Jun 2020 19:09:58 +0000 (00:39 +0530)]
qa/tasks/cephfs: Add test for listing exports
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
9418b42b29792af294fb8696a4957b3072a87016 )
Varsha Rao [Tue, 16 Jun 2020 07:09:45 +0000 (12:39 +0530)]
pybind/mgr/volumes/nfs: Reorder FSExport and NFSCluster class methods
To maintain consistency and improve readability.
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
ed20bd8693dcc26c64774c169e23d2af912702a4 )
Varsha Rao [Tue, 16 Jun 2020 06:31:05 +0000 (12:01 +0530)]
mgr/volumes/nfs: Set pool_namespace and cluster_id through decorator
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
2692a94d690faf857de96ad1f86520f00d268979 )
Varsha Rao [Mon, 15 Jun 2020 15:47:59 +0000 (21:17 +0530)]
mgr/volumes/nfs: Check cluster availability in export command methods
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
9d8304546746222b2c6d1057fb4ed6dfe0f130c1 )
Varsha Rao [Mon, 15 Jun 2020 11:29:41 +0000 (16:59 +0530)]
mgr/volumes/nfs: Misc changes to export get and ls command
This patch does following changes:
* Add extra line before every class definition
* Reorder export dictionary
* Use _fetch_export() in get export command
* Remove cluster_id key from export dictionary if single export is deleted
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
310c7fbf7306428c7c72ff7b00ac198af5a5e2f0 )
Varsha Rao [Thu, 11 Jun 2020 05:27:50 +0000 (10:57 +0530)]
qa/tasks/cephfs: Add test for nfs cluster ls command
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
eb2cd16fbe3d6cb5aa9102c09baac500b617f178 )
Varsha Rao [Thu, 11 Jun 2020 05:18:56 +0000 (10:48 +0530)]
mgr/volumes/nfs: Add nfs cluster ls command
This commands provides list of deployed nfs clusters.
Fixes: https://tracker.ceph.com/issues/45742
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
b77c3eef7803c77f3596347dd1ca145e118e80b3 )
Varsha Rao [Wed, 10 Jun 2020 13:00:24 +0000 (18:30 +0530)]
mgr/volumes/nfs: Remove 'ganesha-' prefix from orch returned service id
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
555da003fba28ae0546e4875694baf9964fc0a23 )
Varsha Rao [Tue, 9 Jun 2020 07:44:36 +0000 (07:44 +0000)]
qa/tasks/cephfs: Add test to check if export is available on restarting mgr
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
3b554f2310878cd0d38db8acef982a4707111b04 )
Ramana Raja [Fri, 5 Jun 2020 10:38:14 +0000 (16:08 +0530)]
mgr/volumes/nfs: get export in a nfs cluster
Fixes: https://tracker.ceph.com/issues/45741
Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit
7dcefb158d2999715856ffa12cce9b92e6a12b23 )
Ramana Raja [Sun, 14 Jun 2020 16:33:16 +0000 (22:03 +0530)]
mgr/volumes/nfs: list exports within a ganesha cluster
List the pseudo paths of the exports within a ganesha cluster
with `nfs export ls <cluster ID>` command.
List all the details of the exports within a ganesha cluster
with `nfs export ls <cluster ID> --detailed` command.
Partially-fixes: https://tracker.ceph.com/issues/45741
Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit
6f8d20f2cbcdb5a0351a050abd6d66c0c840c108 )
Varsha Rao [Fri, 5 Jun 2020 10:33:01 +0000 (16:03 +0530)]
mgr/volumes/nfs: Check if cluster exists before creating exports
Fixes: https://tracker.ceph.com/issues/45740
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
c13a40b99e7e8bfabd874be1482d5cbdf1237e5e )
Varsha Rao [Fri, 5 Jun 2020 09:14:59 +0000 (14:44 +0530)]
mgr/volumes/nfs: Fetch exports in persistent way if mgr is restarted
Fixes: https://tracker.ceph.com/issues/45740
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
162a57156f8ed654f3f39274961776f8633b722b )
Ramana Raja [Thu, 4 Jun 2020 06:46:49 +0000 (12:16 +0530)]
mgr/volume/nfs: allow only [A-Za-z0-9-_.] characters
... for ganesha cluster names.
Fixes: https://tracker.ceph.com/issues/45744
Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit
7ae24c22f6531c3450e56d59b2fba48689ef775f )
Varsha Rao [Tue, 2 Jun 2020 11:34:19 +0000 (11:34 +0000)]
qa/tasks/cephfs: Add idempotency test for nfs commands
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
1a55888b1bab8039dba173c0bdc1923ac24f347a )
Varsha Rao [Wed, 24 Jun 2020 05:14:57 +0000 (05:14 +0000)]
mgr/volumes/nfs: Reorder imports
This patch reorders import to fix "ImportError: cannot import name 'TimedOut'".
As flake8 requires similar import types to be grouped together.
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
c87050c8af708e7737a1fc6b114e7538369e9c6d )
Kefu Chai [Sat, 20 Jun 2020 02:49:45 +0000 (10:49 +0800)]
qa/tasks/cephfs/test_nfs.py: flake8 fixes
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
981a7cc923ed9ddb61c5b83940d42b82ca7a4469 )
Varsha Rao [Fri, 19 Jun 2020 09:00:22 +0000 (14:30 +0530)]
qa/tasks/cephfs/nfs: Poll for max 60 seconds to ensure removal of ganesha services
Fixes: https://tracker.ceph.com/issues/46104
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
0caa54bae89dc3f3f47348129c1bc137b44a6a4d )
Jeff Layton [Mon, 22 Jun 2020 12:31:46 +0000 (08:31 -0400)]
vstart: just use ganesha.nfsd that's in $PATH
In an earlier patch, I added a --ganesha-path option, but that left out
ganesha-rados-grace, which also could be in an alternate path. Instead,
just change vstart to run whatever ganesha.nfsd it finds in $PATH. We
already do that for ganesha-rados-grace so it should be fine to do that
for ganesha.nfsd as well.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit
eab8c8136dc5379efde28e62f195437997c9db7f )
Conflicts:
src/vstart.sh
- Removed bluestore-zoned option as pr(#35111) is not backported yet.
Varsha Rao [Mon, 22 Jun 2020 18:38:50 +0000 (00:08 +0530)]
vstart: Add ip value to nfs mount information
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
02d2097e679a571ebe9639f588ac24adf5ca0c94 )
Varsha Rao [Fri, 19 Jun 2020 17:55:53 +0000 (23:25 +0530)]
pybind/mgr/volumes/nfs: Remove unused cephfs module
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
92873997d6444f19c369fef1bcb906241ea169d8 )
Varsha Rao [Thu, 18 Jun 2020 08:47:11 +0000 (14:17 +0530)]
mgr/volumes/nfs: Ignore if ganesha disconnects
Fixes: https://tracker.ceph.com/issues/46046
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
f99b3b6aef5cd218643de50a8d6f027efc0f3344 )
Kefu Chai [Wed, 17 Jun 2020 04:34:17 +0000 (12:34 +0800)]
mgr/volumes/nfs: use f-string for creating Exception
for better understanding the reason of the failure
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
5b8ba6648d6e43d34c3f15b228a17843c5c9b1de )
Jeff Layton [Wed, 17 Jun 2020 19:49:52 +0000 (15:49 -0400)]
vstart: allow specifying a different ganesha binary
Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit
06d29a717a20190a98b1b9e3b9306fea163f1ecb )
Conflicts:
src/vstart.sh
- Removed bluestore-zoned option as pr(#35111) is not backported yet.
Jeff Layton [Wed, 17 Jun 2020 16:11:51 +0000 (12:11 -0400)]
vstart: handle multiple ganesha's more sanely
Currently, if you have more than one ganesha daemon, it clobbers the
log, config and pidfiles from the previous daemons. Give them each
their own files.
While we're in here, move the log and pidfile to the out/ directory
with all of the other logfiles/pidfiles.
Fixes: https://tracker.ceph.com/issues/46079
Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit
eea01dfa78738e3b3c67751d00d2430a1ff6ee5d )
Kefu Chai [Tue, 16 Jun 2020 09:03:13 +0000 (17:03 +0800)]
vstart.sh: update comment to use ganesha from CentOS Storage SIG
see https://download.nfs-ganesha.org/3/LATEST/RHEL/
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
9c91062b85b6886798ff1cca08e85b09b5a706f7 )
Jeff Layton [Wed, 10 Jun 2020 19:55:24 +0000 (15:55 -0400)]
vstart: set $CEPH_CONF when running ganesha-rados-grace
...otherwise we could pick up the wrong ceph.conf file. Also, use the
correct $test_user userid for these ops.
Fixes: https://tracker.ceph.com/issues/45971
Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit
9882a69818457580cbaa318d7a50ff6ddb09ee69 )
Varsha Rao [Mon, 1 Jun 2020 15:32:53 +0000 (21:02 +0530)]
vstart: Support deployment of ganesha daemon by cephadm with NFS option.
NFS Ganesha cluster can be created in two ways with vstart
cluster:
1) With test_orchestrator
NFS=1 ../src/vstart.sh
This type of deployment can have multiple ganesha daemons on random port.
2) With Cephadm
NFS=1 ../src/vstart.sh --cephadm
It can deploy only single ganesha daemon with vstart on default ganesha port.
Both can create multiple cephfs exports.
Fixes: https://tracker.ceph.com/issues/45830
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
1896b70f5ec94f124eaa74fcbf10be44df768408 )
Varsha Rao [Mon, 1 Jun 2020 15:27:45 +0000 (20:57 +0530)]
mgr/test_orchestrator: List nfs daemon
This patch adds dummy data for nfs ganesha daemon and adds nfs to list of
supported service type.
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
a104405ffc204937cc0be9f3a6ff5229fab144aa )
Varsha Rao [Fri, 29 May 2020 18:06:34 +0000 (23:36 +0530)]
qa/tasks/cephfs: Enable multiple exports tests
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
b2adff10b55ddf11088c4176a6e03ee150e55b8a )
Varsha Rao [Fri, 29 May 2020 17:54:54 +0000 (23:24 +0530)]
mgr/nfs: Instead of 'auth del' use 'auth rm'
`mgr` profile allows 'auth rm'. Use it instead of 'auth del' which is not
allowed.
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
87c517af310a2fb0a5226867b6a852393c0f6b44 )
Varsha Rao [Fri, 29 May 2020 09:54:03 +0000 (15:24 +0530)]
qa/tasks/cephfs: Don't enable cephadm in TestNFS
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
1477c987647f9bde96cddfea84ee797b71471bab )
Varsha Rao [Thu, 28 May 2020 10:57:25 +0000 (10:57 +0000)]
qa/tasks/cephfs: Add tests for nfs exports
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
af3b925dfd97929e2b967ab6b05e92b7d0de6ece )
Varsha Rao [Thu, 28 May 2020 10:14:56 +0000 (15:44 +0530)]
mgr/volumes/nfs: Fix idempotency of cluster and export commands
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
b8ce61e8bde7a0cb1eed7129038701c10fd275cd )
Varsha Rao [Tue, 26 May 2020 10:17:55 +0000 (15:47 +0530)]
mgr/volumes/nfs: Fix incorrect read only access_type value
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
923d1814866736067b76236c3cadaccbad0e871d )
Varsha Rao [Tue, 26 May 2020 10:13:40 +0000 (15:43 +0530)]
mgr/fs/nfs: Use check_mon_command() instead of mon_command()
check_mon_command() checks the return code of mon command.
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
fee3f25609130c8f03a829b0ad28a6aa0760dd35 )
Varsha Rao [Thu, 30 Apr 2020 10:10:52 +0000 (15:40 +0530)]
qa/cephfs: Add tests for nfs
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
ab41951b04c99bf55e093937196add25d4face84 )
Varsha Rao [Fri, 15 May 2020 17:56:13 +0000 (23:26 +0530)]
mgr/volumes/nfs: Remove type option from export create interface
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
9bcd7b673d7206a35abc9bf612ec3ff05f491ba7 )
Varsha Rao [Fri, 15 May 2020 16:04:03 +0000 (21:34 +0530)]
vstart: Instead of CACHEINODE use MDCACHE
CACHEINODE will be deprecated soon. Instead use MDCACHE.
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
2c50c9b0c168a6770560d70efd03769ddd43a8a8 )
Varsha Rao [Thu, 14 May 2020 16:00:46 +0000 (21:30 +0530)]
mgr/volumes: Rearrange nfs export interface
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
8a84744a5a7b8e7fb158cfe33887e8f0a2b2fb91 )
Varsha Rao [Thu, 14 May 2020 15:45:58 +0000 (21:15 +0530)]
mgr/volumes/nfs: Delete common config object on cluster deletion
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
0ee8439b69e309c8c99cc0cb8466ce8dac866e6b )
Varsha Rao [Thu, 14 May 2020 13:46:35 +0000 (19:16 +0530)]
mgr/volumes/nfs: Delete all exports on cluster deletion
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
d12aed8eeaaa981873aa278d8bdb209e3f6968c9 )
Varsha Rao [Thu, 14 May 2020 11:16:48 +0000 (16:46 +0530)]
mgr/volumes: Make nfs create export interface idempotent
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
b3b83b0554441597c6a7a282e55a5fb3ce8b9982 )
Varsha Rao [Wed, 6 May 2020 10:20:12 +0000 (15:50 +0530)]
vstart: Add watch url for conf-nfs object
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
e9e09a199f5d0624bda748d78eecba6cae4d7fc5 )
Varsha Rao [Tue, 5 May 2020 10:38:49 +0000 (16:08 +0530)]
mgr/volumes/nfs: Delete user on removing export
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
b9bff573c965bfa5c90919431e8791610fef7787 )
Varsha Rao [Tue, 5 May 2020 10:09:48 +0000 (15:39 +0530)]
mgr/volumes: Create user for given path and fs
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
dd20761908a2a7ba63df941991aa5adfada4d1fb )
Varsha Rao [Mon, 4 May 2020 14:13:12 +0000 (19:43 +0530)]
vstart: Ensure cephadm and NFS does not conflict
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
31767428fc36f34331b75dd899ed0b9ae6b3ecaf )
Varsha Rao [Mon, 4 May 2020 14:05:47 +0000 (19:35 +0530)]
vstart: Update details about ganesha packages
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
f81fe362456865265f79b7b13b726fc0fdb6ef54 )
Varsha Rao [Tue, 28 Apr 2020 16:27:20 +0000 (21:57 +0530)]
mgr/volumes/nfs: Add delete cephfs export command
$ ceph nfs export delete <binding> <clusterid>
binding: It is the pseudo root name
clusterid: It is name of the cluster
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
5b45610549ec7e3f22fbda77164201bcb7396b78 )
Varsha Rao [Tue, 28 Apr 2020 11:49:32 +0000 (17:19 +0530)]
mgr/volumes/nfs: Add RADOS notify for common config object
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
85e71eb7d40e1bbd2f77dbc8dce65dd42ea85fb1 )
Varsha Rao [Mon, 27 Apr 2020 11:30:03 +0000 (17:00 +0530)]
mgr/volumes/nfs: Pass cluster_id directly to NFSCluster {create, update, delete} methods
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
fff59e686aeae615935fe1ee8ad84352aa6757f3 )
Varsha Rao [Thu, 23 Apr 2020 15:46:16 +0000 (21:16 +0530)]
mgr/volumes: Add nfs cluster delete interface
$ ceph nfs cluster delete <clusterid>
This deletes the deployed cluster.
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
db2734a50fd3babd43892af0437edbe9a8130c99 )
Varsha Rao [Thu, 23 Apr 2020 13:40:48 +0000 (19:10 +0530)]
mgr/volumes: Add nfs cluster update interface
$ ceph nfs cluster update <clusterid> <placement>
This updates the existing deployed cluster according to placement value.
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
9f97401f2794d51cfd7c44564a82b747e88420f9 )
Varsha Rao [Tue, 21 Apr 2020 13:20:04 +0000 (18:50 +0530)]
vstart: Enable test_orchestrator in start_ganesha()
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
16d11d1f67226dbede7c706e17418dfa278c7c73 )
Varsha Rao [Tue, 21 Apr 2020 12:53:04 +0000 (18:23 +0530)]
mgr/volumes: Add placement option to create nfs cluster interface
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
b16190bb5fb61754199cf9731c496888299c983a )
Varsha Rao [Tue, 21 Apr 2020 09:56:57 +0000 (15:26 +0530)]
mgr/volumes/nfs: Change common ganesha config object name to 'conf-nfs.ganesha-<cluster_id>'
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
7f584fd574e471363597d9f366e8336deba72222 )
Varsha Rao [Mon, 20 Apr 2020 06:12:18 +0000 (11:42 +0530)]
mgr/volumes/nfs: Call orch nfs apply
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
1e1a1b0ae80646c06855e94a21b8d5c83a0e3955 )
Varsha Rao [Wed, 8 Apr 2020 06:13:57 +0000 (11:43 +0530)]
mgr/volumes: Add a note about placement option in nfs cluster create
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
e3da10220ec854bec63c369b1e6a96013cf875d0 )
Varsha Rao [Wed, 8 Apr 2020 06:09:29 +0000 (11:39 +0530)]
mgr/volumes: Remove unused typing module
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
14cbf6d567b7e945f4a497d4e5b0d0631ec50f0a )
Varsha Rao [Mon, 6 Apr 2020 14:24:37 +0000 (19:54 +0530)]
mgr/volumes: Make cluster id option mandatory in nfs create export
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
25642bcf50dd56ab5cd14470543f9e3fb7a4185b )
Varsha Rao [Wed, 1 Apr 2020 16:01:26 +0000 (21:31 +0530)]
mgr/volumes: Update nfs cluster and export interface
Instead of prefixing 'fs' to the commands, type is added for easy extension to
create rgw exports.
$ ceph nfs cluster create <type=cephfs> [--size=1] <clusterid>
$ ceph nfs export create <type=cephfs> <fsname> <binding> [--readonly] [--path=/path/in/cephfs] [--attach=<clusterid>]
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
a84d4b0124d49a14426c0703a204b4c64c13c936 )
Varsha Rao [Wed, 1 Apr 2020 15:34:58 +0000 (21:04 +0530)]
vstart: Update the nfs cluster create and export interface
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit
34ba1cc141a9b2969b9a4e80c35339f04b0ea4fa )