Skip to content

octopus:qa/tasks/mgr/test_progress: fix wait_until_equal#39360

Merged
jdurgin merged 1 commit intoceph:octopusfrom
kamoltat:wip-octupus-del-period-arg
Mar 24, 2021
Merged

octopus:qa/tasks/mgr/test_progress: fix wait_until_equal#39360
jdurgin merged 1 commit intoceph:octopusfrom
kamoltat:wip-octupus-del-period-arg

Conversation

@kamoltat
Copy link
Member

@kamoltat kamoltat commented Feb 8, 2021 •
edited
Loading

Octopus ceph_test_case doesn't have period arg
so remove that in wait_until_equal. Also increase
time to wait for complete events by using RECOVERY_PERIOD
instead of EVENT_CREATION_PERIOD

Not needed in masters because only octopus and nautilus
doesn't have a period argument in qa/tasks/mgr/test_progress.py
wait_until_equals() function

Fixes: https://tracker.ceph.com/issues/48824

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

@kamoltat kamoltat added this to the octopus milestone Feb 8, 2021
@kamoltat kamoltat self-assigned this Feb 8, 2021
@kamoltat kamoltat requested a review from jdurgin February 8, 2021 15:55
@kamoltat
Copy link
Member Author

kamoltat commented Feb 10, 2021

https://pulpito.ceph.com/ksirivad-2021-02-10_07:46:43-rados:mgr-wip-octupus-del-period-arg-distro-basic-smithi/

@kamoltat
Copy link
Member Author

kamoltat commented Feb 10, 2021

@jdurgin I scheduled 9 jobs task/progress that passed successfully. Let me know if I should schedule more jobs

@jdurgin
Copy link
Member

jdurgin commented Feb 10, 2021

That amount of testing is fine since this is purely a change in the progress tests. I just wanted to verify this change is not needed in master, is that correct?

@tchaikov
Copy link
Contributor

tchaikov commented Feb 10, 2021

@kamoltat could you note down the reason why this change does not apply to master in the commit message?

@kamoltat
Copy link
Member Author

kamoltat commented Feb 10, 2021

That amount of testing is fine since this is purely a change in the progress tests. I just wanted to verify this change is not needed in master, is that correct?

@jdurgin yes so basically it is not needed in masters because only octopus and nautilus doesn't have a period argument in
qa/tasks/mgr/test_progress.py wait_until_equals()

@kamoltat
Copy link
Member Author

kamoltat commented Feb 10, 2021

@kamoltat could you note down the reason why this change does not apply to master in the commit message?

@tchaikov sure thing

@kamoltat kamoltat force-pushed the wip-octupus-del-period-arg branch from 07b9d8d to 8df54fe Compare February 11, 2021 04:18
@kamoltat kamoltat changed the title qa/tasks/mgr/test_progress: fix wait_until_equal octopus:qa/tasks/mgr/test_progress: fix wait_until_equal Feb 15, 2021
@kamoltat kamoltat mentioned this pull request Mar 5, 2021
Merged
3 tasks
@ideepika
Copy link
Member

ideepika commented Mar 12, 2021

@kamoltat seems related :

