Skip to content

octopus: nfs backport#35499

Merged
batrick merged 99 commits intoceph:octopusfrom
varshar16:wip-octopus-nfs-backport
Jul 8, 2020
Merged

octopus: nfs backport#35499
batrick merged 99 commits intoceph:octopusfrom
varshar16:wip-octopus-nfs-backport

Conversation

@varshar16
Copy link
Contributor

@varshar16 varshar16 commented Jun 9, 2020 •
edited
Loading

@varshar16 varshar16 requested a review from a team as a code owner June 9, 2020 11:50
@varshar16
Copy link
Contributor Author

varshar16 commented Jun 10, 2020

Tests Failed: http://qa-proxy.ceph.com/teuthology/varsha-2020-06-09_15:53:12-rados-wip-octopus-nfs-backport-distro-basic-smithi/

2020-06-09T16:07:37.902 ERROR:teuthology.run_tasks:Saw exception from tasks.
Traceback (most recent call last):
  File "/home/teuthworker/src/git.ceph.com_git_teuthology_master/teuthology/run_tasks.py", line 91, in run_tasks
    manager = run_one_task(taskname, ctx=ctx, config=config)
  File "/home/teuthworker/src/git.ceph.com_git_teuthology_master/teuthology/run_tasks.py", line 69, in run_one_task
    task = get_task(taskname)
  File "/home/teuthworker/src/git.ceph.com_git_teuthology_master/teuthology/run_tasks.py", line 33, in get_task
    module = _import('tasks', module_name, task_name, fail_on_import_error=True)
  File "/home/teuthworker/src/git.ceph.com_git_teuthology_master/teuthology/run_tasks.py", line 57, in _import
    0,
  File "/home/teuthworker/src/git.ceph.com_ceph-c_wip-octopus-nfs-backport/qa/tasks/cephadm.py", line 18, in <module>
    from ceph_manager import CephManager
ModuleNotFoundError: No module named 'ceph_manager'

@sebastian-philipp
Copy link
Contributor

sebastian-philipp commented Jun 10, 2020

did you run your test with -teuthology-branch py2?

@varshar16
Copy link
Contributor Author

varshar16 commented Jun 10, 2020

did you run your test with -teuthology-branch py2?

No, I ran the test with: teuthology-suite -v --machine-type smithi --email varao@redhat.com -p 54 --ceph wip-octopus-nfs-backport --suite rados --filter test_orch_cli

@sebastian-philipp
Copy link
Contributor

sebastian-philipp commented Jun 10, 2020

octopus is still on py2. until @kshtsk merges his PR.

@varshar16
Copy link
Contributor Author

varshar16 commented Jun 10, 2020

Tests have failed again due incompatibility with python2.
http://qa-proxy.ceph.com/teuthology/varsha-2020-06-10_08:05:10-rados-wip-octopus-nfs-backport-distro-basic-smithi/

2020-06-10T08:20:50.852 ERROR:teuthology.run_tasks:Saw exception from tasks.
Traceback (most recent call last):
  File "/home/teuthworker/src/git.ceph.com_git_teuthology_py2/teuthology/run_tasks.py", line 90, in run_tasks
    manager.__enter__()
  File "/usr/lib/python2.7/contextlib.py", line 17, in __enter__
    return self.gen.next()
  File "/home/teuthworker/src/git.ceph.com_ceph-c_wip-octopus-nfs-backport/qa/tasks/cephfs_test_runner.py", line 166, in task
    module_suites.append(decorating_loader.loadTestsFromName(mod_name))
  File "/home/teuthworker/src/git.ceph.com_ceph-c_wip-octopus-nfs-backport/qa/tasks/cephfs_test_runner.py", line 36, in loadTestsFromName
    result = super(DecoratingLoader, self).loadTestsFromName(name, module)
  File "/usr/lib/python2.7/unittest/loader.py", line 91, in loadTestsFromName
    module = __import__('.'.join(parts_copy))
  File "/home/teuthworker/src/git.ceph.com_git_teuthology_py2/virtualenv/local/lib/python2.7/site-packages/gevent/builtins.py", line 96, in __import__
    result = _import(*args, **kwargs)
  File "/home/teuthworker/src/git.ceph.com_ceph-c_wip-octopus-nfs-backport/qa/tasks/cephfs/test_nfs.py", line 81
    res = self._sys_cmd(['rados', '-p', 'nfs-ganesha', '-N', self.cluster_id, 'get', f'export-{export_id}', '-'])
                                                                                                         ^
SyntaxError: invalid syntax

@kshtsk
Copy link
Contributor

kshtsk commented Jun 10, 2020

octopus is still on py2. until @kshtsk merges his PR.

yeah... till that, the backporting means make it py2 compatible

@varshar16
Copy link
Contributor Author

varshar16 commented Jun 10, 2020

Thanks @sebastian-philipp and @kshtsk
Tests have passed after making it py2 compatible .
http://qa-proxy.ceph.com/teuthology/varsha-2020-06-10_09:22:37-rados-wip-octopus-nfs-backport-distro-basic-smithi/

@varshar16 varshar16 force-pushed the wip-octopus-nfs-backport branch from 4ed3fac to a19ea29 Compare June 11, 2020 09:42
@batrick
Copy link
Member

