rook: apply patch to use jq for ceph osd dump json output#1850
Open
ushitora-anqou wants to merge 1 commit intomainfrom
Open
rook: apply patch to use jq for ceph osd dump json output#1850ushitora-anqou wants to merge 1 commit intomainfrom
ushitora-anqou wants to merge 1 commit intomainfrom
Conversation
There was a problem hiding this comment.
Pull request overview
This PR updates the custom rook container build to apply an upstream patch that normalizes ceph osd dump -f json output via jq, avoiding failures when Ceph emits non-JSON numeric tokens like inf.
Changes:
- Apply a patch to Rook’s
GetOSDDumpto pipe JSON throughjqbefore unmarshalling. - Add an upstream unit test (in the patch) covering both valid JSON and
inf-containing output. - Bump the image tag from
1.18.6.1to1.18.6.2.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 4 comments.
| File | Description |
|---|---|
| rook/use-jq-for-ceph-osd-dump-json-output.patch | Adds jq normalization step to OSD dump parsing and adds a corresponding unit test in the upstream patch. |
| rook/Dockerfile | Applies the new patch during the source build stage. |
| rook/TAG | Bumps the published image version. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
91b851d to
5993d7b
Compare
The ceph osd dump -f json command can output invalid JSON containing values like "inf" which cannot be parsed by encoding/json. This causes errors like "invalid character 'i' looking for beginning of value". Fix this by piping the output through jq, which accepts such invalid JSON and outputs valid JSON that encoding/json can parse. Signed-off-by: Ryotaro Banno <ryotaro.banno@gmail.com>
5993d7b to
28bcf5c
Compare
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.
Note that the rook Docker image has jq installed:
cf. ushitora-anqou/rook@7733217