Skip to content

qa/cephfs: minor fixes for xfstests_dev.py and test_acls.py#45950

Merged
vshankar merged 5 commits intoceph:masterfrom
rishabh-d-dave:qa-cephfs-test_acls
May 12, 2022
Merged

qa/cephfs: minor fixes for xfstests_dev.py and test_acls.py#45950
vshankar merged 5 commits intoceph:masterfrom
rishabh-d-dave:qa-cephfs-test_acls

Conversation

@rishabh-d-dave
Copy link
Contributor

@rishabh-d-dave rishabh-d-dave commented Apr 19, 2022 •
edited
Loading

One of the commit fixes: https://tracker.ceph.com/issues/55374.

Checklist

  • Tracker (select at least one)
    • References tracker ticket
    • Very recent bug; references commit where it was introduced
    • New feature (ticket optional)
    • Doc update (no ticket needed)
    • Code cleanup (no ticket needed)
  • Component impact
    • Affects Dashboard, opened tracker ticket
    • Affects Orchestrator, opened tracker ticket
    • No impact that needs to be tracked
  • Documentation (select at least one)
    • Updates relevant documentation
    • No doc update is appropriate
  • Tests (select at least one)
Show available Jenkins commands
  • jenkins retest this please
  • jenkins test classic perf
  • jenkins test crimson perf
  • jenkins test signed
  • jenkins test make check
  • jenkins test make check arm64
  • jenkins test submodules
  • jenkins test dashboard
  • jenkins test dashboard cephadm
  • jenkins test api
  • jenkins test docs
  • jenkins render docs
  • jenkins test ceph-volume all
  • jenkins test ceph-volume tox
  • jenkins test windows

@rishabh-d-dave rishabh-d-dave requested review from a team and batrick April 19, 2022 08:27
rishabh-d-dave added a commit to rishabh-d-dave/ceph that referenced this pull request Apr 19, 2022
@rishabh-d-dave
DNM: borrowed from PR ceph#45950
6f5203c 
omit_sudo, logs and asserts, StringIO in test_acls.py

Signed-off-by: Rishabh Dave <ridave@redhat.com>
rishabh-d-dave added a commit to rishabh-d-dave/ceph that referenced this pull request Apr 19, 2022
@rishabh-d-dave
DNM: borrowed from PR ceph#45950
a240c14 
omit_sudo, logs and asserts, StringIO in test_acls.py

Signed-off-by: Rishabh Dave <ridave@redhat.com>
@rishabh-d-dave rishabh-d-dave mentioned this pull request Apr 19, 2022
Merged
14 tasks
@rishabh-d-dave rishabh-d-dave changed the title qa/cephfs: minor fixes for xfstests-dev.py and test_acls.py qa/cephfs: minor fixes for xfstests_dev.py and test_acls.py Apr 19, 2022
@rishabh-d-dave rishabh-d-dave force-pushed the qa-cephfs-test_acls branch 2 times, most recently from af1432e to 7249366 Compare April 19, 2022 16:26
@rishabh-d-dave rishabh-d-dave mentioned this pull request Apr 19, 2022
Merged
14 tasks
lxbsz
lxbsz reviewed Apr 20, 2022
View reviewed changes
@rishabh-d-dave
Copy link
Contributor Author

rishabh-d-dave commented Apr 20, 2022

jenkins test make check

@rishabh-d-dave
Copy link
Contributor Author

rishabh-d-dave commented Apr 20, 2022

The previous failure was apparently not related - https://jenkins.ceph.com/job/ceph-pull-requests/93835/consoleFull#1999155424e840cee4-f4a4-4183-81dd-42855615f2c1

@rishabh-d-dave rishabh-d-dave added the wip-rishabh-testing Rishabh's testing label label Apr 21, 2022
@rishabh-d-dave
Copy link
Contributor Author

rishabh-d-dave commented Apr 21, 2022

@vshankar The tests ran fine - http://pulpito.front.sepia.ceph.com/rishabh-2022-04-21_08:55:52-fs-wip-vshankar-testing-20220420-113951-distro-basic-smithi/

2022-04-21T09:15:00.451 INFO:teuthology.orchestra.run.smithi061.stdout:./install-sh -o root -g root -m 644 randomize.awk /var/lib/xfstests
2022-04-21T09:15:00.470 INFO:tasks.cephfs.test_acls:client is kernel mounted
2022-04-21T09:15:00.470 INFO:teuthology.orchestra.run:Running command with timeout 30
2022-04-21T09:15:00.473 DEBUG:teuthology.orchestra.run.smithi061:running tests for ACLs from xfstests-dev> (cd /tmp/tmp.QT9kJZd7BSxfstests-dev && exec sudo ./check generic/099)
2022-04-21T09:15:00.680 INFO:teuthology.orchestra.run.smithi061.stdout:FSTYP         -- ceph
2022-04-21T09:15:00.684 INFO:teuthology.orchestra.run.smithi061.stdout:PLATFORM      -- Linux/x86_64 smithi061 4.18.0-348.20.1.el8_5.x86_64 #1 SMP Tue Mar 8 12:56:54 EST 2022
2022-04-21T09:15:00.684 INFO:teuthology.orchestra.run.smithi061.stdout:
2022-04-21T09:15:01.370 INFO:teuthology.orchestra.run.smithi061.stdout:generic/099       1s
2022-04-21T09:15:01.374 INFO:teuthology.orchestra.run.smithi061.stdout:Ran: generic/099
2022-04-21T09:15:01.376 INFO:teuthology.orchestra.run.smithi061.stdout:Passed all 1 tests
2022-04-21T09:15:01.377 INFO:teuthology.orchestra.run.smithi061.stdout:
2022-04-21T09:15:01.437 INFO:tasks.cephfs.test_acls:Command return value: 0
2022-04-21T09:15:01.437 INFO:tasks.cephfs.test_acls:Command stdout -
FSTYP         -- ceph
PLATFORM      -- Linux/x86_64 smithi061 4.18.0-348.20.1.el8_5.x86_64 #1 SMP Tue Mar 8 12:56:54 EST 2022