batrick commented Jun 18, 2020

@varshar16 note that @tchaikov has announced octopus is now py3 compatible.

@varshar16 varshar16 force-pushed the wip-octopus-nfs-backport branch from a19ea29 to 4e23f90 Compare June 19, 2020 12:59
@varshar16 varshar16 mentioned this pull request Jun 19, 2020
Merged
3 tasks
@batrick
Copy link
Member

batrick commented Jun 19, 2020

jenkins test dashboard backend

@batrick
Copy link
Member

batrick commented Jun 19, 2020

jenkins test docs

@varshar16 varshar16 force-pushed the wip-octopus-nfs-backport branch 2 times, most recently from 216cd2c to 7f33439 Compare June 22, 2020 06:18
@varshar16 varshar16 mentioned this pull request Jun 22, 2020
Merged
@varshar16 varshar16 force-pushed the wip-octopus-nfs-backport branch from 7f33439 to 0e57031 Compare June 22, 2020 18:32
@smithfarm smithfarm mentioned this pull request Jun 23, 2020
Closed
varshar16 and others added 19 commits July 8, 2020 07:36
@varshar16
mgr/volumes/nfs: Remove 'ganesha-' prefix from orch returned service id
b6494d8 
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 555da00)
@varshar16
mgr/volumes/nfs: Add nfs cluster ls command
a7fbb22 
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 b77c3ee)
@varshar16
qa/tasks/cephfs: Add test for nfs cluster ls command
2b9208e 
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit eb2cd16)
@varshar16
mgr/volumes/nfs: Misc changes to export get and ls command
1ab80a0 
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 310c7fb)
@varshar16
mgr/volumes/nfs: Check cluster availability in export command methods
40611c7 
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 9d83045)
@varshar16
mgr/volumes/nfs: Set pool_namespace and cluster_id through decorator
98f70b7 
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 2692a94)
@varshar16
pybind/mgr/volumes/nfs: Reorder FSExport and NFSCluster class methods
b43bd24 
To maintain consistency and improve readability.

Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit ed20bd8)
@varshar16
qa/tasks/cephfs: Add test for listing exports
2923b8f 
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 9418b42)
@varshar16
qa/tasks/cephfs: Add tests for invalid cluster id, export type and mo…
c6a3b62 
…dify list cluster

Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 285ab1b)
@varshar16
qa/tasks/cephfs: Add tests for export create with non-existing fsname…
0c65088 
… and cluster id

Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit eab60b5)
@varshar16
doc/cephfs: Add list and get export usage
3322f26 
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 55fd634)
@varshar16
qa/tasks/cephfs/test_nfs: Add description for each test
f38cb60 
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit dfa3ab4)
@varshar16
qa/tasks/cephfs/test_nfs: Add test for export user id
23817fc 
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 1aa2a66)
@varshar16
qa/tasks/cephfs/test_nfs: Add test for get and list detailed export
97e3975 
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 5f506e3)
@varshar16
qa/tasks/test_nfs: Add todo note for cluster update test
d519740 
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit d7396fd)
@varshar16
pybind/mgr/volumes/nfs: Fix flake8 errors
910edf1 
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 4da7581)
@batrick @varshar16
volumes/fs/nfs: Don't parse rados export objects during FSExport init
01161b3 
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 4ebb258)
@varshar16
mgr/volumes/nfs: Add cluster show info command
f99c4d1 
Fixes: https://tracker.ceph.com/issues/45743
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 1faed4b)
@varshar16
qa/tasks/test_nfs: Add test for cluster info
d8b231b 
Signed-off-by: Varsha Rao <varao@redhat.com>
(cherry picked from commit 93aa5e4)
@varshar16 varshar16 force-pushed the wip-octopus-nfs-backport branch from a545a94 to d8b231b Compare July 8, 2020 05:38
@varshar16
Copy link
Contributor Author

varshar16 commented Jul 8, 2020

Rebased and added pr #35743

@varshar16
Copy link
Contributor Author

varshar16 commented Jul 8, 2020

jenkins retest this please

@varshar16
Copy link
Contributor Author

varshar16 commented Jul 8, 2020

Tests Passed: http://qa-proxy.ceph.com/teuthology/varsha-2020-07-08_07:00:28-rados-wip-octopus-nfs-backport-distro-basic-smithi/

@batrick batrick merged commit 74d4c56 into ceph:octopus Jul 8, 2020
@varshar16 varshar16 deleted the wip-octopus-nfs-backport branch July 13, 2020 10:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@batrick batrick batrick approved these changes

@mgfritch mgfritch Awaiting requested review from mgfritch

@sebastian-philipp sebastian-philipp Awaiting requested review from sebastian-philipp

@ajarr ajarr Awaiting requested review from ajarr

@jtlayton jtlayton Awaiting requested review from jtlayton

@bk201 bk201 Awaiting requested review from bk201

Assignees

No one assigned

Labels

cephadm cephfs Ceph File System needs-review octopus-batch-1

Projects

None yet

Milestone

octopus

Development

Successfully merging this pull request may close these issues.

8 participants

@varshar16 @sebastian-philipp @kshtsk @batrick @tchaikov @smithfarm @jtlayton @ajarr