Skip to content

osd/scrub: only call publish_stats_to_osd() where allowed and needed#50283

Merged
ljflores merged 1 commit intoceph:mainfrom
ronen-fr:wip-rf-partial-unpub
Mar 9, 2023
Merged

osd/scrub: only call publish_stats_to_osd() where allowed and needed#50283
ljflores merged 1 commit intoceph:mainfrom
ronen-fr:wip-rf-partial-unpub

Conversation

@ronen-fr
Copy link
Contributor

@ronen-fr ronen-fr commented Feb 27, 2023

This patch removes several unnecessary calls to publish_stats_to_osd() in the clear_pgscrub_state pathway used during interval changes. We didn't actually have anything to publish and we can't validly call publish_stats_to_osd() when we aren't an active primary anyway (which we can't be during an interval change).

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

@ronen-fr
osd/scrub: only call publish_stats_to_osd() where allowed and needed
aeff19d 
This patch removes several unnecessary calls to publish_stats_to_osd() in
the clear_pgscrub_state pathway used during interval changes. We didn't
actually have anything to publish and we can't validly call publish_stats_to_osd()
when we aren't an active primary anyway (which we can't be during an interval
change).

Fixes: https://tracker.ceph.com/issues/58496
Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
@ronen-fr ronen-fr requested a review from a team as a code owner February 27, 2023 13:46
@github-actions github-actions bot added the core label Feb 27, 2023
@ronen-fr
Copy link
Contributor Author

ronen-fr commented Feb 27, 2023 •
edited
Loading

This PR contains one of the two fixes (one of the two commits) in
#50088
for which approval is delayed.

@ljflores
Copy link
Member

ljflores commented Feb 27, 2023

jenkins test make check

1 similar comment
@ljflores
Copy link
Member

ljflores commented Feb 27, 2023

jenkins test make check

neha-ojha
neha-ojha approved these changes Mar 3, 2023
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.

LGTM

@rzarzynski
Copy link
Contributor

rzarzynski commented Mar 4, 2023

It looks we haven't backported the problematic commit:

$ git log origin/quincy | grep 1295b3752c8305cb57f69676beb22de07d575e01 || echo no\ commit
no commit

rzarzynski
rzarzynski approved these changes Mar 4, 2023
View reviewed changes
Copy link
Contributor

@rzarzynski rzarzynski left a comment

Choose a reason for hiding this comment

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

LGTM per https://tracker.ceph.com/issues/58496#note-11.

@ljflores
Copy link
Member

ljflores commented Mar 9, 2023

Rados suite review: https://pulpito.ceph.com/?branch=wip-yuri8-testing-2023-03-07-1527

Failures, unrelated:
1. https://tracker.ceph.com/issues/49287
2. https://tracker.ceph.com/issues/58585
3. https://tracker.ceph.com/issues/58560
4. https://tracker.ceph.com/issues/58946
5. https://tracker.ceph.com/issues/51964

Details:
1. SELinux Denials during cephadm/workunits/test_cephadm - Ceph - Orchestrator
2. rook: failed to pull kubelet image - Ceph - Orchestrator
3. test_envlibrados_for_rocksdb.sh failed to subscribe to repo - Infrastructure
4. cephadm: KeyError: 'osdspec_affinity' - Ceph - Orchestrator
5. qa: test_cephfs_mirror_restart_sync_on_blocklist failure - Ceph - CephFS

@ljflores ljflores merged commit 7d3685d into ceph:main Mar 9, 2023
@ljflores ljflores mentioned this pull request Mar 9, 2023
Merged
14 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rzarzynski rzarzynski rzarzynski approved these changes

@athanatos athanatos athanatos approved these changes

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

Assignees

No one assigned

Labels

bug-fix core needs-qa needs-reef-backport wip-yuri8-testing

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@ronen-fr @ljflores @rzarzynski @athanatos @neha-ojha @yuriw