generic/099      1s
Ran: generic/099
Passed all 1 tests


2022-04-21T09:15:01.438 INFO:tasks.cephfs.test_acls:Command stderr -

2022-04-21T09:15:01.438 DEBUG:teuthology.orchestra.run.smithi061:> sudo userdel --force --remove fsgqa
2022-04-21T09:15:02.322 DEBUG:teuthology.orchestra.run.smithi061:> sudo userdel --force --remove 123456-fsgqa

2022-04-21T09:15:12.625 INFO:teuthology.orchestra.run.smithi061.stderr:2022-04-21T09:15:12.620+0000 7f2be9d9d700  1 -- 172.21.15.61:0/902969904 wait complete.
2022-04-21T09:15:12.634 INFO:tasks.cephfs_test_runner:test_acls (tasks.cephfs.test_acls.TestACLs) ... ok
2022-04-21T09:15:12.634 INFO:tasks.cephfs_test_runner:
2022-04-21T09:15:12.634 INFO:tasks.cephfs_test_runner:----------------------------------------------------------------------
2022-04-21T09:15:12.635 INFO:tasks.cephfs_test_runner:Ran 1 test in 137.749s
2022-04-21T09:15:12.635 INFO:tasks.cephfs_test_runner:
2022-04-21T09:15:12.635 INFO:tasks.cephfs_test_runner:OK

@rishabh-d-dave rishabh-d-dave removed the wip-rishabh-testing Rishabh's testing label label Apr 21, 2022
@rishabh-d-dave
Copy link
Contributor Author

rishabh-d-dave commented Apr 26, 2022

jenkins test make check

@rishabh-d-dave
Copy link
Contributor Author

rishabh-d-dave commented Apr 26, 2022

@vshankar This PR too is ready for merge (teuth tests passed and CI is green).

kotreshhr
kotreshhr approved these changes Apr 27, 2022
View reviewed changes
@rishabh-d-dave
qa/cephfs: just import getLogger instead of whole module
b60b73c 
Import just the necessary object instead of importing entire module.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
@rishabh-d-dave
qa/cephfs: set omit_sudo to False in test_acls.py
1423f95 
When running "sudo ./check generic/099" in test_acls.py's test method
named test_acls(), set omit_sudo to False because without it
vstart_runner.py will remove "sudo" from command arguments and so the
command will fail unnecessarily.

Fixes: https://tracker.ceph.com/issues/55374
Signed-off-by: Rishabh Dave <ridave@redhat.com>
@rishabh-d-dave
qa/cephfs: use StringIO instead of BytesIO
09d5e07 
StringIO can be operated on without extra hassles of converting. So
replace BytesIO by StringIO in test_acls.py and xfstests_dev.py

Signed-off-by: Rishabh Dave <ridave@redhat.com>
@rishabh-d-dave
qa/cephfs: print cmd debug info when it fails
d3b9543 
Print return code, stdout and stderr for the command that launches
xfstests-dev tests against CephFS when it fails.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
@rishabh-d-dave
qa/cephfs: add check in test_acls.py
eac8358 
In xfstests-dev, "./check generic/abcd" doesn't end in error even when
there is no test abcd in generic. It's better to check the stdout to
verify success and print the returncode, stdout and stderr of the
command in logs so that such error can be found out by reading logs.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
@rishabh-d-dave
Copy link
Contributor Author

rishabh-d-dave commented Apr 27, 2022

About last push: included the change requested here #45950 (comment) and rebased the PR.

@rishabh-d-dave
Copy link
Contributor Author

rishabh-d-dave commented Apr 28, 2022

@vshankar PTAL.

@ceph-jenkins
Copy link
Collaborator

ceph-jenkins commented Apr 28, 2022

Can one of the admins verify this patch?

@vshankar
Copy link
Contributor

vshankar commented May 4, 2022

@rishabh-d-dave - IIRC, you would be running this through (xfs)tests before you want me to take a look at this?

@rishabh-d-dave
Copy link
Contributor Author

rishabh-d-dave commented May 5, 2022

@vshankar

@rishabh-d-dave - IIRC, you would be running this through (xfs)tests before you want me to take a look at this?

No, that was a different xfstests PR, this one has already been tested 2 weeks ago. See #45950 (comment).

vshankar
vshankar approved these changes May 12, 2022
View reviewed changes
Copy link
Contributor

@vshankar vshankar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://tracker.ceph.com/projects/cephfs/wiki/Master#2022-May-12

@vshankar vshankar merged commit 153634f into ceph:master May 12, 2022
@rishabh-d-dave rishabh-d-dave deleted the qa-cephfs-test_acls branch May 17, 2022 09:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vshankar vshankar vshankar approved these changes

@kotreshhr kotreshhr kotreshhr approved these changes

@lxbsz lxbsz lxbsz approved these changes

@batrick batrick Awaiting requested review from batrick

Assignees

No one assigned

Labels

bug-fix cephfs Ceph File System needs-review tests

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@rishabh-d-dave @ceph-jenkins @vshankar @kotreshhr @lxbsz