Skip to content

octopus: mgr/progress: introduce turn off/on feature#39289

Merged
yuriw merged 1 commit intoceph:octopusfrom
kamoltat:wip-ksirivad-octopus-turn-off-backports
Feb 19, 2021
Merged

octopus: mgr/progress: introduce turn off/on feature#39289
yuriw merged 1 commit intoceph:octopusfrom
kamoltat:wip-ksirivad-octopus-turn-off-backports

Conversation

@kamoltat
Copy link
Member

@kamoltat kamoltat commented Feb 4, 2021

Progress module can be turned off/on by using
the commands: 'progress off' and 'progress on'

backporting the relevant commits from master PRs:

#37488

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

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
mgr/progress: introduce turn off/on feature
5ac1d31 
progress module can be turned off/on by using
the commands: 'progress off' and 'progress on'

As well as refractoring teuthology test suite
to prevent future bugs that can possibly occur

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

Signed-off-by: kamoltat <ksirivad@redhat.com>
(cherry picked from commit 993bb02)

Conflicts:
	PendingReleaseNotes - update relesae notes
	qa/tasks/mgr/test_progress.py - trivial fix
@kamoltat kamoltat added this to the octopus milestone Feb 4, 2021
@kamoltat kamoltat requested a review from neha-ojha February 4, 2021 07:13
@kamoltat kamoltat self-assigned this Feb 4, 2021
@ideepika
Copy link
Member

ideepika commented Feb 11, 2021 •
edited
Loading

@kamoltat can you take a look at this failure: the manager seems to get stuck on waiting for clean

2021-02-09T18:58:47.813 ERROR:teuthology.contextutil:Saw exception from nested tasks
Traceback (most recent call last):
  File "/home/teuthworker/src/git.ceph.com_git_teuthology_17c099650191e7aa47a7d9f502facca74f9b4d44/teuthology/contextutil.py", line 33, in nested
    yield vars
  File "/home/teuthworker/src/github.com_ceph_ceph-c_519abe3e4b47f5c65c84a1097653bbd2fea95358/qa/tasks/cephadm.py", line 1291, in task
    healthy(ctx=ctx, config=config)
  File "/home/teuthworker/src/github.com_ceph_ceph-c_519abe3e4b47f5c65c84a1097653bbd2fea95358/qa/tasks/ceph.py", line 1412, in healthy
    manager.wait_for_clean()
  File "/home/teuthworker/src/github.com_ceph_ceph-c_519abe3e4b47f5c65c84a1097653bbd2fea95358/qa/tasks/ceph_manager.py", line 2503, in wait_for_clean
    num_active_clean = self.get_num_active_clean()
  File "/home/teuthworker/src/github.com_ceph_ceph-c_519abe3e4b47f5c65c84a1097653bbd2fea95358/qa/tasks/ceph_manager.py", line 2345, in get_num_active_clean
    pgs = self.get_pg_stats()
  File "/home/teuthworker/src/github.com_ceph_ceph-c_519abe3e4b47f5c65c84a1097653bbd2fea95358/qa/tasks/ceph_manager.py", line 2130, in get_pg_stats
    j = json.loads('\n'.join(out.split('\n')[1:]))
  File "/usr/lib/python3.6/json/__init__.py", line 354, in loads
    return _default_decoder.decode(s)
  File "/usr/lib/python3.6/json/decoder.py", line 339, in decode
    obj, end = self.raw_decode(s, idx=_w(s, 0).end())
  File "/usr/lib/python3.6/json/decoder.py", line 355, in raw_decode
    obj, end = self.scan_once(s, idx)
json.decoder.JSONDecodeError: Unterminated string s

/ceph/teuthology-archive/yuriw-2021-02-09_02:07:56-rados-wip-yuri-testing-2021-02-08-1109-octopus-distro-basic-gibba/5869239/teuthology.log

@kamoltat
Copy link
Member Author

kamoltat commented Feb 12, 2021

@ideepika PTO today but can take a look over the weekends

@kamoltat
Copy link
Member Author

kamoltat commented Feb 16, 2021

@ideepika regarding the failure above, I don't think it is related to this PR

@ideepika
Copy link
Member

ideepika commented Feb 16, 2021

@ideepika regarding the failure above, I don't think it is related to this PR

thanks for confirming, I think that might be related to teuthology not enough space issues, will do a rerun and check the root cause if we again hit the issue.

@github-actions
Copy link

github-actions bot commented Feb 16, 2021

This pull request can no longer be automatically merged: a rebase is needed and changes have to be manually resolved

@yuriw yuriw merged commit 171a077 into ceph:octopus Feb 19, 2021
@neha-ojha neha-ojha mentioned this pull request Mar 17, 2021
Merged
3 tasks
kamoltat added a commit to kamoltat/ceph that referenced this pull request Mar 18, 2021
@kamoltat
octopus: delete calling of _osd_in_out_completed_events_count()
ab6e76a 
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 mentioned this pull request Mar 18, 2021
Merged
3 tasks
kamoltat added a commit to kamoltat/ceph that referenced this pull request Mar 18, 2021
@kamoltat
qa/tasks/mgr/test_progress.py remove _osd_in_out_completed_events_cou…
e93291a 
…nt()

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 added a commit to kamoltat/ceph that referenced this pull request Mar 18, 2021
@kamoltat
qa/tasks/mgr/test_progress.py: remove _osd_in_out_completed_events_co…
b81919d 
…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>
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

core mgr needs-qa octopus-batch-1 wip-yuri-testing

Projects

None yet

Milestone

octopus

Development

Successfully merging this pull request may close these issues.

5 participants

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