squid: pybind/mgr/mirroring: Fix KeyError: 'directory_count' in daemon status#57762
Merged
joscollin merged 1 commit intoceph:squidfrom Jun 14, 2024
Merged
squid: pybind/mgr/mirroring: Fix KeyError: 'directory_count' in daemon status#57762joscollin merged 1 commit intoceph:squidfrom
joscollin merged 1 commit intoceph:squidfrom
Conversation
The directory_count key is missing in self.mgr.get_daemon_status() output json, intermittently when there is a delay caused by m_listener.handle_mirroring_enabled() to update the directory_count, which results in ServiceDaemon::update_status() creates a json with out 'directory_count' key/value. But the mgr/mirroring -> daemon_status() always expects the 'directory_count' key to be present in the json returned by self.mgr.get_daemon_status(). This issue occurs intermittently when we enable/disable mirroring and check the 'daemon status' in between. This patch fixes this issue by setting a default value 0 for 'directory_count' in doemon_status(). Fixes: https://tracker.ceph.com/issues/65795 Signed-off-by: Jos Collin <jcollin@redhat.com> (cherry picked from commit b78baa2)
Member
Author
|
Tested in https://tracker.ceph.com/issues/66423 |
vshankar
approved these changes
Jun 14, 2024
joscollin
pushed a commit
to joscollin/ceph
that referenced
this pull request
Jun 27, 2024
* refs/pull/57762/head: pybind/mgr/mirroring: Fix KeyError: 'directory_count' in daemon status
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The directory_count key is missing in self.mgr.get_daemon_status() output json,
intermittently when there is a delay caused by m_listener.handle_mirroring_enabled() to update the
directory_count, which results in ServiceDaemon::update_status() creates a json with out 'directory_count' key/value.
But the mgr/mirroring -> daemon_status() always expects the 'directory_count' key to be present in the json returned by
self.mgr.get_daemon_status().
This issue occurs intermittently when we enable/disable mirroring and check the 'daemon status' in between.
This patch fixes this issue by setting a default value 0 for 'directory_count' in doemon_status().
Fixes: https://tracker.ceph.com/issues/66270
(cherry picked from commit b78baa2)
Contribution Guidelines
To sign and title your commits, please refer to Submitting Patches to Ceph.
If you are submitting a fix for a stable branch (e.g. "quincy"), please refer to Submitting Patches to Ceph - Backports for the proper workflow.
When filling out the below checklist, you may click boxes directly in the GitHub web UI. When entering or editing the entire PR message in the GitHub web UI editor, you may also select a checklist item by adding an
xbetween the brackets:[x]. Spaces and capitalization matter when checking off items this way.Checklist
Show available Jenkins commands
jenkins retest this pleasejenkins test classic perfjenkins test crimson perfjenkins test signedjenkins test make checkjenkins test make check arm64jenkins test submodulesjenkins test dashboardjenkins test dashboard cephadmjenkins test apijenkins test docsjenkins render docsjenkins test ceph-volume alljenkins test ceph-volume toxjenkins test windowsjenkins test rook e2e