2021-03-12T01:41:14.893 INFO:tasks.cephfs_test_runner:======================================================================
2021-03-12T01:41:14.893 INFO:tasks.cephfs_test_runner:ERROR: test_osd_cannot_recover (tasks.mgr.test_progress.TestProgress)
2021-03-12T01:41:14.893 INFO:tasks.cephfs_test_runner:----------------------------------------------------------------------
2021-03-12T01:41:14.894 INFO:tasks.cephfs_test_runner:Traceback (most recent call last):
2021-03-12T01:41:14.894 INFO:tasks.cephfs_test_runner:  File "/home/teuthworker/src/github.com_ceph_ceph-c_dbb79e0547db3abf076b9bc9b6ad97ede0519a0e/qa/tasks/mgr/test_progress.py", line 352, in test_osd_cannot_recover
2021-03-12T01:41:14.895 INFO:tasks.cephfs_test_runner:    self._osd_in_out_completed_events_count('out'),
2021-03-12T01:41:14.895 INFO:tasks.cephfs_test_runner:AttributeError: 'TestProgress' object has no attribute '_osd_in_out_completed_events_count'
2021-03-12T01:41:14.896 INFO:tasks.cephfs_test_runner:
2021-03-12T01:41:14.896 INFO:tasks.cephfs_test_runner:----------------------------------------------------------------------
2021-03-12T01:41:14.896 INFO:tasks.cephfs_test_runner:Ran 2 tests in 157.386s
2021-03-12T01:41:14.897 INFO:tasks.cephfs_test_runner:
2021-03-12T01:41:14.897 INFO:tasks.cephfs_test_runner:FAILED (errors=1)
2021-03-12T01:41:14.897 INFO:tasks.cephfs_test_runner:
2021-03-12T01:41:14.897 INFO:tasks.cephfs_test_runner:======================================================================
2021-03-12T01:41:14.898 INFO:tasks.cephfs_test_runner:ERROR: test_osd_cannot_recover (tasks.mgr.test_progress.TestProgress)
2021-03-12T01:41:14.898 INFO:tasks.cephfs_test_runner:----------------------------------------------------------------------
2021-03-12T01:41:14.899 INFO:tasks.cephfs_test_runner:Traceback (most recent call last):
2021-03-12T01:41:14.899 INFO:tasks.cephfs_test_runner:  File "/home/teuthworker/src/github.com_ceph_ceph-c_dbb79e0547db3abf076b9bc9b6ad97ede0519a0e/qa/tasks/mgr/test_progress.py", line 352, in test_osd_cannot_recover
2021-03-12T01:41:14.899 INFO:tasks.cephfs_test_runner:    self._osd_in_out_completed_events_count('out'),
2021-03-12T01:41:14.899 INFO:tasks.cephfs_test_runner:AttributeError: 'TestProgress' object has no attribute '_osd_in_out_completed_events_count'

can you take a look: /ceph/teuthology-archive/yuriw-2021-03-09_20:27:38-rados-wip-yuri2-testing-2021-03-09-1006-octopus-distro-basic-smithi/5950994/teuthology.log

@neha-ojha
Copy link
Member

neha-ojha commented Mar 17, 2021

@kamoltat @ideepika I decided to dig into this since the progress module tests have been consistently failing in octopus.

The problem is that https://github.com/ceph/ceph/pull/39289/files#diff-068949e3f54d53acccfd66139a1b7c90ec7f3b4c65254ffa677fb72b1270a774R354 was an incomplete backport. It used _osd_in_out_completed_events_count without including the function itself, which got added in #37327 (not backported).

I have no idea how tests passed for #39289, probably they did not. Let's please fix this.

neha-ojha
neha-ojha requested changes Mar 17, 2021
View reviewed changes
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.

until #39360 (comment) is fixed

@kamoltat
Copy link
Member Author

kamoltat commented Mar 18, 2021

@neha-ojha I see will get it on it right away. Thank you.

@kamoltat kamoltat mentioned this pull request Mar 19, 2021
Merged
3 tasks
@kamoltat
qa/tasks/mgr/test_progress: fix wait_until_equal
df41ea7 
Octopus ceph_test_case doesn't have period arg
so remove that in wait_until_equal. Also increase
time to wait for complete events by using RECOVERY_PERIOD
instead of EVENT_CREATION_PERIOD

Not needed in masters because only octopus and nautilus
doesn't have a period argument in qa/tasks/mgr/test_progress.py
wait_until_equals() function

Fixes: https://tracker.ceph.com/issues/48824

Signed-off-by: Kamoltat <ksirivad@redhat.com>
@kamoltat kamoltat force-pushed the wip-octupus-del-period-arg branch from 8df54fe to df41ea7 Compare March 22, 2021 18:03
jdurgin
jdurgin approved these changes Mar 23, 2021
View reviewed changes
Copy link
Member

@jdurgin jdurgin left a comment

Choose a reason for hiding this comment

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

Since it was included in this run, #40225 (comment) looks good!

neha-ojha
neha-ojha approved these changes Mar 24, 2021
View reviewed changes
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.

👍

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

Reviewers

@jdurgin jdurgin jdurgin approved these changes

@neha-ojha neha-ojha neha-ojha approved these changes

Assignees

@kamoltat kamoltat

Labels

bug-fix core mgr octopus-batch-1 pybind

Projects

None yet

Milestone

octopus

Development

Successfully merging this pull request may close these issues.

7 participants

@kamoltat @jdurgin @tchaikov @ideepika @neha-ojha @yuriw @smithfarm