Skip to content

squid: mds: dump formatter even for errors#58319

Merged
lxbsz merged 6 commits intoceph:squidfrom
batrick:wip-66542-squid
Jul 16, 2024
Merged

squid: mds: dump formatter even for errors#58319
lxbsz merged 6 commits intoceph:squidfrom
batrick:wip-66542-squid

Conversation

@batrick
Copy link
Member

@batrick batrick commented Jun 27, 2024

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


backport of #57673
parent tracker: https://tracker.ceph.com/issues/66184

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

batrick added 6 commits June 27, 2024 12:25
And change second argument to std::string_view to have more flexible
conversions.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit bd52d8c)

Conflicts:
	src/common/admin_socket.cc
The admin_socker framework only dumps the formatter by default if the command
succeeds.

Fixes: a4dc881
Fixes: https://tracker.ceph.com/issues/66184
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 55a88a0)
Existing convention is that "css" is short for CachedStackStringStream while
"ss" is stringstream.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 4229c27)
It's unpleasant to test for existence in json. Just dump an empty string if not present.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 48a25e3)
As it's being used for error output.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit b89e7d4)
The asok interface will mangle stdout if the command actually fails.

The reason `flush path` is done via the asok interface is because the tell/asok
interfaces were unified after these tests were written and `flush path` was
only available via the asok interface.

Fixes: https://tracker.ceph.com/issues/66184
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 715c951)
@batrick batrick requested a review from a team as a code owner June 27, 2024 16:29
@batrick batrick added this to the squid milestone Jun 27, 2024
@batrick batrick added the cephfs Ceph File System label Jun 27, 2024
@batrick
Copy link
Member Author

batrick commented Jun 28, 2024

jenkins test api

@joscollin joscollin added the wip-jcollin-testing-squid2 Assigned for review label Jul 1, 2024
@joscollin
Copy link
Member

This PR is under test in https://tracker.ceph.com/issues/66762.

@lxbsz
Copy link
Member

lxbsz commented Jul 15, 2024

Checked all the failures, they are all not related, please see 2024-07-09 in https://tracker.ceph.com/projects/cephfs/wiki/Squid.

@lxbsz lxbsz merged commit 5b4e6c6 into ceph:squid Jul 16, 2024
@joscollin joscollin removed the wip-jcollin-testing-squid2 Assigned for review label Jul 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants