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.

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

reef: mon/ConfigMonitor: Show localized name in "config dump --format json" output #53888

Merged
merged 2 commits into from
Jan 17, 2024

Conversation

sseshasa
Copy link
Contributor

@sseshasa sseshasa commented Oct 9, 2023

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


backport of #52906
parent tracker: https://tracker.ceph.com/issues/62379

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

… output

The "ceph config dump" command without the json formatted output shows
the localized option names and their values. An example of a normalized
vs localized option is shown below:

Normalized: mgr/dashboard/ssl_server_port (maintaned within Option struct)
Localized: mgr/dashboard/x/ssl_server_port (maintained in mon store)

But the "ceph config dump --format json*" output showed the normalized
option names which was not consistent with the "config dump" output.
The output of the command along with variations for pretty printing must
show the same content.

This commit introduces a new member within the ConfigMap's MaskedOption
struct called "localized_name". This is initialized to the localized name
as part of ConfigMonitor::load_config() method.

The MaskedOption::dump() used for the json formatting is modified to
display the localized_name instead of the normalized name.

Fixes: https://tracker.ceph.com/issues/62379
Signed-off-by: Sridhar Seshasayee <sseshasa@redhat.com>
(cherry picked from commit 3821722)
@sseshasa sseshasa requested a review from a team as a code owner October 9, 2023 05:30
@sseshasa sseshasa added this to the reef milestone Oct 9, 2023
@sseshasa sseshasa added the core label Oct 9, 2023
…utput.

Signed-off-by: Sridhar Seshasayee <sseshasa@redhat.com>
(cherry picked from commit 401b30f)

Conflicts:
    PendingReleaseNotes
- Remove unrelated release note related to Cephfs
@sseshasa
Copy link
Contributor Author

jenkins test make check

@sseshasa sseshasa requested review from rzarzynski and ljflores and removed request for a team November 17, 2023 05:38
@sseshasa
Copy link
Contributor Author

@rzarzynski Can you please review this backport?

@rzarzynski
Copy link
Contributor

@yuriw, @ljflores: ping,

@yuriw yuriw merged commit c892c6d into ceph:reef Jan 17, 2024
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants