Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

nautilus: osd: fix scrub reschedule bug #41973

Merged
merged 1 commit into from Jul 21, 2021
Merged

nautilus: osd: fix scrub reschedule bug #41973

merged 1 commit into from Jul 21, 2021

Conversation

trociny
Copy link
Contributor

@trociny trociny commented Jun 22, 2021

backport tracker: https://tracker.ceph.com/issues/51315

backport of #39683
parent tracker: https://tracker.ceph.com/issues/49487

this backport was staged using ceph-backport.sh version 16.0.0.6848
find the latest version at https://github.com/ceph/ceph/blob/master/src/script/ceph-backport.sh

@trociny
osd: fix scrub reschedule bug
bd2626e 
not all element can be visited during reschedule traverse

Fixes: https://tracker.ceph.com/issues/49487
Signed-off-by: wencong wan <wanwc@chinatelecom.cn>
(cherry picked from commit d7561a6)

Conflicts:
	src/osd/OSD.cc (scrub vs scrub_job variable name, pg->scrubber vs pg->m_planned_scrub)
	src/osd/OSD.h (trivial: set vs std::set)
@trociny trociny added this to the nautilus milestone Jun 22, 2021
@trociny trociny added the core label Jun 22, 2021
@trociny
Copy link
Contributor Author

trociny commented Jun 22, 2021

Jenkins make check failure does not look related. It failed when building test/rgw/test_rgw_dmclock_scheduler.cc.

@trociny trociny requested review from tchaikov and gnehapk July 20, 2021 05:09
@trociny
Copy link
Contributor Author

trociny commented Jul 20, 2021

jenkins test make check

@trociny
Copy link
Contributor Author

trociny commented Jul 20, 2021

@neha-ojha I know it is unlikely a new nautilus will be released but we still would love to see this merged to the upstream nautilus branch as it would ease downstreaming it to us.

Could it be merged? We seemed to have such practice in the past.

@k0ste
Copy link
Contributor

k0ste commented Jul 20, 2021

@trociny I think is okay to merge some PR for Nautilus, until end of summer then make a last bugfix release. This important for big productions, where to upgrade dozens of clusters is plan for a year...

@smithfarm
Copy link
Contributor

@trociny Can you run this through a rados suite? That would bolster the argument that it's OK to merge.

Since no further nautilus release is planned, it's possible that you'll have to take care of the testing part yourself...

@smithfarm
Copy link
Contributor

"make check" failure seems to have been caused by:

Segmentation fault
make[3]: *** [src/pybind/mgr/dashboard/CMakeFiles/mgr-dashboard-frontend-deps.dir/build.make:61: ../src/pybind/mgr/dashboard/frontend/node_modules]

@smithfarm
Copy link
Contributor

jenkins test make check

@trociny
Copy link
Contributor Author

trociny commented Jul 20, 2021

@trociny Can you run this through a rados suite? That would bolster the argument that it's OK to merge.

As the suite is very huge and I don't have much experience with it, I would prefer if someone who was intending to run the suite just added my PR to the test branch, and I would be happy to review the failed test to make sure they are not related. But if nobody is going to do this, then yes, that is my plan to run the suit myself eventually.

@trociny trociny mentioned this pull request Jul 20, 2021
Open
@smithfarm smithfarm added nautilus-batch-1 nautilus point releases needs-qa labels Jul 20, 2021
@yuriw
Copy link
Contributor

yuriw commented Jul 20, 2021

@trociny I will test it

@yuriw
Copy link
Contributor

yuriw commented Jul 20, 2021

https://pulpito.ceph.com/yuriw-2021-07-20_19:45:02-rados-wip-yuri8-testing-2021-07-20-0935-nautilus-distro-basic-smithi

@trociny
Copy link
Contributor Author

trociny commented Jul 21, 2021

https://pulpito.ceph.com/yuriw-2021-07-20_19:45:02-rados-wip-yuri8-testing-2021-07-20-0935-nautilus-distro-basic-smithi

Thanks! There are several failures but they seem unrelated.

@neha-ojha
Copy link
Member

@neha-ojha I know it is unlikely a new nautilus will be released but we still would love to see this merged to the upstream nautilus branch as it would ease downstreaming it to us.

Could it be merged? We seemed to have such practice in the past.

sure

@yuriw yuriw merged commit f5bb427 into ceph:nautilus Jul 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

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

@tchaikov tchaikov Awaiting requested review from tchaikov

@gnehapk gnehapk Awaiting requested review from gnehapk

Assignees
No one assigned
Labels
core nautilus-batch-1 nautilus point releases needs-qa wip-yuri8-testing
Projects
None yet
Milestone
nautilus
5 participants
@trociny @k0ste @smithfarm @yuriw @neha-ojha