Skip to content

octopus: qa/tasks/mgr/test_progress.py: remove calling of _osd_in_out_completed_events_count()#40225

Merged
jdurgin merged 1 commit intoceph:octopusfrom
kamoltat:wip-fix-39289-incomplete-backport
Mar 24, 2021
Merged

octopus: qa/tasks/mgr/test_progress.py: remove calling of _osd_in_out_completed_events_count()#40225
jdurgin merged 1 commit intoceph:octopusfrom
kamoltat:wip-fix-39289-incomplete-backport

Conversation

@kamoltat
Copy link
Member

delete the part where _osd_in_out_completed_events_count()
was called in test_osd_cannot_recover() and revert to initial
state of the function since we don't need to use this function
in octopus. Also delete a duplicate of _osd_in_out_events_count().
This must be added by mistake in #39289 as well.

No need to fix for the backport in Nautilus: #38173
since the bugs are occured by adding additional code to
the cherry-pick specifically for Octopus.

fixes: https://tracker.ceph.com/issues/49891

Signed-off-by: Kamoltat ksirivad@redhat.com

Checklist

  • References tracker ticket
  • Updates documentation if necessary
  • Includes tests for new functionality or reproducer for bug

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 api
  • jenkins test docs
  • jenkins render docs
  • jenkins test ceph-volume all
  • jenkins test ceph-volume tox

…unt()

delete the part where  _osd_in_out_completed_events_count()
was called in test_osd_cannot_recover() and revert to initial
state of the function since we don't need to use this function
in octopus. Also delete a duplicate of _osd_in_out_events_count().
This must be added by mistake in ceph#39289 as well.

No need to fix for the backport in Nautilus: ceph#38173
since the bugs are occured by adding additional code to
the cherry-pick specifically for Octopus.

fixes: https://tracker.ceph.com/issues/49891

Signed-off-by: Kamoltat <ksirivad@redhat.com>
@kamoltat kamoltat force-pushed the wip-fix-39289-incomplete-backport branch from e93291a to b81919d Compare March 18, 2021 20:07
@kamoltat
Copy link
Member Author

@neha-ojha
I don't know if this can ever pass the test in teuthology since we need to get rid of the period arg in this PR: #39360

021-03-19T12:50:25.423 INFO:tasks.cephfs_test_runner:test_osd_came_back (tasks.mgr.test_progress.TestProgress) ... ERROR
2021-03-19T12:50:25.423 INFO:tasks.cephfs_test_runner:
2021-03-19T12:50:25.423 INFO:tasks.cephfs_test_runner:======================================================================
2021-03-19T12:50:25.423 INFO:tasks.cephfs_test_runner:ERROR: test_osd_came_back (tasks.mgr.test_progress.TestProgress)
2021-03-19T12:50:25.423 INFO:tasks.cephfs_test_runner:----------------------------------------------------------------------
2021-03-19T12:50:25.424 INFO:tasks.cephfs_test_runner:Traceback (most recent call last):
2021-03-19T12:50:25.424 INFO:tasks.cephfs_test_runner:  File "/home/teuthworker/src/github.com_ceph_ceph-c_ab6e76a09604dd752d9bbce3b86bfae218723709/qa/tasks/mgr/test_progress.py", line 273, in test_osd_came_back
2021-03-19T12:50:25.424 INFO:tasks.cephfs_test_runner:    ev1 = self._simulate_failure()
2021-03-19T12:50:25.424 INFO:tasks.cephfs_test_runner:  File "/home/teuthworker/src/github.com_ceph_ceph-c_ab6e76a09604dd752d9bbce3b86bfae218723709/qa/tasks/mgr/test_progress.py", line 169, in _simulate_failure
2021-03-19T12:50:25.424 INFO:tasks.cephfs_test_runner:    period=1)
2021-03-19T12:50:25.424 INFO:tasks.cephfs_test_runner:TypeError: wait_until_equal() got an unexpected keyword argument 'period'
2021-03-19T12:50:25.424 INFO:tasks.cephfs_test_runner:
2021-03-19T12:50:25.424 INFO:tasks.cephfs_test_runner:----------------------------------------------------------------------
2021-03-19T12:50:25.424 INFO:tasks.cephfs_test_runner:Ran 1 test in 68.801s
2021-03-19T12:50:25.424 INFO:tasks.cephfs_test_runner:
2021-03-19T12:50:25.424 INFO:tasks.cephfs_test_runner:FAILED (errors=1)
2021-03-19T12:50:25.424 INFO:tasks.cephfs_test_runner:
2021-03-19T12:50:25.424 INFO:tasks.cephfs_test_runner:======================================================================
2021-03-19T12:50:25.425 INFO:tasks.cephfs_test_runner:ERROR: test_osd_came_back (tasks.mgr.test_progress.TestProgress)
2021-03-19T12:50:25.425 INFO:tasks.cephfs_test_runner:----------------------------------------------------------------------
2021-03-19T12:50:25.425 INFO:tasks.cephfs_test_runner:Traceback (most recent call last):
2021-03-19T12:50:25.425 INFO:tasks.cephfs_test_runner:  File "/home/teuthworker/src/github.com_ceph_ceph-c_ab6e76a09604dd752d9bbce3b86bfae218723709/qa/tasks/mgr/test_progress.py", line 273, in test_osd_came_back
2021-03-19T12:50:25.425 INFO:tasks.cephfs_test_runner:    ev1 = self._simulate_failure()
2021-03-19T12:50:25.425 INFO:tasks.cephfs_test_runner:  File "/home/teuthworker/src/github.com_ceph_ceph-c_ab6e76a09604dd752d9bbce3b86bfae218723709/qa/tasks/mgr/test_progress.py", line 169, in _simulate_failure
2021-03-19T12:50:25.425 INFO:tasks.cephfs_test_runner:    period=1)
2021-03-19T12:50:25.425 INFO:tasks.cephfs_test_runner:TypeError: wait_until_equal() got an unexpected keyword argument 'period'
2021-03-19T12:50:25.425 INFO:tasks.cephfs_test_runner:
2021-03-19T12:50:25.425 ERROR:teuthology.run_tasks:Saw exception from tasks.

https://pulpito.ceph.com/ksirivad-2021-03-19_12:33:40-rados:mgr-wip-fix-39289-incomplete-backport-distro-basic-smithi/

@kamoltat
Copy link
Member Author

kamoltat commented Mar 23, 2021

This test consists of commit from this PR + df41ea7 from #39360
https://pulpito.ceph.com/ksirivad-2021-03-22_21:53:00-rados:mgr-wip-fix-39289-incomplete-backport-distro-basic-smithi/

Ran 9 Tests:
8 Passed
1 Dead

Copy link
Member

@neha-ojha neha-ojha left a comment

Choose a reason for hiding this comment

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

looks good 👍

@jdurgin jdurgin merged commit fde6726 into ceph:octopus Mar 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants